gentoo auto-resync : 12:06:2023 - 20:20:47

4 files changed, 83 insertions, 2 deletions

diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 1d4f0c409276..dc3623bd4ed5 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,8 +1,10 @@
+AUX eselect-1.4.22-env-module.patch 598 BLAKE2B e77cb9053f28c9cceb1b2141477abeb63803cc78ad249e2df50d209732af070134ec85638d13aa271644a135c715b96396c8fdd435911973e58e071014d031d4 SHA512 5bf7c5bbb4e0aae2c80ee43cf29d723442cc200bf552466813477d210aaedce1fcedf18a90145493f96f881511165bca1b8b763b9d9a960a9c7ff8b6c063791c
 DIST eselect-1.4.20.tar.xz 180272 BLAKE2B 424653d00eda45335c3aaae50f6fbf2e89486da4529f657596516352f3b7fcb9859ceb2dc5b9762a34c44fb64e645fa27c46b86453bf50be6e8ae820664a4289 SHA512 9589ed89c4d5d31f71d535886eb50da67b84dec8a13a5df081e7569efee861dede4eaa43a0bfb9930c5b95d4f334e19245cb8820a73f7361527da262da1d1fb2
 DIST eselect-1.4.22.tar.xz 183480 BLAKE2B 8f86bdddaf98bc075694bdf7283cbd366e0ef93635472b3bbac11fdd9765984cd82e493b16836bae66e4b2c42a9cb33ad0d2aacaaf8529b59e4898e11f172d26 SHA512 73a10278d604f462aefa099df398eec2b08aee33da69419351ff2faf1cf4c0f3de0f301d92015e52da63046fe7e2c1c388e11ac84b7deb3def505a59fa291dac
-DIST eselect-1.4.24.tar.xz 183584 BLAKE2B d1cb62516ccf9262a9dba285dc04c8c7592c691c3419be2e2da170a9d195e2209cd81bed52ef75d8cb6bbf1cb3f89679e54982714f1bbfda341373271fec9059 SHA512 be01e633fb4ab4f721424460915119161cdc8104d506144322fac9e64e59d317b1f67e32c4d25cb3e08ba8ea470d483deffdf10328df45f2460f6bdc0b00c7e7
+DIST eselect-1.4.25.tar.xz 184300 BLAKE2B 630fe27338bee0c921a2f90e42d0a8abbb60a141a82bc2c4e7cf43d37582c24b06986ae1cbd341f8d3e69d011edc6c29675bf91ceaf1dcbc2593086f451b8f5f SHA512 98f2752d61e2c31ff6d735d5df0e7d98c3cc51d51c26b71d796948b141ccbc017002185022e6e1e48660ae0012bfc9cd383dd5ac50f644b35bb0893b9271121b
 EBUILD eselect-1.4.20.ebuild 1498 BLAKE2B 1e533f63c16c699a8fe2fbcd165a5e8851c4645c7d3b52cc95688ef379dfb96aea85a3be65f4160145b05fc5f79219915013773d0dd5da63909baf4816b4ebab SHA512 b5e841d3d5978fffa890bdf591b7522d82119af9a639caf445c5260d5c0d996ef617e66a5233cdaa724659f918ce2cb992c8be65fd4377d91255bef2b2fb332b
+EBUILD eselect-1.4.22-r1.ebuild 1550 BLAKE2B d0a023d9b7ca8db8ea3d9222ab68b381f29f1c70b0e788ff72271cf3217ce304ee81049f39700ee05b65e74aa412abeeb367c35b4a0a1cd660eb82c84d8ae893 SHA512 8dafdbbca758e8c278f6ccaa7eafdc73c9e67a9c2d8d902d4f7c37fdc7db0e03eaae681e082e8056c8b47bd5cd9ca1ef38232fb3663fe23ce6a2d78776d80578
 EBUILD eselect-1.4.22.ebuild 1498 BLAKE2B 1e533f63c16c699a8fe2fbcd165a5e8851c4645c7d3b52cc95688ef379dfb96aea85a3be65f4160145b05fc5f79219915013773d0dd5da63909baf4816b4ebab SHA512 b5e841d3d5978fffa890bdf591b7522d82119af9a639caf445c5260d5c0d996ef617e66a5233cdaa724659f918ce2cb992c8be65fd4377d91255bef2b2fb332b
