gentoo auto-resync : 06:11:2022 - 09:19:37

4 files changed, 60 insertions, 46 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index d2025087ff38..91c23121fb9c 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 4d5dcb547f44..15041423f240 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -107,6 +107,6 @@ DIST ncurses-6.3.tar.gz 3583550 BLAKE2B b2c174ac48d587b4d3aa054f04e4ec8bffd8a657
 DIST ncurses-6.3.tar.gz.sig 438 BLAKE2B d7f9852292110fe7a048a9e38611ea06564b5142cb4cbeb8d99bba752d5df8eeffa3b57e5ca315c14024520bc008b30650e99669c995dca05a798399a0c85d39 SHA512 b9a2a25e0b1854c272bf89c610c81fc0ba061f0296eca5c0079a79cfe310e44eb16c46eb5a0dd018f1ca9114d569c9d5087a2b8e60b0344f1eb97f7c5addafc6
 DIST ncurses-6.3_p20220924-patches.tar.xz 63272 BLAKE2B 94b617ba8e949bd7b78047bb1a99acb9f5e0e456d4aebfe3d81b405c491071be7aaeb90df68d144c80a7da6a02a916ba3b2c553ecaf7a8a74214860743b7b783 SHA512 7e55e96b94184a84a752a2b482d13c3aaccb41ade79d14569aad00534c03a80f2dbafc5460838b8d51271089c02c5f0da1a73e5a70bc0619217124ae1c647e20
 EBUILD ncurses-6.3_p20220423.ebuild 12167 BLAKE2B d7ea349cae22e242b2dabb4376f61e22902003137387a5a0af844961c3f2d64b2618fc3f9c654285491f2f80bb1de70124a8cd86345de4239331f3e69537a8be SHA512 7f5bcaed9bceb9eea739d4396ac0a1293aa3194d9d3f4085ece5db541fe86b8dbee76317e5b12ffbb7243eb09aa123b2c8efb376b1b3ebf5c795aed5a4dc9eef
-EBUILD ncurses-6.3_p20220924-r1.ebuild 13792 BLAKE2B d3957ad856f0b59e159122abe24fa1bb9ccce72b5876764b39b980e7fb417d6c01413bd2e95900e2aaf1ed23b6c0e977c12360c20ae154113d1100e26dc806b2 SHA512 2e83d832c85e5d8a48da6ac253a869cbdac637ac448d91bc6a8ad6026d57e54b6496a96da0ac0fbe35c8e38bd0c029f6fbd63eb710c9942774863c90e74fe8e6
-EBUILD ncurses-6.3_p20220924.ebuild 13666 BLAKE2B fdd0e65138aa43627be73fe67fd287b9bc0ab46ca0746a48cc2938a6b834cf1aeeef4fc6490a272499a83ca2e8f2c5dac4fcea03f639ca72a3b7ed53f5d516a8 SHA512 41563aa6a6d864f3e66744ebd78b3395956d05f4c6655f55dcbe77e5e9033de8b3bd95d449dcb5fba7738a2d9a5fc48d1e32c82be3029c96db0dde6804f220a2
+EBUILD ncurses-6.3_p20220924-r10.ebuild 14019 BLAKE2B 4e206b8e3b5a956c6001f41cafcba07b875a4773658dc0ad7dda9bf18c5feff47982248bbcbdb89075b581d39daa3a551d96438d38ecd078c38d57fe49cb8ded SHA512 0a138425ac86e6b39bc5d1447f33113b95d3db8df2ad7fc83b682f6016253184a6efe6fe8e7b1ef3caa89e6ae65c82dc7ce6598546efb62db3f21462562f6f98
+EBUILD ncurses-6.3_p20220924-r2.ebuild 13903 BLAKE2B a91393a2bcf0c6755a75d2eae8377d4ae46a85c261d79dd2f7ae44ac56f0c19e6c59d6154522eadb677ac692ebcadff2e5ccad345baf6d566167f6e60de3c210 SHA512 d35c8e5564775797bfee58548c24da34cca7d25eff4c3f4dd3c8032d0908c91e867e7cd9cab48aee019f6eab63815ed4cdf971f7dc8b25df43de1f92412cec2a
 MISC metadata.xml 1094 BLAKE2B a65bbb9584f77fb07fff735e6471ef48a5d63e7fa79112bf75df67f2f94e816706165fdd42a482708a7fd2ab3b3e308f9766eac0b39c3a4e31dcff5b3db25d57 SHA512 adf0f939a1e14c964bfb44ab80b1b8c1ee897a036a994848ba3e40280ab3a73ddb3beef540c905efd623e71b890c4c91e0b7c24651561d0e2bb2a4c86f039dba
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220924-r1.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220924-r10.ebuild
index f9e5093a7eb1..6f5ac7abdbc6 100644
--- a/sys-libs/ncurses/ncurses-6.3_p20220924-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.3_p20220924-r10.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript verify-sig
+inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript verify-sig
 
 MY_PV="${PV:0:3}"
 MY_P="${PN}-${MY_PV}"
