gentoo resync : 14.12.2020

12 files changed, 55 insertions, 30 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 050932f0c35f..431963ade69f 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-fontconfig/Manifest b/app-eselect/eselect-fontconfig/Manifest
index 1238c337b7ef..c6288f06abac 100644
--- a/app-eselect/eselect-fontconfig/Manifest
+++ b/app-eselect/eselect-fontconfig/Manifest
@@ -1,3 +1,3 @@
 DIST fontconfig.eselect-1.1.bz2 1713 BLAKE2B 30af0471a52d7e2785e6e0e5847f51f3a11d0fb53eb800a5314e18dbb61694f1542d71c3e0f4ceccf82a396432113529b0fdb1b5fc6eba37550b27410565c61e SHA512 3b5978e20009754f09cd39e39771e8151cbb7bda60378cda718182b2df2c267a64af5ead220a079fbeeffb30586bc432bbc83b94e4f910205c4a29040cd2ccbd
-EBUILD eselect-fontconfig-1.1-r1.ebuild 748 BLAKE2B c767b56feb6913eb9228ff35df47cc3c3fa7cafc0d4f375ca1f2196c2a7e101a299d6eb1696fe8af84298624eb07b9ae7d4b4ad9be44462f93fe4aa7baec76f1 SHA512 641a942c5e6b8a76c5de00c35ea2292af9b4c6d5be43cc2eb33605ec3f86a59754d14a5274dbeaad65605926680445257ae0a17de68c20c4ded5b4feca2b5435
+EBUILD eselect-fontconfig-1.1-r1.ebuild 755 BLAKE2B e44ea1cc6c1feda2803678d9435a88167e6603d0d49f53dad4cf1d49ad2dfa6b32bd1b355a4d2ee5e6acecdd1b0977d53815314f1b507c295b50d0a9fbaca40a SHA512 9359f3c016db270bbb166ac6aa51421bc11fd45173e2a5a94b13a47740841eaf7c256a848fe6e8fd503d5ee14f4d62423efea72ba4163a51146e52a53c1ec876
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
index d22da4ad436e..d753a65e3163 100644
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.3
diff --git a/app-eselect/eselect-lua/Manifest b/app-eselect/eselect-lua/Manifest
index a00dba09c646..ce5733625904 100644
--- a/app-eselect/eselect-lua/Manifest
+++ b/app-eselect/eselect-lua/Manifest
@@ -1,3 +1,3 @@
 AUX lua.eselect-2 4192 BLAKE2B 90c8241a3dcc822466aa9a95420143bcdcd5a9aed3d8688958cc2bd30005f298399f8d34834ffb7a727a1186acfd9e98b765cc5a949ef81e39ca96e83c028afa SHA512 fa7dfa52542d9410dcc5f60bc4ef63db7b8396c7ba6115f2d83951a171d996aea3c13530ac2d7ef5025b5047aacb2e4936527377aec0d53229f46d518bd79845
