gentoo auto-resync : 12:12:2023 - 11:25:13

5 files changed, 90 insertions, 2 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c7f2f84273d7..ca866ec1a248 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index bbdab2672b10..eba9318c7d81 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -3,10 +3,12 @@ DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e1
 DIST kbd-2.6.1.tar.xz 1591240 BLAKE2B 15c738379cfa9420e218ddbf6562e2c75b6bf5eb31ce159d798d49546991ca0c02bf9a11486d99bd2ba7d99f3bf6abb53ad799c6314df6d9ca9b1e8cf808b738 SHA512 8d7f39efa91ef16f4c0601c1744e7f00e411c121607660c8f585d3e085d8e8bea4ea095f6c7f491af763097a9844fb4a07d4b78a8358cb7caafbfda0626acf91
 DIST kbd-2.6.2.tar.xz 1503532 BLAKE2B aa146177b2ffd9d6d396c253ce54d0ee42e1a1a2ba471ae0f8950a72b49f2f83aa4660337a581150cfd9fae0b9a4415725f4d152e83c0bdf26b833a31f6e2696 SHA512 afcac33e2e8eecd6f9cfa20bb39254deffc4d8924c4f722d003bdfaf286dac7d87f55ed0a5a35d341ae88fc48162966d5aa1ab8125b11e845bf3c2589a17c8d2
 DIST kbd-2.6.3.tar.xz 1503048 BLAKE2B 9c3f9e2ec9abd3a18bd4159b3a223deee6aee74610ed843582dc2a0397bb80075ae5e76a67d030fcd7a706641a8fb4604840eec67057271ce3e75a0630145942 SHA512 7daf59557408e1cd29140130094b43d8d89b25b3094fd03912d878483f27d128ad25163ea7023e5a10b7d8b8bf8434447927b69fe0094f8db97484881f23ed60
+DIST kbd-2.6.4.tar.xz 1504584 BLAKE2B 25e55be0210c206c1f5eb0d85045bb1cbb2442cf88fb7eb28f7bbb8dd0d86473f48444fd9d80dfc624ce7ba8b39bfe1152ee6cf1877fab444e09600e93dae0ee SHA512 a4149cb0f85fd79b333a6c137d70896a30ebceb1cf9d4b5eef3abb2e1866d83b46cee651e4f3e512bf7e0ccd232d955c14f693e57020a3626e4943c4695fc8ab
 EBUILD kbd-2.5.1.ebuild 2027 BLAKE2B 66c55f1296812b9a197460a8a90bf237def618d6fc9d00ad6e26ff543b1918c7274aae2627c836925099ed37645bf6fa5c05ebfc392077b265b46f0d31d0b1c9 SHA512 9734368dac398812fee31c31a29f6ec8b4819181a8a0a711ceadb64c825aaf515aa35d767185bf9379e5287facda5f53c923ef64aeb3f45ea054b5a5c97f2dd2
 EBUILD kbd-2.6.1.ebuild 2079 BLAKE2B d8698c53124fbc2534525892ec593c093abf69441a01efde6009fd917e8d74b737479467bc99e00facce3a876163e4538bd41cca7465a1a0ae9cfae6745d47ee SHA512 67f95289ebd188d80fd54f450a89f1efd1539a906113b6e2e64b1aafbf42a3f9f89f7af4960a25dcb9af6b07152b9dbee51f5fd79591972decfb155387556de0
 EBUILD kbd-2.6.2.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
 EBUILD kbd-2.6.3-r1.ebuild 2269 BLAKE2B 8299c666b12f216d98c322bbbf36afdf0e04efca6c3bd89f319c2fce29219b5061502b31a530ea4f05dd0fdb59af59a89dcd563925624a6c8f0bbf0a1be00b9b SHA512 8df18437d152702c8daf554abced83d5940662f1691463824c2e85196080326bc4ed2de8a330cd90ea5558b3568da69434b9aee76b2e212f196643573c344d26
 EBUILD kbd-2.6.3.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
+EBUILD kbd-2.6.4.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
 EBUILD kbd-9999.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
 MISC metadata.xml 335 BLAKE2B 3b00a31428edc76e9a758c347107ad15e2f91a440a49e5167878555eda6dad176f8936ca22acbbecb5ff4827d8605b28db53ca990284b4e18c536a04d46616ed SHA512 86a6b134e0403abf5c22e868e2013a2051f504401d5ff8aa1ad682638d866ab8d837470ed87434286b77933483d7675646f382b15aed19772b2fff17258fc0f7
