gentoo resync : 25.11.2020

7 files changed, 2 insertions, 116 deletions

diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index 79d92dbaf9e2..52ae1899e68f 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -1,11 +1,4 @@
-AUX php-fpm-launcher 134 BLAKE2B fdbb99bbbd0d171975aff6f55ba7c41fe152c330cfb05dff81ab033d2490af27c52b8e43e5ed1ae80ee3c6ba8a1471adb01778d6b76bdd7776845f7c93e12428 SHA512 4304ea6df7093af06f1b7df5bf5d8ed7692403cc64a5c4c516e49d36fa866b33e4815876d28cc365f5ccb1e301ef7ce9b57e15ed959a41c91fb25af7236fed29
-AUX php-fpm-launcher-r3 223 BLAKE2B 80c90d2388118e6dbdceacebbc87de145e94e34a6d9691b6c3179df4f05631d904c1c3e5647dd080ff2080c346bffcb71bee96d4d4123f6c4d3be0120161c960 SHA512 9dfd36f88457a57a31c17cb251a8aeeef505f811f9ac59c5715532c3780b543034a6a9d356f4111fab1998883299ece0a68508dd3e154bc54de84ce6805bf351
-AUX php-fpm.conf 29 BLAKE2B 505e957038315f8668a558f91eac2ad8ae6bc3e87db238001042ddfe7d817c1589891235d88edc91e213215b7a632fa9358795290599223097ac66f546085c1c SHA512 824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f
-DIST eselect-php-0.9.4.tar.xz 49576 BLAKE2B 417956b355ffec7d7cda03dffa94e4d749a2b33a64a216c2ed8492181a5385f5219078efe6cc4d0d2d81b0fac40901c0cf07914a826484b83833542a12b47359 SHA512 2ba1dd75d4bb9611c6687ed4449f715728263538f772652aa1ac013103cf9ddf328c854326cf6da4f9b3ff2279bf99d973325520fe8b4e3ba7a76a9c3264e78e
-DIST eselect-php-0.9.5.tar.xz 49732 BLAKE2B 78c2010abcb1c9efd4d5f2f3f934365b338901a98bc8528131f2b9f564c1c3f740ab2dc2a28a0a58912e750062e61f75a7c6611c2f37019ca6525d729ffb5fd2 SHA512 55e401cb0c3ed19fed90485d62ba3deed3355503542898ff0d1b5404bd5fafb2f887df433609d4d4b28f32c0034100ea32c9e58547ef6417ea0b0f60d061d119
 DIST eselect-php-0.9.6.tar.xz 53236 BLAKE2B 38478d4792f8a527e5f519abd7765211aff8c1d132ceeba5eec70ea3b8d1f254be52564334fed3840950c2461ff4a30784b92fbb8b21cc448083617797eab1d4 SHA512 d3f14288b3493cb48717c1f27430ae8b60881e9f6f48e4b7644a4596d9fc1b9823a6af8b7101a62b28a92e3bff164b1717617a2642a5bb02e8dd46de56d4f410
-EBUILD eselect-php-0.9.4-r5.ebuild 1356 BLAKE2B dc14c86dcb6323af5bed9cc11c3712800d4cff90fae5912c0bf26b74ec46aa22c4d4d9ac39b295e91798bd7505141ba81e0a35726f6225120b1ac891b611087e SHA512 b6be738c14ad455eed657e30fa9495e5cd9a26744ca3e10ff465aad60ba29b6a1fb8416eb41059e593e30bb60b476e0a80a37f4f6092b039943db978fe6fe05d
-EBUILD eselect-php-0.9.5.ebuild 1364 BLAKE2B 9053d4938b14989de8de1436bcf877845d376f1d44628e2adf93fbf6259d1c589a78ec65b539dafc401f299bcb6d7cda9671c1b315417cde29f3cda89617740d SHA512 eb08bcee2dccd2fb09f5091daa2b09de3a5adb2493ca5af025c46abdba01396de04cb34a26e54b0f2c3dd25bf54582d9ab67b16326172144a01f480cdc612c24
-EBUILD eselect-php-0.9.6.ebuild 1103 BLAKE2B 97d545fcfa214c93477cab816ae7f312434308efcb5ba067ffa254a34dbf60c341ab6e7c8767f2ce62a8c0f0269f37b2d1eee954dd3584268b852c9ef9bb17fa SHA512 975c9e633477afe859ef60a1ac422ecfa4c7e9b1e0f1e541420ecb36c06bd51beba61c347a7b65eca1065fec87fc8262fe6ca80d6a96d9e217a0b841161f8b37
+EBUILD eselect-php-0.9.6.ebuild 1095 BLAKE2B 8d6950a14070043e62a30a8528f92ac89e6f86b87989cfe13ab7e3035a5c78331824c8aa7657c333b188a7af9a7e760bcb4dbb19990ebd308c89c650bcb9ad00 SHA512 1dbbde280a8569e064eac769b266561c5fbd31d7abc6aa79248f2604353a275ea1f0b8aa2cd3a508c9611c4b95ea58b1d112a90252e024f636e6b21ee7b8860a
 EBUILD eselect-php-9999.ebuild 1031 BLAKE2B 137e895ef07fe7c229cd111a101b17854685bdfc98772f4dae61dd391a31e8fcaf3505a1accf3d15754b0ac6d424defe2bb3ca6368623f0ac818cd078dcb5cfe SHA512 183e490a9c40858d8d48a94a8096604834fdabede72cc6b5917bccba2a377f5fa05d1512b19e22c6354c510f50b86462a1e788eb21214b5e616aa65db37ff901
 MISC metadata.xml 443 BLAKE2B d18f03330bdb4792f92dd86801ab889e1f311dd1be1c3e5047e86621864f38eb27c6d9d0252418a411236696f766a5813bda8717e12cf8015581fb4cff1824f5 SHA512 2651faf212833d425cd58c866b030d17543f84826a911a01c358815c3dc8fa0629870c901953746ad4029dbd7d16fba0db161d27f866e4763cc380f60934ef94
diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
deleted file mode 100644
index 294500392640..000000000000
--- a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="PHP eselect module"
-HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
-SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="fpm apache2"
-
-# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
-RDEPEND="app-admin/eselect
-	apache2? ( www-servers/apache[apache2_modules_dir] )"
-
-src_configure() {
-	# We expect localstatedir to be "var"ish, not "var/lib"ish, because
-	# that's what PHP upstream expects. See for example the FPM
-	# configuration where they put logs in @localstatedir@/log.
-	#
-	# The libdir is passed explicitly in case the /usr/lib symlink
-	# is not present (bug 624528).
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
-		  --localstatedir="${EPREFIX}/var" \
-		  --with-piddir="${EPREFIX}/run" \
-		  $(use_enable apache2) \
-		  $(use_enable fpm)
-}
-
-src_install() {
-	default
-
-	if use fpm ; then
-		systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
-		sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die
-		exeinto /usr/libexec
-		doexe "${T}"/php-fpm-launcher
-	fi
-}
diff --git a/app-eselect/eselect-php/eselect-php-0.9.5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.5.ebuild
deleted file mode 100644
index a38c7b0c3c11..000000000000
--- a/app-eselect/eselect-php/eselect-php-0.9.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="PHP eselect module"
-HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
-SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="fpm apache2"
-
-# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
-RDEPEND="app-admin/eselect
-	apache2? ( www-servers/apache[apache2_modules_dir] )"
-
-src_configure() {
-	# We expect localstatedir to be "var"ish, not "var/lib"ish, because
-	# that's what PHP upstream expects. See for example the FPM
-	# configuration where they put logs in @localstatedir@/log.
-	#
-	# The libdir is passed explicitly in case the /usr/lib symlink
-	# is not present (bug 624528).
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
-		  --localstatedir="${EPREFIX}/var" \
-		  --with-piddir="${EPREFIX}/run" \
-		  $(use_enable apache2) \
-		  $(use_enable fpm)
-}
-
-src_install() {
-	default
-
-	if use fpm ; then
-		systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
-		sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die
-		exeinto /usr/libexec
-		doexe "${T}"/php-fpm-launcher
-	fi
-}
diff --git a/app-eselect/eselect-php/eselect-php-0.9.6.ebuild b/app-eselect/eselect-php/eselect-php-0.9.6.ebuild
index d2a17e02f7af..37510b414c4b 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.6.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="fpm apache2"
 
 # The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
diff --git a/app-eselect/eselect-php/files/php-fpm-launcher b/app-eselect/eselect-php/files/php-fpm-launcher
deleted file mode 100644
index 7a1c1c9f918b..000000000000
--- a/app-eselect/eselect-php/files/php-fpm-launcher
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-PHPSLOT="${1}"
-[ -z "${PHPSLOT}" ] && PHPSLOT="$(eselect php show fpm)"
-shift
-
-exec /usr/lib/${PHPSLOT}/bin/php-fpm "${@}"
diff --git a/app-eselect/eselect-php/files/php-fpm-launcher-r3 b/app-eselect/eselect-php/files/php-fpm-launcher-r3
deleted file mode 100644
index a2b6eabc4da5..000000000000
--- a/app-eselect/eselect-php/files/php-fpm-launcher-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# If there are no arguments, then "shift" will fail (bug 626496).
-if [ $# -eq 0 ]; then
-    PHP_SLOT=$(eselect php show fpm)
-else
-    PHP_SLOT=$1
-    shift
-fi
-
-exec "/usr/@libdir@/${PHP_SLOT}/bin/php-fpm" "${@}"
diff --git a/app-eselect/eselect-php/files/php-fpm.conf b/app-eselect/eselect-php/files/php-fpm.conf
deleted file mode 100644
index 801e74f1e620..000000000000
--- a/app-eselect/eselect-php/files/php-fpm.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/php-fpm 755 root root