-EBUILD eselect-lua-2.ebuild 791 BLAKE2B 029dd825b07c7a8406658dd34dd1e5699624900a35683befe97e045cd3c492bc9acbeee0c7d1a963742a4284da4e5f231ab27952ab9e971fe0822f9d8fad1d16 SHA512 bc52a5adf91a1029fea819be865040f5f6d77d88d4e22e9f6af1780966b1bb1f07e4d7bf19a83c87abdb5df2560d9a6ea3e9cd2a29eed96976317cdd7536236c
-MISC metadata.xml 361 BLAKE2B d4e3b671abc0924f33030927fed5591df325b49a42711b7d5d9c4c9052433903414434402c12dbebf907f8197fb0f82bf9d44202599e255ccbc01b6e3d78bbed SHA512 425998f090c34d79e2190c0aa0ad81601a9e2fca458f7e9fe0fd4b09f2abb10c7eb4a02307d97e28d5b3aee3098eda57715d0e0cdbe254ba9f2768def2e74654
+EBUILD eselect-lua-2.ebuild 595 BLAKE2B a89b6d46ac6f07c95c29d1f99c76f0e1e8912bb149b6c65b81bb391d627e87165cb22153b9644760dac343f7aedb00e4e6e88a25900c46a1f8eab8310ccb1100 SHA512 5c656e7fdea22e198f4609176b1007b39e3fd120a0b640b6362b86eaa7950dce562e05b76c81326b39d325ef098eff8cbb9d364066160293b1e7564813988986
+MISC metadata.xml 361 BLAKE2B 8202a11a4a9534a7dcdcaacd6018aa2a0fa02f914fd630782b536ce4d7f5182e9315038544eff0c3ab30d01959ff87b25390e5fb1a4ad1057ad68d6e91c0239f SHA512 a382c700bed10e7c62c6f66560551c3f152de4f57d7ebc3ee127d57eb06a72df3d214fa39dde03f431b881250cf80de5e0a2b3528f6c4365bf5fbbe950e982ad
diff --git a/app-eselect/eselect-lua/eselect-lua-2.ebuild b/app-eselect/eselect-lua/eselect-lua-2.ebuild
index 82abd3207ea4..461ba343b7bf 100644
--- a/app-eselect/eselect-lua/eselect-lua-2.ebuild
+++ b/app-eselect/eselect-lua/eselect-lua-2.ebuild
@@ -11,24 +11,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="
-	!dev-lang/lua:0
-	>=app-admin/eselect-1.2.4
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
-	|| (
-		dev-lang/lua:5.1
-		dev-lang/lua:5.2
-		dev-lang/lua:5.3
-		(
-			dev-lang/luajit:2
-			app-eselect/eselect-luajit
-		)
-	)
-"
-#		dev-lang/lua:5.4
-# TODO: ^
+RDEPEND="app-admin/eselect
+	!dev-lang/lua:0"
+
 S="${WORKDIR}"
 
 src_install() {
diff --git a/app-eselect/eselect-lua/metadata.xml b/app-eselect/eselect-lua/metadata.xml
index c4df8c7ed369..e41bbe8ef669 100644
--- a/app-eselect/eselect-lua/metadata.xml
+++ b/app-eselect/eselect-lua/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mva@gentoo.org</email>
-		<name>Vadim Misbakh-Soloviov</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index 52ae1899e68f..f80c7e6d61dc 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -1,4 +1,6 @@
 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
 EBUILD eselect-php-0.9.6.ebuild 1095 BLAKE2B 8d6950a14070043e62a30a8528f92ac89e6f86b87989cfe13ab7e3035a5c78331824c8aa7657c333b188a7af9a7e760bcb4dbb19990ebd308c89c650bcb9ad00 SHA512 1dbbde280a8569e064eac769b266561c5fbd31d7abc6aa79248f2604353a275ea1f0b8aa2cd3a508c9611c4b95ea58b1d112a90252e024f636e6b21ee7b8860a
+EBUILD eselect-php-0.9.7.ebuild 1167 BLAKE2B 089739a5dfa998fd7915b194748809ea7fb01d530a573ef4919105621932ca0e0fae99081a4d66bb0e9ebebdaf5c934d66e055075c722cba1bb4f2a428a48643 SHA512 aa889d9fbe0dea3cca212554798ca812f4d369e02d88b062a70df8aa17dedf0e883a83691bcb401ed48a4e626983d9a496cc255c3e1a2900b138cf7f60432997
 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.7.ebuild b/app-eselect/eselect-php/eselect-php-0.9.7.ebuild
new file mode 100644
index 000000000000..c118dbec2492
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-0.9.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd autotools
+
+DESCRIPTION="PHP eselect module"
+HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+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_prepare() {
+	default
+	eautoreconf
+}
+
+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)
+}
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index d1631b58ca2b..eac07a8548de 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-repository-8.tar.gz 6774 BLAKE2B d22c2befc744e21b7619a490e9c41f1052c4077135ba5247ea9558f15f7dc5c06642dd934c41ad8cb3bedb40398876ea9d508276bde6f214fe06d5f80b19911b SHA512 b1fd13e3bfa323dea7fec53a33865352545a070df472c9db0b2901945a795833eb8a2b7b264005d94fe6e92dce57414a7e995157d28c8d26048bedcbf42adf96
-EBUILD eselect-repository-8.ebuild 993 BLAKE2B 31acb2e5f29e0e39318e7d65312ae62890504852664492f280159bf38fdd6e4bf9834bf1c3c0bc253ff6f596f8586c3f5150132d513ebd51d3f382f3ad798316 SHA512 65061aa60e2462cd98614ecf69a95aeb692af5c5b50069e7c642ac7972f02cd98f33097697b371ab61854bccdd6b4ecac072daf9612b58b321ddf645d0af728b
+EBUILD eselect-repository-8.ebuild 1004 BLAKE2B c1cf27cf20177ff72e88f5276063764ddd300a55864daf5feef883f637fc9dc5c8ede0f5c5f9b32818b6e7a5db2670803a699b0b279565926b9a31a90c5c681f SHA512 e56863609a8ddb54c33324f76dafbde0de2150c3b827b8066955b1037a81db63cf0f26b607ec764ea69871f2468329d9782fcbbc9bca63f2afc8ed6ddd057c9f
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
diff --git a/app-eselect/eselect-repository/eselect-repository-8.ebuild b/app-eselect/eselect-repository/eselect-repository-8.ebuild
index add50e4e5a97..7b00baa7df65 100644
--- a/app-eselect/eselect-repository/eselect-repository-8.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-macos"
 IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/app-eselect/eselect-xvmc/Manifest b/app-eselect/eselect-xvmc/Manifest
