gentoo auto-resync : 02:01:2025 - 06:31:11

6 files changed, 112 insertions, 4 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 718c0f868010..b5ea4613821a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/polychromatic/Manifest b/sys-apps/polychromatic/Manifest
index bb8c2e949b2e..6d14205adfb7 100644
--- a/sys-apps/polychromatic/Manifest
+++ b/sys-apps/polychromatic/Manifest
@@ -1,4 +1,5 @@
+AUX polychromatic-0.9.3-command-v.patch 2870 BLAKE2B f96b4336f0feb8dddb0f2a47a1e9eca65fe489eb2bd3d3684855c27071f5bcf7e3c137618c69d54216129acc4dc687fa9e59f588026b3a43c3c6e4c8fd8f87ad SHA512 5069191151cff7533d78250d35cbf85ceb26dfa5d27053e2a241fab77397c53d49a1388b7601965f51ae25a904e46b18124550f7256d49681013c947ecccbc73
 DIST polychromatic-0.9.3.tar.gz 1809140 BLAKE2B 8b3397a234e45a4e72635207bf2ce8d8fc3454e62494cd84128908fffe1d3155255d74ea41d17584cb1dbfd2e68e8b6cb629e8dedab43e22eba3ff8204f271b0 SHA512 a1805bce9986915164fdf61b5fd194ebd16cd7f1528febe0dcf7c09ecde5edf6ed7b404c97a3ea27427727d0134d9e26b71d8a810b5649e659febc403146bc4a
-EBUILD polychromatic-0.9.3.ebuild 2070 BLAKE2B 926e11ccab6db5829ffc0f3255764871618c887877c2d6ce7e9a13152dc31d43fca9ada6bc56fd992e2bd3c6ed76bec9988ba1dd9aee13a3a29c885981fe310c SHA512 de95901c7eba7d167c63ac79ad7a2090986aa199f698dd1a5e0f933a6fc9db1aacc90f40cc3872fcfc50a25e8694498b803ae081ff959754ba16b5c4d656bf60
+EBUILD polychromatic-0.9.3.ebuild 2133 BLAKE2B c1728147057810d416ead25b7e81b1580864ba95522412b5657fece3d7b8f11c8e09bd0bde846080f3bc2384f8926660654f851a982692ef18f12302e24e8e46 SHA512 eba82eedd862b21244ab52bf50dc8ac173e0708f88d2faefa6ecab2f0013d9426ac87ce9d1b2c8fd8251943b5a2ff295fe1de369d5dab7db0d7d75340857e4c3
 EBUILD polychromatic-9999.ebuild 2071 BLAKE2B ee362bcdea83ffb336f963009f8edd5b1d443049209b6f85b3eb8c7c5f1385b391248633a4ccf85309f18ed60730a9ef002c4c03cdfdd650148654c12f63352b SHA512 96e0d15c6f5965999e4b51514095bf09ca37ff91c51a497714e2c54043a8c4bdfa79c51ce73552874d2c6ce76659d806aa2008b6634aa933a6bb24cd5ae29957
 MISC metadata.xml 993 BLAKE2B 193ed9d7f922efa078e7856084b828ff4f97d8606a1979206b3ff4a36ddcc6ff88a1adc3d0d899261fef5ae5751a1204fb27a03b0a8ff7510578f431a89a0cd2 SHA512 245f395c90cfbe36dae2bc1da5f1c6d2513ebde78a44e7a785a4bb9c01cf24ea0be81405c82eb8f4fbc34d34a4990a36359e98658d1340e47172257a867aa8db
