gentoo resync : 25.10.2021

3 files changed, 41 insertions, 0 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 174c4809d092..cb96ea199833 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index ccffa5826b62..7e632cab94ca 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -1,8 +1,10 @@
 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
+DIST eselect-php-0.9.8.tar.xz 62048 BLAKE2B 7938053be5d3893d1b3b399decb9fb90ecc1d266edcee7192511c63ccdd21fb0e7deac2b654db3dc05f56de7c757bb34ed813a026fc711adc4ab05b373f3d275 SHA512 c947d303dc0406539017f3779a7ee1e51e670ce73a47e1a6722f8403573a5dae0825c3b6932d12123bab77187a515023b69fc771f24522480e74fa0287377c3c
 EBUILD eselect-php-0.9.6.ebuild 1085 BLAKE2B a944549cb5f6b77bc2dac62da22eedb58dc0ddf4cdf45e90996830b4ab585d9a15edfb3a8e0f56b29b25e296e80e0b635cd822a9e5707c9ea4c400934511c414 SHA512 53bc5e237bf484adb1ea3cae1c5be68545c2e532c75be85fb070bedc05f3a5bc940c08dec9e00505ccb6982afe557506832a5e7a47f116d6a11e0c3c8b092fd0
 EBUILD eselect-php-0.9.7-r1.ebuild 1213 BLAKE2B 134401996bd58666344052c5bc5ffda9c9cf7d7b0ac3ef9e1ddb27714be8a2f6fed27b5364fa07b2ae7c0c28bb0739e1cf504c79c7631b93fadc63b7be722122 SHA512 4aa1b52b014f1f49c156778db2aaed19bbeeeac4cd54336b19243806caa9be525bbee9cd380cc54863c5d377d4c1bf408895774a64ae86b4f9a9991b2b7c904f
 EBUILD eselect-php-0.9.7.ebuild 1149 BLAKE2B 42b0e8f6411a2897d51329af1c884f2ef2a83787c3e4b3828227c002f3762f9f024562dd2f02a78186e2f3157f6dcaf3d1b5aaf55e5e30d44499468d0d9523fa SHA512 71a0347ac32643458075e6cec11affc56fe548f36c8c08aa8e80869578a8a73d640dedf8657d6cbbe4dcda31bb974e50d08dd9ecbe4559d92cd2fa64b7663aa6
+EBUILD eselect-php-0.9.8.ebuild 1218 BLAKE2B 999b2b7590070f98bca317f1ebc0da463409ebf8e31c10768ac9931404099f512384882d5a8571fa48931230ddc06d780a69f7e08105dfebb5488a1088e31271 SHA512 223f99e7acfb00e9eb21e01eb1e4d2bd3060a9bdb64ec10ef882a0cbdfbf2be9a2e2af35217d22b1b9b7c0d34339d0211dd3542b7865acbc33c3072ef6ad4169
 EBUILD eselect-php-9999.ebuild 1153 BLAKE2B ade19fc85e3e4d3c4212d9ca7c3b921fcd543f335ffa413952df2a8e50c37f49b6bead740932a530f0715dd8eb530fa15d40ccf1e75e23e99e10f434f065b8e3 SHA512 4bd50376d44d4a740ea11268b8c890ed6d7bc430e84c48042c182c7b48ab4eaa438b525480f21053b4a75bfe94b31012b848a5da17fb019e9ba673182ab783a8
 MISC metadata.xml 469 BLAKE2B 5673844c7acdf9d8c0670aa386e49864d4d96a393e0589561a6d31cc9ced135119622d35cf8e5296adeae1bcb5e5b3f23fc75f447bc288547a1bda6dc0266cc7 SHA512 f2570073ee901fd2ac92ca20bd0faca521007eb57b9fd9368b99dc5d8f97131f0eb044d75cf16b8b0ef600f2d6368498a968552b4696b2d46cf040529c05d15e
diff --git a/app-eselect/eselect-php/eselect-php-0.9.8.ebuild b/app-eselect/eselect-php/eselect-php-0.9.8.ebuild
new file mode 100644
index 000000000000..a316d2866307
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-0.9.8.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/~grknight/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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
+}