index a6c033bd8d39..c83b6ed2c085 100644
--- a/app-eselect/eselect-xvmc/Manifest
+++ b/app-eselect/eselect-xvmc/Manifest
@@ -1,3 +1,3 @@
 AUX eselect-xvmc-0.4.eselect 4169 BLAKE2B 88d4d93097e51c5e2f6b98adbf2e09a643a3ef37176010907035486b4d98eb38c02e0243a8ec617c89bc0204948db83431174d1bb217f6e9fc6f3fcb649338dd SHA512 d86d80b931d2aa6c085accf9a647745cffd56b496728162b1084eba2fbde981ac17d3d3758cef993427b4236330fcc21bf2fc52d2b50249764a65fc508121135
-EBUILD eselect-xvmc-0.4.ebuild 542 BLAKE2B 37983ec5729a9c8f495335c7d99793ffaa55b796853a5b87b7c1674e97091cd6180903304263f47e70f97dcc80ee278dc8726310c02b400a59f5a3f67015772e SHA512 9d508cd534adea4b965d40d5191f3bedb767eb753979fefc1f6e3d19bf699f3245164e4b7fd83f19949eb42f5c2502f86441bccf85933cd420da1daa1c620fdb
+EBUILD eselect-xvmc-0.4.ebuild 549 BLAKE2B 24dbcd7fc1aad8a1ee8c71314d2556bdaf63924a261082d23d704c756b90aed04b3f091d16e5b1e97977ce635ee8cce0fac8ec46b9e13f41c94407086945262f SHA512 9e712f1656ab3cab6fc4aede1a38e989bf78215b65adedf7017829a885e886ddaa3657c427a1ceb08caa557572c281392ab936110d879cb5c139f2c1d30a512e
 MISC metadata.xml 254 BLAKE2B ee88ffa1e088e8468e68ced9c2f45c893ba1a63b35efb4bd4093dd6b65f976a30ca90d8fb6a23dd8153d800f08ae5253aba6590ce59a79e4db1562676a39f79c SHA512 835fb05d568b08bf648a64dc26c52cd2166f5197b82615d3218e8a69049c449cad544da478cb09c68c5578f75628a86fc4c361b54ff09d8f778839c186466a47
diff --git a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
index 6013fcaa1675..9b55f27a4a51 100644
--- a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
+++ b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 DEPEND=""