diff --git a/sys-apps/kbd/kbd-2.6.4.ebuild b/sys-apps/kbd/kbd-2.6.4.ebuild
new file mode 100644
index 000000000000..23a50e0bfa38
--- /dev/null
+++ b/sys-apps/kbd/kbd-2.6.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
+	EGIT_BRANCH="master"
+else
+	if [[ $(ver_cut 3) -lt 90 ]] ; then
+		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	else
+		inherit autotools
+		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	fi
+fi
+
+DESCRIPTION="Keyboard and console utilities"
+HOMEPAGE="https://kbd-project.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls selinux pam test"
+RESTRICT="!test? ( test )"
+
+# Testsuite's Makefile.am calls missing(!)
+# ... but this seems to be consistent with the autoconf docs?
+# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
+
+DEPEND="
+	app-alternatives/gzip
+	pam? (
+		!app-misc/vlock
+		sys-libs/pam
+	)
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-loadkeys )
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+src_prepare() {
+	default
+
+	# Rename conflicting keymaps to have unique names, bug #293228
+	# See also https://github.com/legionus/kbd/issues/76.
+	pushd "${S}"/data/keymaps/i386 &> /dev/null || die
+	mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
+	mv olpc/es.map olpc/es-olpc.map || die
+	mv olpc/pt.map olpc/pt-olpc.map || die
+	mv qwerty/cz.map qwerty/cz-qwerty.map || die
+	popd &> /dev/null || die
+
+	if [[ ${PV} == 9999 ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-werror
+
+		$(use_enable nls)
+		$(use_enable pam vlock)
+		$(use_enable test tests)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc docs/doc/*.html
+
+	# USE="test" installs .la files
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8e607cd8c118..a66ad84a05e0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -9,7 +9,7 @@ DIST portage-3.0.56.tar.bz2 1166588 BLAKE2B f6e8d8dbfb3b157f1e5577419ef78c8e63b6
 DIST portage-3.0.57.tar.bz2 1173286 BLAKE2B 793a150c94c939672783d7556e5fce80f7ff8895a616726d7adf92d6f8da99768c55db8a685f2dd548ab0bb09c29fd7548ee6fc1dfc51b55c530119690b92265 SHA512 4c5348e0dfc966db5ca1c08cc3fafc72dd2b3b402972b99b411f61f7a288190ecd9e5ac597dc62ee96eacc378818a4cac65b0fd040c9ff557e7cbe057a934829
 EBUILD portage-3.0.49-r2.ebuild 9527 BLAKE2B 6cad70f759ec4440c228193e2535d57d679eddee0c73d444c78880d38e9529588835f8de721e900495261c53ea9461e2bce1c1b63ed8d32f657f6e458119d18a SHA512 0a49e29242fb469a2d389b06a8e1fdf0187cb7d35c56e4ce3661722dc0668f1383ca52321417fa2110f2d02670b2e4cf43c319efa511e373ca4f2520e2ac2ba7
 EBUILD portage-3.0.51.ebuild 6683 BLAKE2B 3d304c8162f3c17f4b3dc41d75e3d7621a51e047d33edb8e71117742fc177828bfaba8dd8dde1220be135d8ff49c59706f403a3fa86cde0cf1fbdf094b2995b7 SHA512 6c434c44076430241a2b2799de655d2013c01d4a56d373bfe5654c21c7bb3e273095dc129d0fb03f6ed8b0ef960ec4a18967bc7c5fc6f72af60a046840881d78
-EBUILD portage-3.0.56-r1.ebuild 6766 BLAKE2B 6b9f277fed166968d81fcdba9d0318d895862abbdc06a035471b7e4a038ce8e0ea4ec6224b969a2987ac6b29e4999144130487b057f4d65d0e92ea670151ec13 SHA512 02278858bb572c17cdfa54639d017af13c06f6d0b603f43bb7afce62e5299067e6c016b0034aa1548eb6a2ff893845536985e14cee3fa0484c784a8a7681ab41
+EBUILD portage-3.0.56-r1.ebuild 6765 BLAKE2B c0a62cc0bc972889706dc8df58f016375bcaaf6e140e377144212ac1864b1ded4f4490a4f7a2b90100e162af4e34df71a8a56c2c4dd89fd314b711f0d41c3ad6 SHA512 7841d06b60844b4bceaa29709048b741e896c8c702c180cb33fa51fee407fae78a1166bc79736e2a74895580d93a8dc5b383b0409073917a4c183fc62c3d832a
 EBUILD portage-3.0.57.ebuild 6773 BLAKE2B 09ee4a06e701b17e3e4e94a4d61fe8cbbfc9801c1f216ea533031aac6218b72632841b8b17a88ca826015accf959ae596381dd7819ef27496da768d3b62213fe SHA512 11169cb777a5a72c10b090ac805653d436f13f8ec553ceb2c8da40a6190d4a132297d3ab7379f8aefb9ada0f642dff46e28dde857fd70d43824fd90238c04a71
 EBUILD portage-9999.ebuild 6924 BLAKE2B a8a4c8d980456a8fed82b49b1017037ff3f48f00e4a98f5ce7b023eb5af3c9dfcd6367121640ec8f092d080e62036db12de15709b483d7671c460c62c978a600 SHA512 a14d9925f026edc3d1aeaf7ccaf535f0ab999e41f44a592f97fb2a58c6926e049cd8a60bff6da6c3051a58689075a07ef0a7480fe9eca41fb79c6a12ab1c6f4e
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-3.0.56-r1.ebuild b/sys-apps/portage/portage-3.0.56-r1.ebuild
index beeaa755dfbc..1b54e1017353 100644
--- a/sys-apps/portage/portage-3.0.56-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.56-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"