gentoo Easter resync : 12.04.2020

4 files changed, 39 insertions, 4 deletions

diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index c2d93ade429f..60f799c30186 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -3,7 +3,9 @@ AUX php-fpm-launcher-r3 223 BLAKE2B 80c90d2388118e6dbdceacebbc87de145e94e34a6d96
 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
-EBUILD eselect-php-0.9.4-r5.ebuild 1359 BLAKE2B 509f75f6c9337f50d2270a4b8668d4ca31b5b5ce46390414ec30fa507f3fc4738c3803ea8e9022369749e89a5e4effcdfaa62c8aa82fc376d333dad92a011688 SHA512 229058f0c0f34f6cb50d8b9de2d4deb9947c7db329a62b34a86df2907ae42ec8419bf37999c021c28cbc5440165438300aa36072ce54e02265cc661dead44613
-EBUILD eselect-php-0.9.5.ebuild 1368 BLAKE2B 298de33013865feacbdd63dc85db5fa1bd09a75251757acbc35d8089577921587c4a29d0486436be015970dea7dcb2422d40b160644df9d83f757778f91dd10a SHA512 54e8823b60a2d219de453e45d6d141d21c7c1490572a20568986739f9679befb889241c9d2ed6da1df50e72fc7b4d08e14084fe184f2b936676e61c4fab1c0c0
+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-9999.ebuild 1031 BLAKE2B 137e895ef07fe7c229cd111a101b17854685bdfc98772f4dae61dd391a31e8fcaf3505a1accf3d15754b0ac6d424defe2bb3ca6368623f0ac818cd078dcb5cfe SHA512 183e490a9c40858d8d48a94a8096604834fdabede72cc6b5917bccba2a377f5fa05d1512b19e22c6354c510f50b86462a1e788eb21214b5e616aa65db37ff901
 MISC metadata.xml 517 BLAKE2B b597cb77735fa8a26f686dd357f92977342fe28272aa78471fc184fcffbead1fe64c7f7b90f608a6854ce7a9e7529f6132dba83dc9f368b3cdd6ab6b5db5ff05 SHA512 23e39402a69ee17795f08716462c5ce3a5fd8e5c21a8e39737a803f34edbd2c3d38d7e96931ccedcaded612bec5d9e3fe09004a4def1ee4307a63c3bcf99b89a
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
index 680e6b6eaf88..294500392640 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r5.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 ~sh 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/eselect-php-0.9.5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.5.ebuild
index a086b76e704a..a38c7b0c3c11 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.5.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.5.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 ~sh ~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/eselect-php-0.9.6.ebuild b/app-eselect/eselect-php/eselect-php-0.9.6.ebuild
new file mode 100644
index 000000000000..d2a17e02f7af
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-0.9.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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)
+}