gentoo resync : 15.12.2017

9 files changed, 29 insertions, 60 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index d6d815e9cc8a..ee91bf255954 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-package-manager/Manifest b/app-eselect/eselect-package-manager/Manifest
index fe04123851f5..5f7c45b841a7 100644
--- a/app-eselect/eselect-package-manager/Manifest
+++ b/app-eselect/eselect-package-manager/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-package-manager-20110108.tar.bz2 1273 BLAKE2B 453e258a8de1cfc77f66bd3f07b9bca191c36d6cce47a6d0f43f5682bf60de8b898576b998acdf6b9b9e5c7307ce6199797c9649cbd5917eca18624e32717425 SHA512 3fd7d9b33c4d2e3ca4c580e9e55e0033a2bbcc6718e0a2706c9725a125c219bbc937f6347b65fedd58cbad9f00e5c757025c6efba0bf4e7ba131c16134c33962
-EBUILD eselect-package-manager-20110108.ebuild 560 BLAKE2B 03e012b48a30446d650c6bc1d6bf7e3a4f8f54962430cd49b95a6185ec18338f775f566d81f833a0e63b02deabd4c4a132e84c417cfc6cb898db536c10b5bef2 SHA512 925cd43e462187becd37f9163cc1be176942e075462e56a49ec3d5afffc66ed98aa2db033abdd2b67ff9157c396e9aec6a8e2cb37a27d38e9b949d0a2c8fd395
+EBUILD eselect-package-manager-20110108-r1.ebuild 547 BLAKE2B 153edd86b8ece7e6951654d887961dc1507aac675704ea516f4ba152b8790b8c36a8c7cbc9d12ffaf30b4e5f68be1c66743354edf4b3015f0c112e7993a3511c SHA512 f8037179761ff96d945515071aa462d55040557f5fb4a0619fd66012c4d478b12f232e2b79227a1a2f580f2eb7adab24a6dfcfcfc2da03e8a68054e40c607d51
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-eselect/eselect-package-manager/eselect-package-manager-20110108.ebuild b/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild
index db01f146b3a7..6d052668ff26 100644
--- a/app-eselect/eselect-package-manager/eselect-package-manager-20110108.ebuild
+++ b/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="Manages PACKAGE_MANAGER environment variable"
 HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.1.1"
 
 src_install() {
 	insinto /usr/share/eselect/modules
-	doins package-manager.eselect || die
-	doman package-manager.eselect.5 || die
+	doins package-manager.eselect
+	doman package-manager.eselect.5
 }
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index 5a85709f9915..4a40e227c690 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -1,10 +1,11 @@
 AUX 70_mod_php5.backcompat.conf 850 BLAKE2B a907b37f6492097dfa4aa87486b0e754c1a2ec145ff32fe941303c9564e94739fa87c2687602fbaffbf943cd36ebc92e9356d21d86aff235aa7a677ac9cfc26c SHA512 eac982be5e48bab849a9b0ec11a336234daf450c7feb8d8955159108f1dfa7a91013b8b2e2c3eb39dbb8d90aa6e21877a7d955598592c40735b10ec9e8f15cad
 AUX php-fpm-launcher 134 BLAKE2B fdbb99bbbd0d171975aff6f55ba7c41fe152c330cfb05dff81ab033d2490af27c52b8e43e5ed1ae80ee3c6ba8a1471adb01778d6b76bdd7776845f7c93e12428 SHA512 4304ea6df7093af06f1b7df5bf5d8ed7692403cc64a5c4c516e49d36fa866b33e4815876d28cc365f5ccb1e301ef7ce9b57e15ed959a41c91fb25af7236fed29
 AUX php-fpm-launcher-r2 256 BLAKE2B 5ee39f28424c42081e181a0920d38c0768d49dd7bdd00a6a4c57152bbc1cab576611cb7d87213ed8f2a40072b322dd02cee4544ad7f88e1f800ddb6fc8baa011 SHA512 9d2cccf40cbb515fa3c232e525b6b3a8b3459917ecaaf6b133f321e5ad040047c12720f60007f524c3d8ee6430f0b29ac5048fde7059ab506c14289c23825953
+AUX php-fpm-launcher-r3 223 BLAKE2B 80c90d2388118e6dbdceacebbc87de145e94e34a6d9691b6c3179df4f05631d904c1c3e5647dd080ff2080c346bffcb71bee96d4d4123f6c4d3be0120161c960 SHA512 9dfd36f88457a57a31c17cb251a8aeeef505f811f9ac59c5715532c3780b543034a6a9d356f4111fab1998883299ece0a68508dd3e154bc54de84ce6805bf351
 AUX php-fpm.conf 29 BLAKE2B 505e957038315f8668a558f91eac2ad8ae6bc3e87db238001042ddfe7d817c1589891235d88edc91e213215b7a632fa9358795290599223097ac66f546085c1c SHA512 824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f
 DIST eselect-php-0.9.2.tar.xz 48356 BLAKE2B 9ad886b78c0a0ca71c1082d9265f28b1f9ea46dddfd52ad1a1ebb1a4d008954a59baf4cf69705e9b527fff64e8dfa3b25a2d522e2455e2e9ce550e917112ee58 SHA512 ebf4c9039aaa3ffad79dee181b5cd77f144a4b1b49d80291b290377b7ca5a9618d8b18922f0624e646c4d80266c58199bb936a7b8dd5d2e2bdc296099f583edf
 DIST eselect-php-0.9.4.tar.xz 49576 BLAKE2B 417956b355ffec7d7cda03dffa94e4d749a2b33a64a216c2ed8492181a5385f5219078efe6cc4d0d2d81b0fac40901c0cf07914a826484b83833542a12b47359 SHA512 2ba1dd75d4bb9611c6687ed4449f715728263538f772652aa1ac013103cf9ddf328c854326cf6da4f9b3ff2279bf99d973325520fe8b4e3ba7a76a9c3264e78e
 EBUILD eselect-php-0.9.2.ebuild 1956 BLAKE2B e8381990bdafaccd7a2f5dbc117af2309089d2bf92901b0b31552c1351b584a6c46a68b50a4fc4497c3e3b9a9a342a38a6660d645a69a56312326bfc423fd393 SHA512 5ae4cb205892103b1ccbd809d07f46ebcb64587663ca4bddb47bc194992f8b208b41852cd3d639421fd9c14fc070df083b44017bfa68f09c06e3865bd04416a5
-EBUILD eselect-php-0.9.4-r2.ebuild 2138 BLAKE2B 128c279260c12ed92ec0ffed9f467adc57cdb113056642eb74115029205da54128f314a7288bc6c2542081f876b810d44e5bf9cca6859902d5596ddc2fc42772 SHA512 021aea60fdbef4a46459f64f6c5f06834a4506c21d5d39019a7d0e17e9d956da6d1b64838416022d6d8d257c0a519a7440a69f242770a398c8cb6238748e8924
-EBUILD eselect-php-9999.ebuild 2052 BLAKE2B c67c65d18b8122c540af41bff307cef7a534b88704af2693fc8a86a7e25f0c652debc27c6f7b2da2df7c5cb41c5269a3f6042919510519cb2bc4ca7b966151ff SHA512 bd9dcbf30df9f9788b93a2835efe15210354f3afdf53b7efbc51508ff5621c21a463a997099736d3d989dd6fdd9921d313008f1d18790df6609222f5a4700c23
+EBUILD eselect-php-0.9.4-r5.ebuild 1392 BLAKE2B cfe772f0f6932f9a93a9f272a304a5800265580a25f06d3bff4317c53a295d873fa1de9acb17834ec58fb976d50ff0615d499c997b362398e317b645dc3f9155 SHA512 cf3dd6f547cea992d4623ec9477b7d2597356e641ec415341207c3eef9ffe326268b368cc429b9995fe1c4a0a36a2c686ac68449f07c5a896559f513650e6c68
+EBUILD eselect-php-9999.ebuild 1306 BLAKE2B 45c8551979e6c5cd4623cfbd77aff888462ddd18121892b6891459e2281581382c0c6738370f859f5dbd21fcf7ead4056afd78de587b8387bc79cefd689d88b3 SHA512 9982c8bda294445cf3496da2d58f0126278924165cf66967d31628a2eb907c258e50d460e3c1daf5b9c042386730452d2c02a096d1f45c86d10c6538e8afeec7
 MISC metadata.xml 387 BLAKE2B 956f8e21e799bd346de09b2814c359c3c28a37dcad3bf42a11e58e33acfe26354069fce71e3ecb687dac83e176500c2127cb8dda5651e083e27aad92cb385862 SHA512 80a043e0836a1ac58120f1471e997face2f60117e3a83d490ad259a05cfdc39098c457573e3550c9fc3a7712f28b9faacd427c076e8f46ed3476e42f58f8f1b5
diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r2.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
index 4dec17a54184..c99ebdbb421a 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.4-r2.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
@@ -16,8 +16,7 @@ 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] )
-	fpm? ( sys-apps/gentoo-functions )"
+	apache2? ( www-servers/apache[apache2_modules_dir] )"
 
 src_configure(){
 	# We expect localstatedir to be "var"ish, not "var/lib"ish, because
@@ -36,31 +35,10 @@ src_configure(){
 src_install() {
 	default
 
-	# This can be removed after a while...
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf
-	fi
-
 	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
-		newexe "${FILESDIR}/php-fpm-launcher-r2" php-fpm-launcher
-	fi
-}
-
-pkg_postinst() {
-	if use apache2 ; then
-		elog
-		elog "If you are upgrading, be warned that our mod_php configuration"
-		elog "file has changed! You should now define -DPHP for the apache2"
-		elog "daemon, and inspect the new 70_mod_php.conf which has been"
-		elog "installed. Module loading involves eselect as of this version."
-		elog
-		elog "You must run eselect at least once to choose your apache2 target"
-		elog "before the new configuration will work. Afterwards, and after you"
-		elog "have reviewed your new configuration, you are advised to remove"
-		elog "the obsolete 70_mod_php5.conf file."
-		elog
+		doexe "${T}"/php-fpm-launcher
 	fi
 }
diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild
index f695558d423a..e6b5ef3d8804 100644
--- a/app-eselect/eselect-php/eselect-php-9999.ebuild
+++ b/app-eselect/eselect-php/eselect-php-9999.ebuild
@@ -16,8 +16,7 @@ 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] )
-	fpm? ( sys-apps/gentoo-functions )"
+	apache2? ( www-servers/apache[apache2_modules_dir] )"
 
 src_prepare() {
 	eapply_user
@@ -41,31 +40,10 @@ src_configure(){
 src_install() {
 	default
 
-	# This can be removed after a while...
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf
-	fi
-
 	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
-		newexe "${FILESDIR}/php-fpm-launcher-r2" php-fpm-launcher
-	fi
-}
-
-pkg_postinst() {
-	if use apache2 ; then
-		elog
-		elog "If you are upgrading, be warned that our mod_php configuration"
-		elog "file has changed! You should now define -DPHP for the apache2"
-		elog "daemon, and inspect the new 70_mod_php.conf which has been"
-		elog "installed. Module loading involves eselect as of this version."
-		elog
-		elog "You must run eselect at least once to choose your apache2 target"
-		elog "before the new configuration will work. Afterwards, and after you"
-		elog "have reviewed your new configuration, you are advised to remove"
-		elog "the obsolete 70_mod_php5.conf file."
-		elog
+		doexe "${T}"/php-fpm-launcher
 	fi
 }
diff --git a/app-eselect/eselect-php/files/php-fpm-launcher-r3 b/app-eselect/eselect-php/files/php-fpm-launcher-r3
new file mode 100644
index 000000000000..a2b6eabc4da5
--- /dev/null
+++ b/app-eselect/eselect-php/files/php-fpm-launcher-r3
@@ -0,0 +1,11 @@
+#!/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-timezone/Manifest b/app-eselect/eselect-timezone/Manifest
index 043f23141683..4b228a934b8e 100644
--- a/app-eselect/eselect-timezone/Manifest
+++ b/app-eselect/eselect-timezone/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-timezone-0.2.tar.xz 1400 BLAKE2B 22d19159629dda57f7372ae31283693d5993c17096c1f0057060ecbb731274bb856c292b0b1dd91751f17a0226502ddf942bafa0c2fdc544d1ed1480cc8193c9 SHA512 757dc88b94fde547af2026c0759c9109f803f7144e843be9d79e9eef0bcbe8f2273a5585448dc1d810d89f4f4be7f6d8974e7dc35f6dc8069f8090775bdf8b52
-EBUILD eselect-timezone-0.2.ebuild 396 BLAKE2B 7f8acf6ddca2c5c489c87344d227103ebf9363eb58fad2eb599f30dbc8e4711befbd3ac5a87fac6cb7b0df62a58e9fe909387bd88fd2b7d90575f89fd92092a9 SHA512 1d9fd022213af7955af5de3d95d3a42f977469f720e33f94937a4b01e66b04f70d8eff565dd83c2edd9f3dfed59f06d0990ee0521e0d1d0353b922e71b26004d
+EBUILD eselect-timezone-0.2.ebuild 395 BLAKE2B 5b251a0a76df8b1f92f001fa6e836d7a5298195f655cbad6141340f5708b8b47860a5413b0941549995c5e69e7049b56d58d72877871c874ae65e089081d9732 SHA512 6192bb275589067635e6c5c37ea284004a1f15769b4e18313386b89f0b4bce7a00e42f773968c9a0083850b990102bac49cf78248036c0f094a108d75aaba232
 MISC metadata.xml 253 BLAKE2B 58dd329781b98af52e191fbc6b1de24c80612678e467d126dc77ff0559c12eb8fb48546ef7a240f64fadbe289039adfb87dd2b0c8ae01bd9210bac81b2b385bf SHA512 a931cf8d295191e246377a75882955524e9e3a86aeacf4a5067c0025b6a03d608cdfa6763cfc53ba4a00cd6ee4b7db42d1a042dda5e74e578047ad42ad92be50
diff --git a/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild b/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild
index ccafbb207ebd..4a95c745ef9a 100644
--- a/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild
+++ b/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~junghans/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 src_install() {