-EBUILD eselect-1.4.24.ebuild 1506 BLAKE2B 3097f0dd910a500fd9c79124cf7fb15dee65a5429857fc065965ef3fbc1d68e4d6322c5a57f548d8104256e4e7273ea815f1541b0a4c7f479ac977468aac81ab SHA512 63cb50d1dede7f17063371ff79bb649ca9f7d499ae6dc2b518c2c59ff428558ed7fd1c518ed32d567d494c3b9526dead422d8da7bba9f6f9cb450160e637b2a1
+EBUILD eselect-1.4.25.ebuild 1506 BLAKE2B 3097f0dd910a500fd9c79124cf7fb15dee65a5429857fc065965ef3fbc1d68e4d6322c5a57f548d8104256e4e7273ea815f1541b0a4c7f479ac977468aac81ab SHA512 63cb50d1dede7f17063371ff79bb649ca9f7d499ae6dc2b518c2c59ff428558ed7fd1c518ed32d567d494c3b9526dead422d8da7bba9f6f9cb450160e637b2a1
 EBUILD eselect-9999.ebuild 1394 BLAKE2B fb62991371b697680959344974f4d7d4cdedba39337b12d004588d118632be5cd26c2026024fd6a2cc1e448f196c3367b82ba3fe347617149602c4730f8083d1 SHA512 78c75a30e9a8bfb370620b25cd200be9c6a8724858548cd1ab76926194f9d96a25c7441463d1dcb7a2aa3a6c947b1a656d6a0b455eb95e9ad9a1535f8cb349ce
 MISC metadata.xml 347 BLAKE2B 58c9ec8100f46cbb91dfcc6fc6f223e4d45553f401fe7312e36c0260c433a5842b07f894cef7dfd6c518ee5b664d86e3a4d434892ad3ea9c78c26c6f621e3063 SHA512 1963bcefd43ff52163c81a03bac522ca792688ff5317691ac30ec4375c6da4ebbf07f96da7bc1ecaa9554cee18c9f51f8b867e7e15bb652bdc7eee542f4a8d2b
diff --git a/app-admin/eselect/eselect-1.4.22-r1.ebuild b/app-admin/eselect/eselect-1.4.22-r1.ebuild
new file mode 100644
index 000000000000..3fac268d43d2
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.22-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc emacs vim-syntax"
+
+DEPEND="sys-apps/sed
+	|| (
+		sys-apps/coreutils
+		app-misc/realpath
+	)"
+RDEPEND="${DEPEND}
+	sys-apps/file
+	sys-libs/ncurses:0"
+BDEPEND="doc? ( dev-python/docutils )"
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+	vim-syntax? ( app-vim/eselect-syntax )"
+
+PATCHES=( "${FILESDIR}/${P}-env-module.patch" )
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newbashcomp misc/${PN}.bashcomp ${PN}
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+	if use doc; then
+		docinto html
+		dodoc *.html doc/*.html doc/*.css
+	fi
+
+	# needed by news module
+	keepdir /var/lib/gentoo/news
+	if ! use prefix; then
+		fowners root:portage /var/lib/gentoo/news
+		fperms g+w /var/lib/gentoo/news
+	fi
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for the portage group:
+	# merging changes the group back to root
+	if ! use prefix; then
+		chgrp portage "${EROOT}/var/lib/gentoo/news" \
+			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
+	fi
+}
diff --git a/app-admin/eselect/eselect-1.4.24.ebuild b/app-admin/eselect/eselect-1.4.25.ebuild
index f34db73d0445..f34db73d0445 100644
--- a/app-admin/eselect/eselect-1.4.24.ebuild
+++ b/app-admin/eselect/eselect-1.4.25.ebuild
diff --git a/app-admin/eselect/files/eselect-1.4.22-env-module.patch b/app-admin/eselect/files/eselect-1.4.22-env-module.patch
new file mode 100644
index 000000000000..54eb20692d14
--- /dev/null
+++ b/app-admin/eselect/files/eselect-1.4.22-env-module.patch
@@ -0,0 +1,19 @@
+env.eselect: More robust file type detection
+https://bugs.gentoo.org/908401
+
+--- a/modules/env.eselect
++++ b/modules/env.eselect
+@@ -46,9 +46,10 @@ is_envfile() {
+ 	[[ -n ${envfile##*~} ]] || return 1
+ 	[[ ${envfile##*.} != bak ]] || return 1
+ 
+-	mime=$(POSIXLY_CORRECT=1 file -i "${envfile}" \
+-		| cut -d ' ' -f 2 | sed -e 's/;$//')
+-	if ! has ${mime} ${MIME_WHITELIST}; then
++	mime=$(POSIXLY_CORRECT=1 file -bi -e soft "${envfile}") \
++		|| die "'file' command failed"
++	mime=${mime%%;*}
++	if ! has "${mime}" ${MIME_WHITELIST}; then
+ 		echo "Skipping non-text file ${envfile}."
+ 		return 1
+ 	fi