gentoo auto-resync : 30:07:2022 - 15:10:23

9 files changed, 49 insertions, 62 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e076b62b4d3d..5834fa55a557 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 4538665f135a..43f9345b2ecd 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -4,6 +4,6 @@ DIST file-5.41.tar.gz 1064097 BLAKE2B 56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308e
 DIST file-5.42.tar.gz 1105846 BLAKE2B c557facb066ae0599db832ddbbc3fed7db2e057faefe832cb4bed8f860b63456217bee39f0c82b17902c3b91426e522681216d2d3ed689501fa00d69a4a09832 SHA512 33c3c339a561c6cf787cc06a16444a971c62068b01827612c948207a9714107b617bed8148cd67e6280cb1c62ad4dfb1205fb8486ea9c042ce7e19b067d3bb05
 DIST file-5.42.tar.gz.asc 195 BLAKE2B 9b930bcd6b98878e60cd72d8d71b40201ebbf3ab1dda7d2b0e3228abdc0c1e21473a012b9799dcac8638ded1bdbe03865c5e41ed4086076a7df6bf6aadbfe29d SHA512 a7105c48f6c671638f5fb7f18f9b193d108456655b4c734208e00aca36fab54dd330ec2fdc3ff29fb78adbc16874af4fb0916c560e50228f82003a8cd258491a
 EBUILD file-5.41.ebuild 3347 BLAKE2B 413305c675ac4b0af437e2ca48d4edd3ca29bbd3cfac376ebaed000142eb5a191f7d1c85449838ae204ec6c294828af68cfd7e6fe885b82c255d0570bc16b18d SHA512 396ef33817680b5bd48d7239e455f3c798f8813267ab7ea19dae7f845ad039164b88c6600887aba4254916a4ec857baaf01b949c6276510490e089d1f5b52f9b
-EBUILD file-5.42.ebuild 3705 BLAKE2B a29d50423ae325a4c4a6fba10c031e05874fa4d8aca399c7d81353603d98806c0db603c448b9caa7f436074d946f23be4e9d9b646064582c12dca87548faeacd SHA512 9403fb909a504b21d66eb738f82efe2a6733f1b083179a2bdd9673b0c99208b2838f5122e1c4ed075f2f41e172f101e6a69eead6e4a038eaae5a5a5e44c07cd0
+EBUILD file-5.42.ebuild 3704 BLAKE2B 9f295023ba04d33d544c466487c7b760ecda69dd5afddfed8ec1ed738d9f5df636abe938eef5ad78b4092bc134ad160f1cadf03d431ee17d1c2cc1de2d1170e9 SHA512 0ca5dd550e09ad7be5392742a561368c699a70da25ea9448a903b947feb8f76388e5a7aec4f33c1797485cc50c33092b4d72a042701d662b23faadd94e231e3e
 EBUILD file-9999.ebuild 3630 BLAKE2B 7eaf1c27c8b192957a7f3ba08f6e0ba3f45e52689fdd87e98a9d2d9e955b1f43fdf2410dd48a3c8c858f0c6eb467d6c987b02fd432ec25d6be16fa6e71c89880 SHA512 28655fdb206cc8d60778f63da73cfed704c9e4c3304c76885448eac56bd9549c950a0d70102b341459834694bae87e5cdd9d9159d29f308da0f6b33690513bca
 MISC metadata.xml 439 BLAKE2B d937d412b733516f49ca24a5de5238688ba56c06872cec060608139cb551f78e165e05990bcf6ea5bb1e98d27eb2650f5a972a4cded85eb67dbe9218d5d705b8 SHA512 20ff0c1b94dae95c3b277cfcc10da2b6ff31582cfe8f4e2ae60a74ec45db2a854eef40950f354465a45563ee6333f327566565e40cb16249d191bde585c5b1f2
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.42.ebuild
index b9886cbe87f1..dee13cbe1e88 100644
--- a/sys-apps/file/file-5.42.ebuild
+++ b/sys-apps/file/file-5.42.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
 fi
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index a9adfe19251a..c83468ad39c8 100644
--- a/sys-apps/lsb-release/Manifest
+++ b/sys-apps/lsb-release/Manifest
@@ -1,4 +1,6 @@
 AUX lsb-release-1.4-os-release.patch 614 BLAKE2B b15e0e136ccbee1907cafc9523ad0ca31b87fd910b770b212f1d06aef668f184343f7d961aa38a1ba35e2bc1628750bd1680a70b7405271fab59c5f732fde66c SHA512 289795f45144071f5f166a3dfd387267fd3327767bae9d8e9c48818de0c60b961ac35952eb8b42b3ebfd415b337c096fa2db8009fdfbc218814a3ace633a8483
 DIST lsb-release-1.4.tar.gz 10769 BLAKE2B d6c71d6604481a637f63fae00742ba77421345b36234fcfcae1da98bc1c80a8450bc569c2ea2f4b1c3a852de2fe24413fe397d4a60a0ca94eb70a9626871f4bb SHA512 84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde
+DIST lsb-release-3.2.tar.gz 16246 BLAKE2B f790b52c403ff42ec1bf787100c6c9715b7bebf3feb1772a6c4caee40b09c121ba7522553d145c478c752b196109747e31b2d8c14764c67c4a7e57fbae06348d SHA512 5ccc2f38c3603b8261310d5f30d8304a95bd6c24fbbf00484609078839a68894b2ba761a7465fc3c22f55dd69d67612d3cc4cb453765e3eea6b9af96834d85fd
 EBUILD lsb-release-1.4-r4.ebuild 1104 BLAKE2B b399f7a4641078445f8f6910cbe1ffc0a720523b891c84ea259a60efeaec15cc7ca632ec14c617973232d6933732eb564db4c1103d7a77046b7d7d69465682d9 SHA512 3d859f8ae02d17a5bbc940f72b6255cd2cb0ada459d16550bd63991973d2a11b8d79645212df293ed90b211783443c633c5317e8dc00be30f151f6c3e45074d9
-MISC metadata.xml 809 BLAKE2B 38ad65227aa223463f44a81f24f8b8930ac8df03dd556eea24759b8a770c798ba42e3497970b6b2cca3437ebb21f38af094d4625128feef6cb1b6f228e2f8db7 SHA512 943f7df2955531edfef1305376c0cc2ee25f98d73f045cea5001d1e1956579c0d6779b16b70bc1ecdaf06737faead54b2a928202cfd252c2d9b3ab649920f0e4
+EBUILD lsb-release-3.2.ebuild 1014 BLAKE2B ac28c8d8261d54b1869b4d88f662bc28209af69f245ed386b19bf1d73f5f699bfc91d296a167a5fb133bdba94f825d6cc8985ebacc58b3d185f44dbc79eec700 SHA512 7cfc42d03d8277b84ae94aac2fac23d12d388683d0d2053dae781bb8ad52746cfc018fae2cc60df197b90488c46532e5ac5e863ed223028a42d41e7cd3a3da74
+MISC metadata.xml 879 BLAKE2B fe482a13fba61111cf6230114ae673e96f6c87826bf7336d54e53e5a0cb0d1e3df0dfc9f43fa15e2d4117011727b271a63b0b20f887c70394337c07a5b006936 SHA512 252d9ef70b225cfab3098577bb4e1510ef4a81f1e1f6e4a4c2d02e859b7acf6ff24db6c77f661417176a697daf6f76db7f5c300efc6a35e029dfdeca2aa043fa
diff --git a/sys-apps/lsb-release/lsb-release-3.2.ebuild b/sys-apps/lsb-release/lsb-release-3.2.ebuild
new file mode 100644
index 000000000000..f3e6c184e96b
--- /dev/null
+++ b/sys-apps/lsb-release/lsb-release-3.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit prefix
+
+DESCRIPTION="LSB version query program"
+HOMEPAGE="https://wiki.linuxfoundation.org/lsb/"
+# mirror://sourceforge/lsb/${P}.tar.gz
+SRC_URI="https://github.com/thkukuk/lsb-release_os-release/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}_os-release-${PV}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Perl isn't needed at runtime, it is just used to generate the man page.
+BDEPEND="dev-lang/perl"
+
+src_prepare() {
+	default
+
+	# Use POSIX 'printf' instead of bash 'echo -e', bug #482370
+	sed -i \
+		-e "s:echo -e:printf '%b\\\n':g" \
+		-e 's:--long:-l:g' \
+		lsb_release || die
+
+	# TODO: unbundle help2man?
+	hprefixify lsb_release help2man
+}
+
+src_install() {
+	emake prefix="${ED}"/usr install
+
+	dodir /etc
+	cat > "${ED}"/etc/lsb-release <<- EOF || die
+		DISTRIB_ID="Gentoo"
+	EOF
+}
diff --git a/sys-apps/lsb-release/metadata.xml b/sys-apps/lsb-release/metadata.xml
index 5a014d5fd66c..2e70c73a3c46 100644
--- a/sys-apps/lsb-release/metadata.xml
+++ b/sys-apps/lsb-release/metadata.xml
@@ -18,5 +18,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">lsb</remote-id>
+		<remote-id type="github">thkukuk/lsb-release_os-release</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index e8659d31aef2..5ebda0663548 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcore-0.12.10.tar.gz 625285 BLAKE2B e6d8aeec37e9f5379cc12ca9ff502bbfd8ab355087be63160b9a03feddb5c792cc0ef01d338926e3217ee01859fca5a84aa710db8e224dde8e2befc59e3fafad SHA512 8b5159a06e8291be1663de077ac089b0cfc0da1334111ee66cb6c3b627bb29ecbc7fa6b4727fef1d4c9ac93889a7de787114d07071157a1fc1ed0b5143ebe12f
 DIST pkgcore-0.12.11.tar.gz 625613 BLAKE2B f9bb17286cf30714d9f6f47ae6286031e418fd5f420e8921e1f1ed546cb1f293772e8d6e11ea2f4af8046d82fd166abb7c27f640f7f105c13a73d9ce19ccc52b SHA512 b98804603a9d14562efd56d01fa0b17ee1753d25b8c108d0d12eb47b103787f5fa7170f9924b473996817f31c31c40b5920db597974438cdc43215f5f83e43db
-EBUILD pkgcore-0.12.10.ebuild 1301 BLAKE2B 57d05e60b30be4a51fba84d10fa8fc4914d7e879f098b5a265c6f973d8180ccbcae86ba834fc0243aab4451b63f34d2d9dec264d45251a34abc376d27bffa894 SHA512 3c8a8001b429b97d057ee9212ba748b2e43c8323b7e0430fbed17bbd7200f9d4fe0af5bd36aa20de3112443c2bad824c0113a98afdd41441a1a72ca736ef27cb
-EBUILD pkgcore-0.12.11.ebuild 1302 BLAKE2B a4898c64482c728f663c7cd0a9ee568f3e936b5b465588c193607522a16540bdbe23a4008162a826944caedba2058b403264d79163af78b62edb0b7b1b64b43d SHA512 f146b51fa68c6a22815a14dfa96f91beb3ff5fe578e790f902b581dc68423cdb497e7018bfd7b2e8589394c343cf59951f722b6fe6d1eb7b96c356282cc5bb31
+EBUILD pkgcore-0.12.11.ebuild 1301 BLAKE2B 57d05e60b30be4a51fba84d10fa8fc4914d7e879f098b5a265c6f973d8180ccbcae86ba834fc0243aab4451b63f34d2d9dec264d45251a34abc376d27bffa894 SHA512 3c8a8001b429b97d057ee9212ba748b2e43c8323b7e0430fbed17bbd7200f9d4fe0af5bd36aa20de3112443c2bad824c0113a98afdd41441a1a72ca736ef27cb
 EBUILD pkgcore-9999.ebuild 1309 BLAKE2B b92c0f41da48bbbd8e2ee2abf63da449e098ed5ee95a305b9ff101320bdd06d9fd54034384601c0be378baa5ce505e381a3834449bd6846cc83fd7aa46e02c2a SHA512 15ec096ac7978faff4191192030dda97ffa9dee7ad75ee6b57e2a44ce671753a6cbf6d6b855ab82c2295cdab6d5633ddcce6d0115a079fb3635bae9e86fc4b8f
 MISC metadata.xml 373 BLAKE2B d50a9f253a6e39e9b97a29bda16b142ea409b58d9cdd955765639e162c26a9889918229d1645e27c5f7a26a4949e08af8a9f3b664650035b2abd77e0aca2c617 SHA512 bb58b38c187036ab4536a6cf96d28d79e9ca78c9f98289a3db61df36f14410a99e0d166cbaec78995517ca2e32a34cc621660c15b2446f520b19eefcdc8c9083
diff --git a/sys-apps/pkgcore/pkgcore-0.12.10.ebuild b/sys-apps/pkgcore/pkgcore-0.12.10.ebuild
deleted file mode 100644
index e0fb6d80f2d5..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="
-	>=app-shells/bash-5.0
-	dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.10[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	# With PYTHONDONTWRITEBYTECODE=, python will try rebuild all sorts of modules.
-	# https://bugs.gentoo.org/840266
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict /
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.12.11.ebuild b/sys-apps/pkgcore/pkgcore-0.12.11.ebuild
index fd7e245e1eca..e0fb6d80f2d5 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.11.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.11.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi