gentoo auto-resync : 19:12:2024 - 06:30:51HEADmaster

3 files changed, 56 insertions, 24 deletions

diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest
index c3c9fb32744e..b7f9a94c0598 100644
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@@ -33,6 +33,6 @@ EBUILD cmake-3.30.5.ebuild 9177 BLAKE2B 19559d4c111e459929fbe5a59c730222468ab8fb
 EBUILD cmake-3.30.6.ebuild 9179 BLAKE2B 1043cbade235c151cb58ed6e1931bac34f5f1d66965ba5e1e7a16b53aebc28a499e4819d4c0a3b64a04c234a83afb88fc8541cacc07d04b2d9bfa8e23bef10d2 SHA512 2b9dbb7eaa4712599b7d9f1322cb02997d610373418b457b4dfa3d186240db519be6ef43f94962962eae2aa4d76d9cba6c03a79c42e0730d5e3030d102ef2cf8
 EBUILD cmake-3.31.0.ebuild 9185 BLAKE2B edb55e211c944be87ed80b0bcb5e45eb11d6e42ba909b6fd51d57bcd88b2eb87a5eb774d3d178903cc484d2c2c26c35aaa46bfb153f883e7e2181e9fb086a058 SHA512 299cc41828d4011f518be6a221f33e726c4a2a446348bc2699d8a495d5e9e2eaec910f595e517051484733fd7c1118b4ea0a527844a096e2aaf2ffe07c093159
 EBUILD cmake-3.31.1.ebuild 9185 BLAKE2B edb55e211c944be87ed80b0bcb5e45eb11d6e42ba909b6fd51d57bcd88b2eb87a5eb774d3d178903cc484d2c2c26c35aaa46bfb153f883e7e2181e9fb086a058 SHA512 299cc41828d4011f518be6a221f33e726c4a2a446348bc2699d8a495d5e9e2eaec910f595e517051484733fd7c1118b4ea0a527844a096e2aaf2ffe07c093159
-EBUILD cmake-3.31.2.ebuild 9563 BLAKE2B 2f30ad40fee7fd93e8098e3769ce214837a7c7f80bef1ef8e255def2e40ade3f5426a64be721ceb2b21f4efffaa8d9bcb96e6742a46828236c8f8ac00d6dfaf0 SHA512 af975d4f5e9deb8a0cfed44c04370e5f36f074b0b5c10c070afaaa024a86ed34b56f256c5f23096611a04088029fe080321aac711e1ec028c69e5c1fc42d8800
-EBUILD cmake-9999.ebuild 9633 BLAKE2B ebb1009157b53090125f2c2a7c3627bc4b0ea66a595e1d200f3ca16c618f1421a332eefac241618694f83f0aec094393fde6c103e2513f868e23111c3c6d1d02 SHA512 d2ddfee63c7ea808648f894eabc313a6078fe9e4ef3d4546eb7be2d12bac59750717efccbfaae4e00d0a6b25659be02aaabf4c9042b0524990fdc827c26ddbd8
+EBUILD cmake-3.31.2.ebuild 9854 BLAKE2B e96779d56bb03bd5b540365194d6f802cebd7ffef03e60f6617aa6e10141f879e3165ce7d1fdf731cfdd25aa48fdba0a6dd286e475e0da909bce16227b895ea8 SHA512 6ee346cdb4cc6a1b48ef87073eb6ee4a754b73cc8dc0965b4e18f2fa5a39d3f75e28c81556f7b1d969ffcf7c6da670d428dd3deccfe20c4dae3ce27c74ecc93a
+EBUILD cmake-9999.ebuild 9924 BLAKE2B afd8eea17fc8b085097c5bb3cd126594585ecd1330d1a8255d22f61fe0ab9e8f0cf4fbf479c61362b0ad2bd52176efb511f6eec6c925d906dabc9950373bfb04 SHA512 d5a9b398112d0c4d1121fa93b9a3f5d2f157026193104212440db3f3001616b5b2487bd018bd572b70ce2620b74073300c9da7dd1e35f364687ee7a971b39a7e
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-build/cmake/cmake-3.31.2.ebuild b/dev-build/cmake/cmake-3.31.2.ebuild
index 77333d9623b1..35abe94a134d 100644
--- a/dev-build/cmake/cmake-3.31.2.ebuild
+++ b/dev-build/cmake/cmake-3.31.2.ebuild
@@ -126,6 +126,33 @@ cmake_src_bootstrap() {
 		|| die "Bootstrap failed"
 }
 
+pkg_pretend() {
+	if [[ -z ${EPREFIX} ]] ; then
+		local file
+		local errant_files=()
+
+		# See bug #599684 and  bug #753581 (at least)
+		for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do
+			if [[ -e ${file} ]]; then
+				errant_files+=( "${file}" )
+			fi
+		done
+
+		# If errant files exist
+		if [[ ${#errant_files[@]} -gt 0 ]]; then
+			eerror "Errant files found!"
+			eerror "The presence of these files is known to confuse CMake's"
+			eerror "library path logic. Please (re)move these files:"
+
+			for file in "${errant_files[@]}"; do
+				eerror " mv ${file} ${file}.bak"
+			done
+
+			die "Stray files found in /etc/, see above message"
+		fi
+	fi
+}
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
@@ -277,17 +304,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -z ${EPREFIX} ]] ; then
-		local file
-		# See bug #599684 and  bug #753581 (at least)
-		for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do
-			eerror "Errant ${file} found!"
-			eerror "The presence of these files is known to confuse CMake's"
-			eerror "library path logic. Please (re)move this file:"
-			eerror " mv ${file} ${file}.bak"
-		done
-	fi
-
 	if use gui; then
 		xdg_icon_cache_update
 		xdg_desktop_database_update
diff --git a/dev-build/cmake/cmake-9999.ebuild b/dev-build/cmake/cmake-9999.ebuild
index 214e75342d3c..33cdd6eb2848 100644
--- a/dev-build/cmake/cmake-9999.ebuild
+++ b/dev-build/cmake/cmake-9999.ebuild
@@ -126,6 +126,33 @@ cmake_src_bootstrap() {
 		|| die "Bootstrap failed"
 }
 
+pkg_pretend() {
+	if [[ -z ${EPREFIX} ]] ; then
+		local file
+		local errant_files=()
+
+		# See bug #599684 and  bug #753581 (at least)
+		for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do
+			if [[ -e ${file} ]]; then
+				errant_files+=( "${file}" )
+			fi
+		done
+
+		# If errant files exist
+		if [[ ${#errant_files[@]} -gt 0 ]]; then
+			eerror "Errant files found!"
+			eerror "The presence of these files is known to confuse CMake's"
+			eerror "library path logic. Please (re)move these files:"
+
+			for file in "${errant_files[@]}"; do
+				eerror " mv ${file} ${file}.bak"
+			done
+
+			die "Stray files found in /etc/, see above message"
+		fi
+	fi
+}
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
@@ -278,17 +305,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -z ${EPREFIX} ]] ; then
-		local file
-		# See bug #599684 and  bug #753581 (at least)
-		for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do
-			eerror "Errant ${file} found!"
-			eerror "The presence of these files is known to confuse CMake's"
-			eerror "library path logic. Please (re)move this file:"
-			eerror " mv ${file} ${file}.bak"
-		done
-	fi
-
 	if use gui; then
 		xdg_icon_cache_update
 		xdg_desktop_database_update