diff --git a/sys-apps/polychromatic/files/polychromatic-0.9.3-command-v.patch b/sys-apps/polychromatic/files/polychromatic-0.9.3-command-v.patch
new file mode 100644
index 000000000000..4d73e3edae8c
--- /dev/null
+++ b/sys-apps/polychromatic/files/polychromatic-0.9.3-command-v.patch
@@ -0,0 +1,101 @@
+--- a/scripts/build-locales.sh
++++ b/scripts/build-locales.sh
+@@ -16,7 +16,7 @@ cd "$(dirname "$0")"/../locale
+ output_path="$1"
+ 
+ # Check all the required tools are present
+-if [ -z "$(which msgfmt)" ]; then
++if [ -z "$(command -v msgfmt)" ]; then
+     echo "Command for 'msgfmt' not found. Locales will not be compiled."
+     echo "Try installing a 'gettext' package for your distribution."
+     exit 1
+--- a/scripts/build-man-pages.sh
++++ b/scripts/build-man-pages.sh
+@@ -5,7 +5,7 @@
+ 
+ cd $(dirname "$0")/../man/
+ 
+-which=$(which scdoc)
++which=$(command -v scdoc)
+ if [ $? != 0 ]; then
+     echo "Please install 'scdoc', which was not found in your PATH."
+     exit 1
+--- a/scripts/build-styles.sh
++++ b/scripts/build-styles.sh
+@@ -10,8 +10,8 @@
+ cd $(dirname "$0")/../sources/qt-theme/
+ 
+ # Find an implementation of SASS to use.
+-sassc=$(which sassc 2>/dev/null)
+-sass=$(which sass 2>/dev/null)
++sassc=$(command -v sassc 2>/dev/null)
++sass=$(command -v sass 2>/dev/null)
+ 
+ if [ -z "$sass" ] && [ -z "$sassc" ]; then
+     echo "Please install a package that provides 'sassc' or 'sass' and try again."
+--- a/scripts/create-locales.sh
++++ b/scripts/create-locales.sh
+@@ -19,7 +19,7 @@ cd "$(dirname "$0")"/../locale
+ # Check all the required tools are present
+ missing_tool=false
+ function check_for_tool() {
+-    if [ -z "$(which $1)" ]; then
++    if [ -z "$(command -v $1)" ]; then
+         echo "Command for '$1' not found."
+         missing_tool=true
+     fi
+--- a/scripts/dev/optimise-svgs.sh
++++ b/scripts/dev/optimise-svgs.sh
+@@ -7,7 +7,7 @@
+ # as it will likely strip essential data.
+ #
+ 
+-if [ -z "$(which svgcleaner)" ]; then
++if [ -z "$(command -v svgcleaner)" ]; then
+     echo "'svgcleaner' not installed."
+     exit 1
+ fi
+--- a/scripts/validate-metainfo.sh
++++ b/scripts/validate-metainfo.sh
+@@ -3,7 +3,7 @@
+ # Validate AppStream metainfo
+ #
+ 
+-if [ -z "$(which appstreamcli)" ]; then
++if [ -z "$(command -v appstreamcli)" ]; then
+     echo "appstreamcli not found. Try installing 'appstream'."
+     exit 1
+ fi
+--- a/scripts/validate-scdoc.sh
++++ b/scripts/validate-scdoc.sh
+@@ -3,7 +3,7 @@
+ # Checks the scdocs can be compiled.
+ #
+ 
+-if [ -z "$(which scdoc)" ]; then
++if [ -z "$(command -v scdoc)" ]; then
+     echo "'scdoc' not installed."
+     exit 1
+ fi
+--- a/scripts/validate-scss.sh
++++ b/scripts/validate-scss.sh
+@@ -3,7 +3,7 @@
+ # Validates SCSS files can be compiled. Uses 'sassc'.
+ #
+ 
+-if [ -z "$(which sassc)" ]; then
++if [ -z "$(command -v sassc)" ]; then
+     echo "'sassc' not installed."
+     exit 1
+ fi
+--- a/tests/openrazer/run_daemon.sh
++++ b/tests/openrazer/run_daemon.sh
+@@ -26,7 +26,7 @@ if [ ! -f "$OPENRAZER_SRC/scripts/create_fake_device.py" ]; then
+     exit 1
+ fi
+ 
+-if [ -z "$(which openrazer-daemon)" ]; then
++if [ -z "$(command -v openrazer-daemon)" ]; then
+     echo "openrazer-daemon is not installed."
+     exit 1
+ fi
diff --git a/sys-apps/polychromatic/polychromatic-0.9.3.ebuild b/sys-apps/polychromatic/polychromatic-0.9.3.ebuild
index 61ae7be119f4..a3c9f7d14ded 100644
--- a/sys-apps/polychromatic/polychromatic-0.9.3.ebuild
+++ b/sys-apps/polychromatic/polychromatic-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,6 +47,8 @@ BDEPEND="
 	dev-lang/sassc
 "
 
+PATCHES=( "${FILESDIR}/polychromatic-0.9.3-command-v.patch" )
+
 DOC_CONTENTS="To automatically start up Polychromatic on session login copy
 /usr/share/polychromatic/polychromatic-autostart.desktop file into Your user's
 ~/.config/autostart/ directory."
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 330ebaea8ed3..0e0f758166e4 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,5 +6,5 @@ DIST portage-3.0.65.tar.bz2 1193321 BLAKE2B 4734b0a2b17cf0cdbd0bedac9efa6cecb579
 DIST portage-3.0.66.1.tar.bz2 1198196 BLAKE2B 8dbd1bc17c1a9a3530425efa31a27efba39e1ef5f5457b4084875c64f7128453139aea447c25a642c124438e88ef484a43b1838cbd8c03748017571dd18f9921 SHA512 fcd3d4d3dcfdb67cbcdb0f4854860f073b4a9d41dadc97a3e6f890e3c75091aceec5622e97495741622b5c390309f05dec35b9e951d7ee7a78e28a9b3ed2939d
 EBUILD portage-3.0.65-r1.ebuild 6776 BLAKE2B 06f1d5e62b178276acf0a4c908697fe337f004fcd8bc8b0855f604ceacd60d37331024115a99dc6b1711c2a67d91f94d29f7a5e278519d8be0fc8a3a93c38367 SHA512 c55d309d9bf3706d3e272f3634dc6c33222074d8dc2f289109631b4f6db24df62fbb355a70c8bdf74f3d76c0a799b262726c92efaea9e7e52fa49e4b175abb20
 EBUILD portage-3.0.66.1-r1.ebuild 6401 BLAKE2B 91539d4020cb0b91ed61c1c0f0fa15935cdca80a9326765ab0bb28e4d79edc35e3cac07728979178bc7112010318ae9bafebbc008b94958a9ef5f3243e18bcdb SHA512 8e77a4da3d898f820d8afc9a028a2b3cfebb41e77d2fdae0131f8087ad0794cb2ede27b2bad7a37d4a9d36595d2523e6ec67f70ee96bc6169fada6aff5448c41
-EBUILD portage-9999.ebuild 6361 BLAKE2B dbb0bc671fe61839d0594ba8d730c7abb5bafdcd35b7a106a1f2661d7c63d3fde8559dfe4f08039f4905724318d19b32ce287edf5a3a48c16e17fbab0cf15513 SHA512 a9f0927b000d4954bd557773b8c4aa616c69640f5c8bf0865486f543c70ccd2fe54a093577333a117819cfd8de21e66cc3e52ef81e6614dbdd6b298e59055593
+EBUILD portage-9999.ebuild 6425 BLAKE2B a2c05cc7cc63f6664aafff5f8b22a97774c304d4bcebcd902dcd4683f8032922ea5cbdf0b69fa42277074cfdd4952f9b3418f790fbe49d356f032fc41bf87ad0 SHA512 eb99d6b97a9955572e35cea9048e33fe01eb12bcf50cd0f121a379d30127219ba442c2c0a455f33090370840e5530b3aea08c7b58b0ca00ae8974636e65c9fea
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 5958c3dd1f5e..e1afb04b085f 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -181,18 +181,22 @@ pkg_preinst() {
 			-u PORTDIR \
 			-u PORTDIR_OVERLAY \
 			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			ED="${ED}" \
 			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
 		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
 			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			ED="${ED}" \
 			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
 
 		env -u FEATURES -u PORTAGE_REPOSITORIES \
 			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			ED="${ED}" \
 			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
 
 		env -u BINPKG_FORMAT \
 			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			ED="${ED}" \
 			"${PYTHON}" -m portage._compat_upgrade.binpkg_format || die
 	fi