@@ -133,8 +133,8 @@ fi
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="0/6"
-#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"
-IUSE="ada +cxx debug doc gpm minimal profile +stack-realign static-libs test tinfo trace"
+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"
+IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace"
 RESTRICT="!test? ( test )"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
@@ -415,8 +415,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	# We need the basic terminfo files in /etc for embedded/recovery, bug #37026
-	einfo "Installing basic terminfo files in /etc..."
 	local terms=(
 		# Dumb/simple values that show up when using the in-kernel VT.
 		ansi console dumb linux
@@ -430,25 +428,34 @@ multilib_src_install_all() {
 		screen{,-256color}
 		screen.xterm-256color
 	)
-	local x
-	for x in "${terms[@]}"; do
-		local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
-		local basedir=$(basename "$(dirname "${termfile}")")
-
-		if [[ -n ${termfile} ]] ; then
-			dodir "/etc/terminfo/${basedir}"
-			mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
-			dosym "../../../../etc/terminfo/${basedir}/${x}" \
-				"/usr/share/terminfo/${basedir}/${x}"
-		fi
-	done
-
-	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
+	if use split-usr ; then
+		local x
+		# We need the basic terminfo files in /etc for embedded/recovery, bug #37026
+		einfo "Installing basic terminfo files in /etc..."
+		for x in "${terms[@]}"; do
+			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+			local basedir=$(basename "$(dirname "${termfile}")")
+
+			if [[ -n ${termfile} ]] ; then
+				dodir "/etc/terminfo/${basedir}"
+				mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
+				dosym "../../../../etc/terminfo/${basedir}/${x}" \
+					"/usr/share/terminfo/${basedir}/${x}"
+			fi
+		done
 
-	use minimal && rm -r "${ED}"/usr/share/terminfo*
-	# Because ncurses5-config --terminfo returns the directory we keep it
-	# bug #245374
-	keepdir /usr/share/terminfo
+		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
+
+		use minimal && rm -r "${ED}"/usr/share/terminfo*
+		# Because ncurses5-config --terminfo returns the directory we keep it
+		# bug #245374
+		keepdir /usr/share/terminfo
+	elif use minimal ; then
+		# Keep only the basic terminfo files
+		find "${ED}"/usr/share/terminfo/ \
+			-type f ${terms[*]/#/! -name } -delete , \
+			-type d -empty -delete || die
+	fi
 
 	cd "${S}" || die
 	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220924.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220924-r2.ebuild
index 9a7f05e0fcb6..0f602578429d 100644
--- a/sys-libs/ncurses/ncurses-6.3_p20220924.ebuild
+++ b/sys-libs/ncurses/ncurses-6.3_p20220924-r2.ebuild
@@ -134,7 +134,7 @@ LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="0/6"
 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"
-IUSE="ada +cxx debug doc gpm minimal profile +stack-realign static-libs test tinfo trace"
+IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace"
 RESTRICT="!test? ( test )"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
@@ -413,8 +413,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	# We need the basic terminfo files in /etc for embedded/recovery, bug #37026
-	einfo "Installing basic terminfo files in /etc..."
 	local terms=(
 		# Dumb/simple values that show up when using the in-kernel VT.
 		ansi console dumb linux
@@ -428,25 +426,34 @@ multilib_src_install_all() {
 		screen{,-256color}
 		screen.xterm-256color
 	)
-	local x
-	for x in "${terms[@]}"; do
-		local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
-		local basedir=$(basename "$(dirname "${termfile}")")
-
-		if [[ -n ${termfile} ]] ; then
-			dodir "/etc/terminfo/${basedir}"
-			mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
-			dosym "../../../../etc/terminfo/${basedir}/${x}" \
-				"/usr/share/terminfo/${basedir}/${x}"
-		fi
-	done
-
-	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
+	if use split-usr ; then
+		local x
+		# We need the basic terminfo files in /etc for embedded/recovery, bug #37026
+		einfo "Installing basic terminfo files in /etc..."
+		for x in "${terms[@]}"; do
+			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+			local basedir=$(basename "$(dirname "${termfile}")")
+
+			if [[ -n ${termfile} ]] ; then
+				dodir "/etc/terminfo/${basedir}"
+				mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
+				dosym "../../../../etc/terminfo/${basedir}/${x}" \
+					"/usr/share/terminfo/${basedir}/${x}"
+			fi
+		done
 
-	use minimal && rm -r "${ED}"/usr/share/terminfo*
-	# Because ncurses5-config --terminfo returns the directory we keep it
-	# bug #245374
-	keepdir /usr/share/terminfo
+		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
+
+		use minimal && rm -r "${ED}"/usr/share/terminfo*
+		# Because ncurses5-config --terminfo returns the directory we keep it
+		# bug #245374
+		keepdir /usr/share/terminfo
+	elif use minimal ; then
+		# Keep only the basic terminfo files
+		find "${ED}"/usr/share/terminfo/ \
+			-type f ${terms[*]/#/! -name } -delete , \
+			-type d -empty -delete || die
+	fi
 
 	cd "${S}" || die
 	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc