start cleanup old ebuilds.

2020-10-22 17:13:25 +02:00 · 2020-10-22 17:13:25 +02:00 · 656bfcce02
commit 656bfcce02
parent 6f4baa34dc
27 changed files with 2 additions and 1548 deletions
--- a/app-misc/ca-glave/Manifest
+++ b/app-misc/ca-glave/Manifest
@ -1,2 +0,0 @@
-AUX glavegruppe_class1.crt 1958 SHA256 7efd43764eacdc6fd6f96d00f6cfd59403b6395d5b2c49d97bc14df06fede7ce SHA512 fe0e152a251e9990e5c0c3febf9bece0983cdea42cb7f9bcf8105aabfc927624e334b9a1e59a65b27937c83862a2b0ef20f3c6a8718f091b1abf6b6d3f7ff614 WHIRLPOOL a486989f3296bc52ab4993d6f7ba3e65c3948eba432ef2f0b30e6305a5490079eb5096654a9353b0b1f6442abdfaed5ca1ec38f26ed3ecd58ddfe8fb68cec47e
-EBUILD ca-glave-20160428.ebuild 535 SHA256 3e2cf59486f47a18cbf2100924082db587f8abc0be1c660ab303b40b1271f54f SHA512 edb904ba7c3f120ddc73d7eacc7db56201f449ae4b4b7e374307cc5eaf5dded5af9763467a7b7339b7a9751a4346bd4dd5b1863818decec1194de3d750fe8539 WHIRLPOOL 957b249c826aa5bf9c558226dc4ad3a20a06661342b9429bde8424f7463734b67bfdd98dba2ee446a648434c9493f6c8709b81cb85864d9d875dca0e7d9cab44
--- a/app-misc/ca-glave/ca-glave-20160428.ebuild
+++ b/app-misc/ca-glave/ca-glave-20160428.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Root-Certificate of GlaveGruppe."
-HOMEPAGE="http://ldap.glave.de"
-SRC_URI=""
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-misc/ca-certificates"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	mkdir -p ${S}
-}
-
-src_install() {
-	insinto /usr/local/share/ca-certificates
-	doins ${FILESDIR}/glavegruppe_class1.crt
-}
-
-pkg_postinst() {
-	einfo "please execute /usr/sbin/update-ca-certificates."
-}
--- a/app-misc/ca-glave/files/glavegruppe_class1.crt
+++ b/app-misc/ca-glave/files/glavegruppe_class1.crt
@ -1,31 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIFYjCCBEqgAwIBAgIJAPC/OZFpGDBKMA0GCSqGSIb3DQEBCwUAMIGhMQswCQYD
-VQQGEwJERTEVMBMGA1UECBMMT3N0ZnJpZXNsYW5kMQ8wDQYDVQQHEwZOb3JkZW4x
-GjAYBgNVBAoTEUdsYXZlIEdydXBwZSBHbWJIMRQwEgYDVQQLEwtOT1JJQ1MgR21i
-SDEbMBkGA1UEAxQSZ2xhdmVncnVwcGVfY2xhc3MxMRswGQYJKoZIhvcNAQkBFgxz
-c2xAZ2xhdmUuZGUwHhcNMTYwNDI4MDcxMDIwWhcNMjEwNDI3MDcxMDIwWjCBoTEL
-MAkGA1UEBhMCREUxFTATBgNVBAgTDE9zdGZyaWVzbGFuZDEPMA0GA1UEBxMGTm9y
-ZGVuMRowGAYDVQQKExFHbGF2ZSBHcnVwcGUgR21iSDEUMBIGA1UECxMLTk9SSUNT
-IEdtYkgxGzAZBgNVBAMUEmdsYXZlZ3J1cHBlX2NsYXNzMTEbMBkGCSqGSIb3DQEJ
-ARYMc3NsQGdsYXZlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-2xAHvfrpXDM89+/t88fvZ8+D7MTbVgWPWP4VRUE4nCMiKypyAaO0yNEo5VwyieVC
-u5uJBn5QTc0eHrRTgmk9wP8pyjevBKmkmpn7VVvrPNPCw8OrPV3LZl7hz9m0EZNf
-m360+Ysliz6deFe5P86xDyN4gGkQkxhk5F02vvBMIRBCdtsKmkkUVhu/GDeZs4eP
-zcTRmrdZis/jScMAdbdv+3AQWUfov1ukcTwqc6RJqNpn1IkqJFBkBjoMm4R/WGn3
-VhiZnSyu4GBjM9c2f5XwWZsvDH7B/vcHBfg3aB0IJI9hfbWf0u/NOdq94qT+qT+q
-HLYsnJuEx6AKROGMAJV2UQIDAQABo4IBmTCCAZUwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUZCVnZUSQIc8HTbn4fFYUaZXrChswgdYGA1UdIwSBzjCBy4AUZCVn
-ZUSQIc8HTbn4fFYUaZXrChuhgaekgaQwgaExCzAJBgNVBAYTAkRFMRUwEwYDVQQI
-EwxPc3Rmcmllc2xhbmQxDzANBgNVBAcTBk5vcmRlbjEaMBgGA1UEChMRR2xhdmUg
-R3J1cHBlIEdtYkgxFDASBgNVBAsTC05PUklDUyBHbWJIMRswGQYDVQQDFBJnbGF2
-ZWdydXBwZV9jbGFzczExGzAZBgkqhkiG9w0BCQEWDHNzbEBnbGF2ZS5kZYIJAPC/
-OZFpGDBKMAsGA1UdDwQEAwIBBjARBglghkgBhvhCAQEEBAMCAAcwFwYDVR0RBBAw
-DoEMc3NsQGdsYXZlLmRlMBcGA1UdEgQQMA6BDHNzbEBnbGF2ZS5kZTA4BglghkgB
-hvhCAQ0EKxYpVGhpcyBjZXJ0aWZpY2F0ZSBpcyBhIFJvb3QgQ0EgQ2VydGlmaWNh
-dGUwDQYJKoZIhvcNAQELBQADggEBALrqw3vhiIWJjhj19o9T3slyKxT6xR2TJpJf
-s2C27I4ihsuFOm98eV6JhzhZwQU3n/ZQU/56ei2SsLZF3v7HSQxGquGOIkt8N74X
-VmFoZyPBF5NUn6ExK8RF6dPKbbK8beVRB8zpDhlgF/OBunr67uXQYSCvUFyIAAoE
-NSrojxUqURRaeja7V4sHympveRszGmQV3DvI+UZ6RawLbl7eUWHS1GBG055pmNiF
-SyFugFESTgC7ceuyDkeAlQ+BXILq/tvn/DoBzYxuGndFCGlKTkinqVj+2ppd2lB8
-kGIQK1Ez9SB162rWt6BLzJm/mbqlJSb5Arwmhb70bQRkvN2InXI=
-----END CERTIFICATE-----
--- a/app-text/ecub/Manifest
+++ b/app-text/ecub/Manifest
@ -1,3 +0,0 @@
-DIST ecub_1.11-1_amd64.deb 4511550 RMD160 a8654979e3422398ee20d61a1286e4117ef4bb42 SHA1 04cd669f3c46e9f1b02eb0e24392732861ed93d4 SHA256 8c02351cf71bc46f2f6ccc818c3e216d87de943dd4fd622051c9e8ed4dab87bc
-DIST ecub_1.11-1_i386.deb 4464632 RMD160 ea411556f7cf768cba0dbb0fd813011ed6b4a3d7 SHA1 b5613cc0fad36800a57f98b5d063e05519b0ef40 SHA256 cd39b483b0d08678b0cb8824c32abefddd296fa445ae0375db4a2db37b3d74d9
-EBUILD ecub-1.11.ebuild 1172 RMD160 1fc958ffe712a108c4c6b837d3a439bdc6ee439b SHA1 424e92e017a14f35b1b64463d7b426a9d129162f SHA256 5ffea11d22eaa9f14b6599da15ed50e0aaf4d9115bcb9a5147104eaf7c654f2e
--- a/app-text/ecub/ecub-1.11.ebuild
+++ b/app-text/ecub/ecub-1.11.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="A simple to use EPUB and MobiPocket ebook creator"
-HOMEPAGE="http://www.juliansmart.com/ecub"
-SRC_URI="x86? ( http://www.anthemion.co.uk/ecub/ecub_${PV}-1_i386.deb )
-amd64? ( http://www.anthemion.co.uk/ecub/ecub_${PV}-1_amd64.deb )"
-
-# LICENSE="eCub"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-DEPEND="app-arch/deb2targz"
-RDEPEND=""
-
-src_unpack() {
-	ARCH_SUFFIX=""
-	if use x86 ; then
-		ARCH_SUFFIX="i386"
-	fi
-	if use amd64 ; then
-		ARCH_SUFFIX="amd64"
-	fi
-	DEBFILE="ecub_${PV}-1_${ARCH_SUFFIX}.deb"
-	TGZFILE="ecub_${PV}-1_${ARCH_SUFFIX}.tar.gz"
-	cd ${WORKDIR}
-	ln -s ${DISTDIR}/${DEBFILE} .
-	deb2targz ${DEBFILE}
-	tar xzf ${TGZFILE}
-	rm ${DEBFILE}
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share
-	dodir /usr/share/applications
-	dodir /usr/share/pixmaps
-	cd ${WORKDIR}
-	cp -R "usr/share/ecub" "${D}usr/share/" || die
-	dosym /usr/share/ecub/ecub /usr/bin/ecub
-	insinto /usr/share/pixmaps
-	newins usr/share/ecub/appicons/ecub48x48.png ecub.png
-	insinto /usr/share/applications
-	doins usr/share/ecub/ecub.desktop
-}
-
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@ -1,3 +0,0 @@
-AUX gradle-bin.bash-completion 319 SHA256 40ff2f0b4a7eecc11dddd75006b94a12091e2a6a50aea9b7e6b5eacccfd2df6e SHA512 fa295147b6c82c32704381b523815f256d82124492bda8cda9daa5c3d375f76cbd949831306947e454ba17a534448a13a84a3a40d74aec6597d3d822fa62828a WHIRLPOOL fc6dc0e48543023e067514992bd370e179503f47fa03cbf24c2f15e673f699eaf68d9c1f01f18cf8b020895407aa19eaf9c503ac796a9debecc444649aa47246
-DIST gradle-1.12-all.zip 57658365 SHA256 cf111fcb34804940404e79eaf307876acb8434005bc4cc782d260730a0a2a4f2 SHA512 22c36ac3de35168aa736ee5370933c74656086e26f398ea40a1562f44c7388146db344604bccd188502dd2ec7577b091fdf455b0828eb8783870b6ac17797f74 WHIRLPOOL d4d4b1ef65da664cf1e0da995c7c029f7693d50d3bad3603c456ad081f50e580477c40e10b2bf98ddb4353ffd09ec426564e20c942f84f52a961c829b3672d8c
-EBUILD gradle-bin-1.12.ebuild 1198 SHA256 a8d39c2cfd4f4449caf0ed2e59f55c72e527270abd055443f0ad2497d247729c SHA512 63c9e283078af503fc547060ed9220c0f1d1ca37b8ef00d86da9c8399f625812664f8860535ca6bbfcec7708a11763c4f973fc432f30a02973722c42cd4292d0 WHIRLPOOL 66f8246ab9efb7ecfb71fd44be8e57f16326c6c9da0d9e06108a69419160d80f7584d532c0fc88dc797ce53961e894dacc26cd1a22cd8df83f84406ea499eff7
--- a/dev-java/gradle-bin/files/gradle-bin.bash-completion
+++ b/dev-java/gradle-bin/files/gradle-bin.bash-completion
@ -1,14 +0,0 @@
-#!/bin/bash
- 
-_gradle_complete()
-{
-    local cur tasks
- 
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    tasks='clean compile dists javadoc jar test war'
-    cur=`echo $cur | sed 's/\\\\//g'`
-    COMPREPLY=($(compgen -W "${tasks}" ${cur} | sed 's/\\\\//g') )
-}
- 
-complete -F _gradle_complete -o filenames gradle
--- a/dev-java/gradle-bin/gradle-bin-1.12.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-1.12.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit java-pkg-2 bash-completion-r1
-
-MY_PN=${PN%%-bin}
-MY_PV=${PV/_pre/-milestone-}
-MY_PV=${MY_PV/_rc/-rc-}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Build Tool for Java"
-SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
-HOMEPAGE="http://www.gradle.org/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="app-arch/zip"
-RDEPEND=">=virtual/jdk-1.5"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-
-src_unpack() {
-	unpack ${A}
-}
-
-
-src_install() {
-	default
-	newbashcomp ${FILESDIR}/${PN}.bash-completion gradle
-
-	local gradle_home="${ROOT}/usr/share/${PN}"
-
-	insinto "${gradle_home}"
-
-	# source
-	if use source ; then
-		java-pkg_dosrc src/*
-	fi
-
-	# docs
-	if use doc ; then
-		java-pkg_dojavadoc docs
-	fi
-
-	# examples
-	if use examples ; then
-		java-pkg_doexamples samples
-	fi
-
-	# jars
-	cd lib
-	for jar in *.jar; do
-		java-pkg_newjar ${jar} ${jar}
-	done
-
-	# plugin jars
-	insinto "${gradle_home}/lib/plugins"
-	doins plugins/*
-
-	java-pkg_dolauncher "gradle" --main org.gradle.launcher.GradleMain --java_args "-Dgradle.home=${gradle_home} \${GRADLE_OPTS}"
-}
--- a/dev-java/jarjar/Manifest
+++ b/dev-java/jarjar/Manifest
@ -1,2 +0,0 @@
-DIST jarjar-1.1.jar 113329 RMD160 0ff57ce5d32ef3b34d9ba3f5d076b1b868a4ebad SHA1 88085e95e0c9cf49e29116bd467a5dccd07d40a0 SHA256 4838f4f29a027522363cef1bcda1b48808880b0de4953fab6db4121ee27b649b
-EBUILD jarjar-1.1.ebuild 630 RMD160 390dd0c22aa4cab143f2e5561ba7be593a84ea34 SHA1 dda57746ddfd02b22477533663f9e84ead3dcba4 SHA256 86e24f0dfbb96a8215893b2edc1a88180f0753a76fbcda1d9fd61563ab7ef627
--- a/dev-java/jarjar/jarjar-1.1.ebuild
+++ b/dev-java/jarjar/jarjar-1.1.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Tool for repackaging third-party jars."
-HOMEPAGE="http://code.google.com/p/jarjar/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEP="dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}"
-
-src_unpack() {
-	einfo "Nothing to unpack"
-}
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}/${P}.jar" "${PN}.jar"
-	java-pkg_register-ant-task
-}
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -1,5 +0,0 @@
-AUX 20php5-envd 145 BLAKE2B 06476b8fc04d1e835496b417ac752f0834ddbe8584e4fddc6db0aa5e6845b82cdea0a1355c77125375dcdd0f0a3c19de5f3a8a64ee93950f96c437a16f971567 SHA512 581aa86479e3cd584ee1bc6dc6d4a135fe8ec343fe5519566d728d81f7018cfb23658bd0c0368951d380982c75adbb4f45acf3c146868aaf4e4ec8e9f2fad1ce
-AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd
-DIST php-5.6.40.tar.xz 12472236 BLAKE2B f41147eaec9b15e965540f9e871691cc88848dd619bae6af85e7bba0130b71ce91bad5cdbbadbb537c42df83369f5c731007339a9d9e21e689e913c135201afc SHA512 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329
-DIST php-patches-7.1.31bp.tar.bz2 37219 BLAKE2B 4f3ead2f69adf00ac1317371172c8adbb823f597cd8e3cafe7044d6a46671437fd2e5eaef4309a6fd5825123394044543284d3cbe892c918353a5b07c12b7401 SHA512 eb52679d035ceb4124c8e9175024f4f753e20d139479af4a57e01de941991716b2ce37f6190242c1bec46fd5305bad1f91613b04ee849a0d94f4a33ce013781e
-EBUILD php-5.6.40-r7.ebuild 23005 BLAKE2B 5151009dd1a4becf11b76ce56b8c84238a03a3f5d32724a7f4c12f8e61fb8bac30aa432acad02997f170e1e572bbf1dddff9963e8b3a38470c1cb3403dc97ed8 SHA512 4b9cc375692ceac006b618b47fea9d4d2d0d38d08bfe78f54b180a03a38900633549551bb01912f66e25ff5f92c2321b8ff0ab2db32ea2c5765a8ab2c7917705
--- a/dev-lang/php/files/20php5-envd
+++ b/dev-lang/php/files/20php5-envd
@ -1,2 +0,0 @@
-MANPATH="/usr/lib/php5/man/"
-CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/"
--- a/dev-lang/php/files/php-fpm_at-simple.service
+++ b/dev-lang/php/files/php-fpm_at-simple.service
@ -1,13 +0,0 @@
-[Unit]
-Description=The PHP FastCGI Process Manager
-After=network.target
-
-[Service]
-Type=simple
-PIDFile=/run/php-fpm/php-fpm-%I.pid
-ExecStart=/usr/libexec/php-fpm-launcher php%I -y /etc/php/fpm-php%I/php-fpm.conf --nodaemonize
-ExecReload=/bin/kill -USR2 $MAINPID
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
--- a/dev-lang/php/php-5.6.40-r7.ebuild
+++ b/dev-lang/php/php-5.6.40-r7.ebuild
@ -1,789 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools flag-o-matic systemd
-
-PATCH_V="7.1.31bp"
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://php.net/distributions/${P}.tar.xz
-	https://gitweb.gentoo.org/proj/php-patches.git/snapshot/php-patches-${PATCH_V}.tar.bz2"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
-	coverage crypt +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib:0=
-	) )
-	coverage? ( dev-util/lcov )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib:0=
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	libmysqlclient? (
-		mysql? ( virtual/libmysqlclient:= )
-		mysqli? ( virtual/libmysqlclient:= )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
-	)
-	unicode? ( dev-libs/oniguruma:= )
-	vpx? ( media-libs/libvpx:0= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib:0=
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	vpx? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	recode? ( !imap !mysql !mysqli !libmysqlclient )
-	libmysqlclient? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	sharedmem? ( !threads )
-"
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	local patchdir="${WORKDIR}/php-patches-${PATCH_V}"
-
-	eapply "${patchdir}/"
-
-	# Copy test binaries from patches
-	local ext_src
-	for ext_src in exif iconv ; do
-		cp "${patchdir}/${ext_src}/"* "ext/${ext_src}/tests/" || die
-	done
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
-		|| die
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	eapply_user
-
-	# Force rebuilding aclocal.m4
-	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-
-	mv configure.in configure.ac || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with crypt mcrypt "${EPREFIX}/usr")
-		$(use_with mssql mssql "${EPREFIX}/usr")
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_with truetype t1lib "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-		$(use_with vpx vpx-dir "${EPREFIX}/usr")
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-	use libmysqlclient && mysqllib="${EPREFIX}/usr"
-	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib)
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@ -1,6 +0,0 @@
-AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7
-AUX rspamd-r6.init 1370 BLAKE2B 333683396f499c3d1cfc92d67434fc9d1fdab695b1ddf9798d0bed42b227111cb9c779fd33e04bb095affd09326edf6f80100d58248061795bf3540e2e9e0771 SHA512 40016348ed413414c9a06182f8da896bcb5b0f48bf7ec51db1cd7e4f9adea59e30c6c5ddc79135141b795e829af2660c047ed8f93fed1e181f9f2f01a419d690
-AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb2696bfb32b70c31ceeaded873f06c759a471d534fb872656907e73ee095150fae384de4df6e9946 SHA512 753011de167af9261cc67676357aadf34d0b160d343a20d5efe8b3389e8a604775b7a6abbaad3174acae7df5579b52b4ba8a0a714419084befedfa96a3a8a9b1
-AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
-DIST rspamd-1.9.4.tar.gz 4476230 BLAKE2B e4866fb8fd97210e77b75d948ae97f038eccc33ec9f6214693579e5d84210c87ff9258204f466ffe6bea780159d24d819aaf393a06dbf2785659a784e4f4e8b6 SHA512 3acecec6adb91580ac2ad96419fdc9588b120ec5a3b4a44135fc5a3e7c15f2dbc99963a8337f9effb9423846489545a55d89d1849c5ba62d8cd91dc67c32d8dc
-EBUILD rspamd-1.9.4.ebuild 2290 BLAKE2B 1a68c93b750e01577ff7e44cf3ffed525eb578402872115720ddc815efb5b1cab3b01dfbe7963127af75dadd08ddf9639ad8649cd3b5cddd4148df14250b9b1f SHA512 f91b6bc65cef4ed42814bc0d4ea124723ade7de84226a4b5ef04b199e78cf4561e0612079826fab03534bbd74742e0ea32e61f5404834e5284ccbacde38047ee
--- a/mail-filter/rspamd/files/rspamd-r1.logrotate
+++ b/mail-filter/rspamd/files/rspamd-r1.logrotate
@ -1,16 +0,0 @@
-/var/log/rspamd/rspamd.log {
-	daily
-	rotate 4
-	delaycompress
-	compress
-	notifempty
-	missingok
-	postrotate
-		if test -d /run/systemd/system ; then
-			systemctl kill -s USR1 --kill-who=main rspamd.service
-		else
-			test -r /run/rspamd.pid && kill -USR1 $(cat /run/rspamd.pid) &>/dev/null
-		fi
-	endscript
-}
-
--- a/mail-filter/rspamd/files/rspamd-r6.init
+++ b/mail-filter/rspamd/files/rspamd-r6.init
@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2015-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-RSPAMD_CONFIGFILE=${RSPAMD_CONFIGFILE:-"/etc/rspamd/rspamd.conf"}
-RSPAMD_GROUP=${RSPAMD_GROUP:-rspamd}
-RSPAMD_OPTS=${RSPAMD_OPTS:-""}
-RSPAMD_PIDFILE=${RSPAMD_PIDFILE:-"/run/rspamd.pid"}
-RSPAMD_USER=${RSPAMD_USER:-rspamd}
-
-command="/usr/bin/rspamd"
-command_args="${RSPAMD_OPTS} -c \"${RSPAMD_CONFIGFILE}\" -u ${RSPAMD_USER} -g ${RSPAMD_GROUP} --pid \"${RSPAMD_PIDFILE}\""
-start_stop_daemon_args=${RSPAMD_SSDARGS:-"--wait 1000"}
-pidfile="${RSPAMD_PIDFILE}"
-retry=${RSPAMD_TERMTIMEOUT:-"TERM/60/KILL/5"}
-
-required_files="${RSPAMD_CONFIGFILE}"
-
-description="Rapid spam filtering system"
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-description_checkconfig="Validate rspamd's configuration"
-description_reload="Sends rspamd a signal to reload its configuration"
-
-depend() {
-	before mta
-	use dns redis
-}
-
-checkconfig() {
-	${command} -c "${RSPAMD_CONFIGFILE}" -u ${RSPAMD_USER} -g ${RSPAMD_GROUP} -t 1>/dev/null \
-		|| return 1
-}
-
-reload() {
-	checkconfig || return 1
-
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
-
-start_pre() {
-	if [ "${RC_CMD}" != "restart" ]; then
-		checkconfig || return 1
-	fi
-}
-
-stop_pre() {
-	if [ "${RC_CMD}" = "restart" ]; then
-		checkconfig || return 1
-	fi
-}
--- a/mail-filter/rspamd/files/rspamd.conf
+++ b/mail-filter/rspamd/files/rspamd.conf
@ -1,26 +0,0 @@
-# /etc/conf.d/rspamd
-
-# Configuration file
-#RSPAMD_CONFIGFILE="/etc/rspamd/rspamd.conf"
-
-# PID file
-# If you should ever change this, remember to update
-# "/etc/logrotate.d/rspamd", too.
-#RSPAMD_PIDFILE="/run/rspamd.pid"
-
-# You can use this configuration option to pass additional options to the
-# start-stop-daemon, see start-stop-daemon(8) for more details.
-# Per default we wait 1000ms after we have started the service to ensure
-# that the daemon is really up and running.
-#RSPAMD_SSDARGS="--wait 1000"
-
-# The termination timeout (start-stop-daemon parameter "retry") ensures
-# that the service will be terminated within a given time (60 + 5 seconds
-# per default) when you are stopping the service.
-#RSPAMD_TERMTIMEOUT="TERM/60/KILL/5"
-
-# Options to rspamd
-# See rspamd(8) for more details
-# Notes:
-# * Do not specify another CONFIGFILE but use the variable above to change the location
-#RSPAMD_OPTS=""
--- a/mail-filter/rspamd/files/rspamd.tmpfile
+++ b/mail-filter/rspamd/files/rspamd.tmpfile
@ -1 +0,0 @@
-d /run/rspamd 0755 rspamd rspamd
--- a/mail-filter/rspamd/rspamd-1.9.4.ebuild
+++ b/mail-filter/rspamd/rspamd-1.9.4.ebuild
@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils pax-utils systemd tmpfiles user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://github.com/vstakhov/rspamd"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cpu_flags_x86_ssse3 gd jemalloc +jit libressl pcre2 +torch"
-REQUIRED_USE="torch? ( jit )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/icu:=
-	dev-libs/libevent:=
-	net-libs/libnsl
-	sys-apps/file
-	dev-util/ragel
-	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
-	gd? ( media-libs/gd[jpeg] )
-	jemalloc? ( dev-libs/jemalloc )
-	jit? ( dev-lang/luajit:2 )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	pcre2? ( dev-libs/libpcre2[jit=] )
-	!pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup rspamd
-	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e 's/User=_rspamd/User=rspamd/g' \
-		rspamd.service \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFDIR="${EPREFIX}/etc/rspamd"
-		-DRUNDIR="${EPREFIX}/var/run/rspamd"
-		-DDBDIR="${EPREFIX}/var/lib/rspamd"
-		-DLOGDIR="${EPREFIX}/var/log/rspamd"
-		-DENABLE_LUAJIT=$(usex jit ON OFF)
-		-DENABLE_GD=$(usex gd ON OFF)
-		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
-		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
-		-DENABLE_TORCH=$(usex torch ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newconfd "${FILESDIR}"/rspamd.conf rspamd
-	newinitd "${FILESDIR}/rspamd-r6.init" rspamd
-	systemd_newunit rspamd.service rspamd.service
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-	# Remove mprotect for JIT support
-	if use jit; then
-		pax-mark m "${ED%/}"/usr/bin/rspamd-* "${ED%/}"/usr/bin/rspamadm-*
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
-
-	diropts -o rspamd -g rspamd
-	keepdir /var/{lib,log}/rspamd
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-}
--- a/mail-filter/tumgreyspf/Manifest
+++ b/mail-filter/tumgreyspf/Manifest
@ -1,2 +0,0 @@
-DIST tumgreyspf-1.38.tar.gz 30751 SHA256 bffec3f197e5a8cb009abd568b81e04f9316ded75a1e6007284282f1487993c8 SHA512 5977ec221265193f24d3740cc5d8f893906885ec4054b054eca4c57c643c0bb0bd045ad1c719440db41649b51c6d2f3bf8787c7008bb143661d18a9ffd35f204 WHIRLPOOL 03272e7524be94804178b48a76463cbcbafddc26ff1216969583847553388dd9e0425222b24e27c425de9b158d8bab59e2ed7cc66a917f7f61423b32b4b95f8e
-EBUILD tumgreyspf-1.38.ebuild 1865 SHA256 27fe1b9ec573aa8a4c028f00ee99568238c6b27ba84d1e9d4d462c9638ee0bd5 SHA512 355a0ca2caf286129b9540abddbcba47a0c3ba09e75257dc242657f7733e9b600da1c6113723c571a7c8e936140a6cf220ca5a48b595d4ad460f0f3fc970665e WHIRLPOOL b8ea5c261c551c24b12f445d579c9659af40efedb0edc89e6e80313221f28ef7c9cd72ac959daedb3d493094ffe25a28e06861232b60bc0bbc04fa49435fcc1f
--- a/mail-filter/tumgreyspf/tumgreyspf-1.38.ebuild
+++ b/mail-filter/tumgreyspf/tumgreyspf-1.38.ebuild
@ -1,73 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# Author Micha Glave <gentoo@migmedia.de>
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 user
-
-
-DESCRIPTION="spf policy server written in python for Postfix"
-HOMEPAGE="http://www.tummy.com/Community/software/tumgreyspf/"
-SRC_URI="https://github.com/linsomniac/tumgreyspf/releases/download/release-${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="=dev-lang/python-2*"
-RDEPEND="${DEPEND}
-	dev-python/pyspf
-	>=mail-mta/postfix-2.1"
-
-# TODO
-# example for master.cf
-# make sure it works(!)
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# fix invalid path in sources
-	sed -i \
-	   -e "s!/usr/bin/env python!/usr/bin/env python2!g" \
-	   -e "s!/usr/local/lib/tumgreyspf/spfquery!/usr/bin/spfquery.py!g" \
-	   -e "s!/usr/lib/tumgreyspf/tumgreyspf!/usr/bin/tumgreyspf!g" \
-	   -e "s!/usr/local/lib/tumgreyspf!/usr/bin!g" \
-	   -e "s!/var/local/lib/tumgreyspf/config/!/etc/tumgreyspf/!g" \
-	   -e "s!/var/local/lib/!/var/lib/!g" \
-	   -e "s!tumgreyspf_user = 'nobody'!tumgreyspf_user = '${PN}'!" \
-	   * || die "fixing pathnames failed"
-}
-
-src_install() {
-	local MY_FILES
-	local MY_FILE
-	MY_FILES="TODO LICENSE README WHATSNEW
-		README.performance README.QuickStart"
-	for MY_FILE in $MY_FILES; do
-		dodoc $MY_FILE
-	done
-
-	doman tumgreyspf.8
-
-	insinto /etc/${PN}
-	doins tumgreyspf.conf
-	newins __default__.dist __default__
-
-	MY_FILES="tumgreyspf tumgreyspf-clean tumgreyspf-configtest
-		tumgreyspf-install tumgreyspf-stat tumgreyspfsupp.py"
-	for MY_FILE in $MY_FILES; do
-		dobin $MY_FILE
-	done
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-	enewuser  ${PN} -1 -1 /var/lib/${PN} ${PN}
-
-	dodir /var/lib/${PN}/data
-	dodir /var/lib/${PN}/data/blackhole
-	fowners ${PN}:${PN} /var/lib/${PN}/data
-	fperms 700 /var/lib/${PN}/data
-}
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@ -1,2 +1,2 @@
-DIST plantuml-1.2020.11.tar.gz 4978136 BLAKE2B 8704d4d1008c88d55b2f0f933f5539517f84f892055fef0070203e744609f6e259c933587e164a74a53b83e3ba39544818a94418c962f9f885aabc73292a5442 SHA512 6a0644d01e0604179d407404d0a70f5e7276382d1c1e8a1f97251199e93660f6b56522b91875a46f89b20709b631cb6f9cd77f2ad0d1b6de036632e459a0ab28
-EBUILD plantuml-1.2020.11.ebuild 752 BLAKE2B 395c0b2d0670037c7f3d402bcf744eaf01bab1a30b4bbfe6723b9d3e7e74977d3191ce62e445d96210ddd3a7a46a55e0f422d46f57740f1a5f0c8cf46450dddc SHA512 e3df33845c7db1bf360fa282ee8db7ade401637a01a06dc89d576399ec85c615a2435e7055dfcdb2783935a1cf89c28317d6ed63e6aefc6d93d3471f869262a8
+DIST plantuml-1.2020.19.tar.gz 5023526 BLAKE2B 721aa4a4e41d4f8691ff5927551870e77735419b1b04f732679231bf80c6cf6a3fc0324e35f0596c41971ce9ff5149eb700e20ca39f7b8a8a53aa46fe5115c8b SHA512 ebbbb5af0c80c2b5c7ce8e2f58fb8cc8087c3d1976027ea89ec79578ba639c303292cd2d1104ea636bd6132d2e0279b7c09aaebf3a5b7ca8fc8526261a38ff6f
+EBUILD plantuml-1.2020.19.ebuild 752 BLAKE2B 395c0b2d0670037c7f3d402bcf744eaf01bab1a30b4bbfe6723b9d3e7e74977d3191ce62e445d96210ddd3a7a46a55e0f422d46f57740f1a5f0c8cf46450dddc SHA512 e3df33845c7db1bf360fa282ee8db7ade401637a01a06dc89d576399ec85c615a2435e7055dfcdb2783935a1cf89c28317d6ed63e6aefc6d93d3471f869262a8
--- a/net-analyzer/shinken/Manifest
+++ b/net-analyzer/shinken/Manifest
@ -1,4 +0,0 @@
-AUX shinken.confd 2192 SHA256 df19f603aac6f6a79f228e7982ad5e7b4fc47c001d2c0a3317e9aab80e31bb39 SHA512 45243de2da95a89aad2a615bde562b4dce133c1840ef1465e768c2a9165fe54893bc91dfd2769a928034ae1d82ea607dda98bd0d7d8aa444cb54c85342f971e0 WHIRLPOOL 93a26fd3e15ef5f95d13315d1e18fc0cba40678582d3e6b090063506f70cd9c8f90d15e4968fefefa5a9dc0fc5d7a6243d0e9147579101a62b1ce9969b424060
-AUX shinken.initd 1622 SHA256 22c739cb7a0e59920e0c9063a54e892b827f04d0dc1b0989c5a42c7edd395e0e SHA512 83e1d06852bfcd27c3932528b66cb800a1ea962f166af59d7b2b2278f43a8d70d12bd9c61115724db119021be7d606461f6d937518ff8737ab9d6a79bed0e216 WHIRLPOOL 800ba916f49a3ee4beb85cfa24561459915deb1f4ca3d0e473b12014cc85ab8b20ef11057478eff28da4735c1f5425e19979374a4c18f1ba80c756e74c18c345
-DIST 2.4.3.tar.gz 7750138 SHA256 393f28c6887bcbacab597f78903e961fbc8ed63a62d486e4783f3bfe50c51400 SHA512 689fb811f480b84673c5e0958671cd04f3073dbc91d9b1eed7aa0ed52167c0ca3afd1efa66835b02620e515528cd30e0d7bca82989a2189215f6b17e7c24e439 WHIRLPOOL b6b4539a66b78ac2ee08e40af347eb1a59aaf97b64c2c93c02d3492208327612683f87dce49b36e900ee384940980fe87f2d2c20e808b76304c37f73a5b4688d
-EBUILD shinken-2.4.3.ebuild 1511 SHA256 633cd1d806e39bf8f4bee1eca127cd1333e75337bd824e91380041d30f89de25 SHA512 d77b2dcc954e44c3722686eeaec74e3ce216332a58c7c81542a63d99689d7374581deeb8bbc31e23a793d133bc183d1d019ea2687390b25b2fb17e2b6fff360d WHIRLPOOL 07173edf607cfdb8358229afd8c33f3eb5044cbebe8c7e806c03d917cf61e686513bd5b42802ccca22cc0734f1ebc46c061ba54664aa193c2cb525159e9d159e
--- a/net-analyzer/shinken/files/shinken.confd
+++ b/net-analyzer/shinken/files/shinken.confd
@ -1,92 +0,0 @@
-# /etc/conf.d/shinken
-
-# location of the nagios configuration file
-
-SHINKENCFG="/etc/shinken/shinken.cfg"
-
-# We got 2 configs because tools like Centreon don't generate all
-#configuration (only the shinken.cfg part)
-#SHINKENSPECIFICCFG="/etc/shinken/shinken-specific.cfg"
-
-
-ARBITERCFG="/etc/shinken/arbiters/arbiter-master.cfg"
-
-# The command to launch
-ARBITERDAEMON="/usr/bin/shinken-arbiter"
-
-#The ARBITER PID
-ARBITERPID="/var/run/shinken/arbiterd.pid"
-
-ARBITERDEBUGFILE="/var/log/shinken/arbiter-debug.log"
-
-
-###SCHEDULER PART
-# location of the scheduler daemon configuration
-SCHEDULERCFG="/etc/shinken/schedulerd.ini"
-
-# The command to launch
-SCHEDULERDAEMON="/usr/bin/shinken-scheduler"
-
-#The SCHEDULER PID
-SCHEDULERPID="/var/run/shinken/schedulerd.pid"
-
-SCHEDULERDEBUGFILE="/var/log/shinken/scheduler-debug.log"
-
-###POLLER PART
-# location of the poller daemon configuration
-POLLERCFG="/etc/shinken/pollerd.ini"
-
-# The command to launch
-POLLERDAEMON="/usr/bin/shinken-poller"
-
-#The poller pid
-POLLERPID="/var/run/shinken/pollerd.pid"
-
-POLLERDEBUGFILE="/var/log/shinken/poller-debug.log"
-
-
-###REACTIONNER PART
-# location of the reactionner daemon configuration
-REACTIONNERCFG="/etc/shinken/reactionnerd.ini"
-
-# The command to launch
-REACTIONNERDAEMON="/usr/bin/shinken-reactionner"
-
-#The reactionner pid
-REACTIONNERPID="/var/run/shinken/reactionnerd.pid"
-
-REACTIONNERDEBUGFILE="/var/log/shinken/reactionner-debug.log"
-
-
-###BROKER PART
-# location of the broker daemon configuration
-BROKERCFG="/etc/shinken/daemons/brokerd.ini"
-
-# The command to launch
-BROKERDAEMON="/usr/bin/shinken-broker"
-
-#The broker pid
-BROKERPID="/var/run/shinken/brokerd.pid"
-
-BROKERDEBUGFILE="/var/log/shinken/broker-debug.log"
-
-
-###RECEIVER PART
-# location of the broker daemon configuration
-RECEIVERCFG="/etc/shinken/daemons/receiverd.ini"
-
-# The command to launch
-RECEIVERDAEMON="/usr/bin/shinken-receiver"
-
-#The broker pid
-RECEIVERPID="/var/run/shinken/receiverd.pid"
-
-RECEIVERDEBUGFILE="/var/log/shinken/receiver-debug.log"
-
-# nicelevel to run shinken daemon with
-NICENESS=5
-
-# user/group for the var/run rights
-#SHINKENUSER=shinken
-#SHINKENGROUP=shinken
-#HOME=`grep ^$SHINKENUSER: /etc/passwd | cut -d: -f 6`
--- a/net-analyzer/shinken/files/shinken.initd
+++ b/net-analyzer/shinken/files/shinken.initd
@ -1,68 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-MODULE="xxMODULExx"
-PIDPATH=${PIDPATH:-/var/run/shinken}
-PIDFILE=${PIDPATH}/${MODULE}
-
-source /etc/conf.d/shinken
-
-SHINKENUSER=${SHINKENUSER:-shinken}
-SHINKENGROUP=${SHINKENGROUP:-shinken}
-
-export LANG=en_US.UTF8
-export LC_ALL=en_US.UTF8
-export PYTHONIOENCODING=utf8
-export PYTHONUNBUFFERED="0"
-export TZ=:/etc/localtime
-# also unset http proxy, because pycurl is using it and this is bad, very bad :)
-unset http_proxy
-unset https_proxy
-extra_commands="check"
-
-if [ -r "${XXUMODXXCFG}" ] ; then
-	tmppid=`grep 'pidfile=' ${XXUMODXXCFG} | grep -v '#' | tail -n 1 | awk -F '=' '{print $2}'`
-	XXUMODXXPID=${tmppid:-$XXUMODXXPID}
-fi
-
-depend() {
-	need net
-	if [ $SVCNAME = "shinken" ]; then
-		need ${SHINKENSERVICES}
-	fi
-}
-
-start() {
-	if [ $SVCNAME = "shinken" ]; then
-		ebegin "all shinken-services started"
-		return 0
-	fi
-	ebegin "Starting shinken xxMODULExx"
-
-	## --user ${SHINKENUSER}:${SHINKENGROUP} \
- 	start-stop-daemon --start \
-	   --exec /usr/bin/shinken-xxMODULExx --quiet \
-	   --pidfile ${XXUMODXXPID} -- --config=${XXUMODXXCFG} --daemon
-	eend $?
-}
-
-stop() {
-	if [ $SVCNAME = "shinken" ]; then
-		ebegin "all shinken-services stopped"
-		return 0
-	fi
-	ebegin "Stopping shinken xxMODULExx"
-	start-stop-daemon --stop --exec /usr/bin/shinken-xxMODULExx --quiet \
-	   --pidfile ${XXUMODXXPID}
-	eend $?
-}
-
-check() {
-	/usr/bin/shinken-arbiter -v --config="${ARBITERCFG}" \
-	   --config="${SHINKENCFG}" $DEBUGCMD 2>&1
-	return $?
-}
-
-# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
--- a/net-analyzer/shinken/shinken-2.4.3.ebuild
+++ b/net-analyzer/shinken/shinken-2.4.3.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_DEPEND="2:2.7"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils user
-
-DESCRIPTION="Shinken is a new monitoring tool written in Python and compatible with Nagios."
-HOMEPAGE="http://shinken-monitoring.org/"
-SRC_URI="https://github.com/naparuba/shinken/archive/${PV}.tar.gz"
-
-LICENSE="AGPLv3"
-SLOT="0"
-IUSE="livestat +arbiter broker poller reactionner receiver scheduler +webui"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pyro:3
-	dev-python/pycurl
-	dev-python/cherrypy
-	webui? ( dev-python/pymongo )
-	livestat? ( dev-python/simplejson )
-	poller? ( net-analyzer/nagios-plugins )
-	"
-DEPEND="${RDEPEND}
-	!net-analyzer/nagios"
-
-SHINKENMODULES="arbiter broker poller reactionner receiver scheduler"
-
-pkg_setup() {
-	python_pkg_setup
-	ebegin "Creating shinken user and group"
-    enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-mkinitd() {
-  for mod in ${SHINKENMODULES}; do
-    if (use $mod) ; then
-	  uMOD=$(awk '{print toupper($0)}' <<< $mod)
-      sed -e "s!xxMODULExx!$mod!g" \
-	      -e "s!XXUMODXX!$uMOD!g" \
-	      ${FILESDIR}/shinken.initd > ${D}etc/init.d/shinken-$mod
-    fi
-  done
-}
-
-src_install() {
-	distutils_src_install --root=${D}
-
-	rmdir ${D}var/run/${PN}
-	rm ${D}etc/default/shinken
-	newconfd "${FILESDIR}"/shinken.confd  shinken
-	
-	keepdir "/var/log/${PN}"
-	mkinitd
-
-	cp -R "${S}/etc" "${D}/etc" || die "Install failed!"
-	mv ${D}/etc/etc ${D}/etc/${PN}
-}