gentoo resync : 21.08.2021

3 files changed, 51 insertions, 4 deletions

diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index 40bb682f584b..519624f68db4 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -1,6 +1,8 @@
 DIST eselect-php-0.9.6.tar.xz 53236 BLAKE2B 38478d4792f8a527e5f519abd7765211aff8c1d132ceeba5eec70ea3b8d1f254be52564334fed3840950c2461ff4a30784b92fbb8b21cc448083617797eab1d4 SHA512 d3f14288b3493cb48717c1f27430ae8b60881e9f6f48e4b7644a4596d9fc1b9823a6af8b7101a62b28a92e3bff164b1717617a2642a5bb02e8dd46de56d4f410
 DIST eselect-php-0.9.7.tar.bz2 8460 BLAKE2B 160c87d1373b10cb2bd2d48210c7382f721433fb45557d0a5336af0ea25a1a49b151bcbbcf253947e6a5018b5740e8f9f9b1a66544bd74539a4e54aeab047a74 SHA512 f6c909906228906bc75be24bdf69330db10b0ea84822a5a016a185ac2855eec34bf6cb0bdaf22f3edc331002e72c8ae56733e1ea13cf815948a7a58439240fa9
+DIST eselect-php-0.9.7.tar.xz 54124 BLAKE2B e704935046687de6aa52d1900c207a48c79bcb0122506d001bf63ebb76b8144f19b2439daa34fd8da942a5eb4ce942e9b5562e5446ba5b7f62c247470c72018b SHA512 9f4ec72e6ca82fc0d9652f8f55d8bb626dd04a2881cb74d6c63db7ac095ed8ae170fe33ed34a4a76afc9a436114ad23c6981c0dad5afdce8f09c9c0026163bed
 EBUILD eselect-php-0.9.6.ebuild 1085 BLAKE2B a944549cb5f6b77bc2dac62da22eedb58dc0ddf4cdf45e90996830b4ab585d9a15edfb3a8e0f56b29b25e296e80e0b635cd822a9e5707c9ea4c400934511c414 SHA512 53bc5e237bf484adb1ea3cae1c5be68545c2e532c75be85fb070bedc05f3a5bc940c08dec9e00505ccb6982afe557506832a5e7a47f116d6a11e0c3c8b092fd0
+EBUILD eselect-php-0.9.7-r1.ebuild 1206 BLAKE2B c736fb8101560e9ea7faa520a1efaee79a8eb620496a390f31d1317b8d60e7427eab98d962817eb7e9ba8557364874cfb1e0c449d01a3f7369200f60004e7480 SHA512 2263d094e7d01b38c2b5bde851af1933bd15dd958d0b0ac5f6866636d6661823d98826411f4f400ebe881a91614db946c3a443a44123e3611f1f3f436b7ba58d
 EBUILD eselect-php-0.9.7.ebuild 1149 BLAKE2B 42b0e8f6411a2897d51329af1c884f2ef2a83787c3e4b3828227c002f3762f9f024562dd2f02a78186e2f3157f6dcaf3d1b5aaf55e5e30d44499468d0d9523fa SHA512 71a0347ac32643458075e6cec11affc56fe548f36c8c08aa8e80869578a8a73d640dedf8657d6cbbe4dcda31bb974e50d08dd9ecbe4559d92cd2fa64b7663aa6
-EBUILD eselect-php-9999.ebuild 1031 BLAKE2B 137e895ef07fe7c229cd111a101b17854685bdfc98772f4dae61dd391a31e8fcaf3505a1accf3d15754b0ac6d424defe2bb3ca6368623f0ac818cd078dcb5cfe SHA512 183e490a9c40858d8d48a94a8096604834fdabede72cc6b5917bccba2a377f5fa05d1512b19e22c6354c510f50b86462a1e788eb21214b5e616aa65db37ff901
+EBUILD eselect-php-9999.ebuild 1153 BLAKE2B ade19fc85e3e4d3c4212d9ca7c3b921fcd543f335ffa413952df2a8e50c37f49b6bead740932a530f0715dd8eb530fa15d40ccf1e75e23e99e10f434f065b8e3 SHA512 4bd50376d44d4a740ea11268b8c890ed6d7bc430e84c48042c182c7b48ab4eaa438b525480f21053b4a75bfe94b31012b848a5da17fb019e9ba673182ab783a8
 MISC metadata.xml 468 BLAKE2B 4291d573a19feb69d156750fbbb2489ba9881913ac975ae2bb4a38c9202f67165b9232cd8825bf30e67445f4aacc484f923a6ba8938f56dfa418d957638d54c7 SHA512 68c372ba62586c64dafbe874f641b962320d8e52dd3f97258b32caa9dd8ca085707ad5678869ffd49e9dfc7a1c434fcbb32ee368b3ac417ac27087206dffc48f
diff --git a/app-eselect/eselect-php/eselect-php-0.9.7-r1.ebuild b/app-eselect/eselect-php/eselect-php-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..3ff3114139a4
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-0.9.7-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TMPFILES_OPTIONAL="yes"
+inherit tmpfiles
+
+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"
+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? ( virtual/tmpfiles )"
+
+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)
+}
+
+pkg_postinst() {
+	use fpm && tmpfiles_process php-fpm.conf
+}
diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild
index 34d741711590..aaf4cb6fd250 100644
--- a/app-eselect/eselect-php/eselect-php-9999.ebuild
+++ b/app-eselect/eselect-php/eselect-php-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit git-r3 autotools
+TMPFILES_OPTIONAL="yes"
+inherit autotools git-r3 tmpfiles
 
 DESCRIPTION="PHP eselect module"
 HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
@@ -16,7 +17,8 @@ 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] )"
+	apache2? ( www-servers/apache[apache2_modules_dir] )
+	fpm? ( virtual/tmpfiles )"
 
 src_prepare() {
 	default
@@ -36,3 +38,7 @@ src_configure() {
 		  $(use_enable apache2) \
 		  $(use_enable fpm)
 }
+
+pkg_postinst() {
+	use fpm && tmpfiles_process php-fpm.conf
+}