gentoo auto-resync : 15:06:2024 - 00:09:17

5 files changed, 23 insertions, 12 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 09acf1aac93f..37f21e307a56 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 049b83aa93f3..a45ce8ae8eb3 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
-DIST lollypop-1.4.37.tar.xz 600812 BLAKE2B 08719d3c370332d398cb7dfc3c89128c895f89b0f5ca2b10fd85b1ef88d79ec96fbf945bbf4549e029e80726c80ccf6212e87d13b8808c08615626c6f01a4297 SHA512 9266677e8200626859793693e8cbf0e76b134fe37ff1b915841c1aebb5785eaaf1af5325c57bed78e887c98e947101103b1898d81c62cd9517b3420aebfeb685
 DIST lollypop-1.4.39.tar.xz 599984 BLAKE2B c985bda8f8ec979cc222f3860f17f2d2329bbd04f808462011f92dcca350c9b5a99af6e5aa3efc68e128946f932890d35602e1dcfbb4b86d46468dc188e5443d SHA512 5a7fe675fb70d7f4f8d4c15f8a6e4faad0f430689f3612dd72801da10174218feb444f40ee90bdcbcf39f63b0df5889c2244772f50b7389d27f3a9e969f7cdbf
-EBUILD lollypop-1.4.37.ebuild 1650 BLAKE2B cf197546a91e45faaab88f55ef0ad202129682e587987abebf680516c59ac17c4260934d69eadb749e27ec28741b6b0415abd7cf992c7ec0168dab50b612a3a0 SHA512 e1ffd1aa5a81fd5deb03854f7ae1463aed40733722d3bab0548f32be2747a4b0359f0213a98e2597009ad496b8c9d805c6320dce4cac8c430b94ce5c923a4c06
+DIST lollypop-1.4.40.tar.xz 600140 BLAKE2B d74944a3f8d62e3d04a309717dc2f1f623376678000ed3e9ff53ca8be0ccf902b83e696f916308a4801fda283921680b592e5e1a05305e5d96624cffb0135915 SHA512 bde1e73dbeb7030a55446f5aed378639a9f6fb3bb2a7bf8253e180effa7a669083a76215ec9ebc153999a867b95d1957cdc14019d629a7f56fab9fcfea7ad822
 EBUILD lollypop-1.4.39.ebuild 1958 BLAKE2B 932a7eaa57b06ea75b7facd4a072413060ccbe9df2b235ab0356cd4ed0d50e9c7a84053b6e7f48adccb268df76882e18f32edf465213601bc07a89e3fb02cc61 SHA512 540ed21a7e5bb9b0db1254a1e2eb19c1022866aa923fdecb33a38743f9b03e904390b38b04d5f1945a9b9dcc85757fecfc0108841652dab6d8e671802055051c
+EBUILD lollypop-1.4.40.ebuild 1959 BLAKE2B 6e432b76a2613ad902395bab50ba0f3081d41309dc3fbe65c31d75e70017a02d3881422218eb271ffe954f98681520c7fba34433ac7fd00b85f693876de18c17 SHA512 b5a6376d96cf20a3c0924d61982bc416d0c7f30772bdcd9469a05fff7b51946cd3200a6ddfe60994a1643aefacffbcf063d67fab6437179b0bb7899f2d7d90da
 MISC metadata.xml 476 BLAKE2B bf4a804dde9b1da1a7561e7c4787779133d20030168df814d5632aaf89079151975daa180e96f6fe4b249570b53f7b2e08f617099cde6f3ec6c3c6f78f0c40d2 SHA512 864541883742c13e4345415f774693902dad6e7eef961614d318b0368b1964f7cbc6ee3e2d0534480531a9d7af8a74cffea3f161dc3120aed1071195e3a98be9
diff --git a/media-sound/lollypop/lollypop-1.4.37.ebuild b/media-sound/lollypop/lollypop-1.4.40.ebuild
index 9aa0ae1192be..7806e83ea85f 100644
--- a/media-sound/lollypop/lollypop-1.4.37.ebuild
+++ b/media-sound/lollypop/lollypop-1.4.40.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 gnome2-utils meson xdg
+inherit gnome2-utils meson python-single-r1 xdg
 
 DESCRIPTION="Modern music player for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
+# Tarballs on adishatz.org have files from Git submodule 'subprojects/po'
 SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -42,10 +43,10 @@ BDEPEND="
 
 RDEPEND="
 	${DEPEND}
-	media-plugins/gst-plugins-pulse
 	app-crypt/libsecret[introspection]
 	dev-libs/totem-pl-parser[introspection]
 	gui-libs/libhandy:1[introspection]
+	media-plugins/gst-plugins-pulse
 	$(python_gen_cond_dep '
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/gst-python[${PYTHON_USEDEP}]
@@ -57,14 +58,24 @@ src_install() {
 	meson_src_install
 	python_optimize
 	python_fix_shebang "${ED}/usr/bin"
+	python_fix_shebang "${ED}/usr/libexec/lollypop-sp"
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
-	elog "Remember to install the necessary gst-plugins packages to read your audio files."
-	elog "You can also use the gst-plugins-meta pakcage and its USE flags."
-	elog "Lollypop now relies on yt-dlp instead of youtube-dl, since version 1.4.36."
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Remember to install the necessary gst-plugins packages for your audio files."
+		elog "You can also use the gst-plugins-meta package and its USE flags."
+	fi
+
+	local log_yt_dlp ver
+	for ver in ${REPLACING_VERSIONS}; do
+		ver_test "${ver}" -lt "1.4.36" && log_yt_dlp=1
+	done
+	[[ ${log_yt_dlp} ]] &&
+		elog "Since version 1.4.36, Lollypop relies on yt-dlp instead of youtube-dl."
 }
 
 pkg_postrm() {
diff --git a/media-sound/streamripper/Manifest b/media-sound/streamripper/Manifest
index f282b6b46a55..eda4a9fcb4c1 100644
--- a/media-sound/streamripper/Manifest
+++ b/media-sound/streamripper/Manifest
@@ -1,6 +1,6 @@
 AUX streamripper-1.64.6-fix-autotools.patch 260 BLAKE2B b216a7a62c3c1ec53e98b85f47c7e3b07746dbb3483de7de0b1f9face420395abc10f1205624e92eede1247e4c75785b3797a6ec373ada26f876d6a8cb45acbb SHA512 49714d3ea1db143771a2ebcfd3ddd08a60e6eb63fd1e2a0b676b2d0c359b25ebd9dd40510c0137e24ef7c44c718cc83843535fae00325a098f4f1542e18e6f67
 AUX streamripper-1.64.6-fix-c99.patch 1123 BLAKE2B 3e9c0e358cdccf7df935e1247a32a1b834ce0494bd210aec20000511085667634656ed9a8b21b3731c963aa7de5805b90ca569e2c4ff67ce1c95c1b47dbdc7d1 SHA512 6569b16e8656e24a2d424fd5a5c013e5dabfae5bf8a9f8025cae9062172a4dd317ce192623c8043a8a9faa3fc6a2853831012717496634049b99f9ff7f7bcc6d
 DIST streamripper-1.64.6.tar.gz 900205 BLAKE2B b316565c786b2005802b24cb441d6ee73c2548a4ac7515633fd92faba143a4708bc49c9de7c3eb9985de14a43ac1f86935ac2c353e3d14a7cbf28e334fa21338 SHA512 8477086d0099f6de861f1c47112476c427073b6e8127bbaaa2dd3e7930fe9a5c6d9b2c68d4a317f1bc0b20c625e665d5c245189049d35468aa83cf51828d4428
-EBUILD streamripper-1.64.6-r1.ebuild 911 BLAKE2B ff847ef7c8f6c6bbdd9ea84e61d11f1b48f85a0dd2b52e8e13655a593d8fede2c44a7b8bd4701b5c6573f73ecf65f74dcad95b7a942cc944817eb2145a6cf94e SHA512 8decdbc9eacaf79723d2a7dd14edd20bb1e723de8f8de071ed4db9b42a878adc3e4474d842dfb38da9e8acfe1dc70a65233f27fe7874b9981b3a0ef140ed8bd8
+EBUILD streamripper-1.64.6-r1.ebuild 910 BLAKE2B db06fbe7a9b1c6174f6ca8e2e4740a06324d1ea60e92cb9d6ec54773fce3409cb7bd855c91a0cdccf2de5bffdc54a7b29d121c320f1bb9ea4fdc9236f2c6d0f9 SHA512 a6413d0302ec68764f3f7fd7b4bd119bfc7eaafeed7a84e1dec57eca382cebd1b0bd579c767239a5ada1157b7ba12bb1a13147648c701a24e60aa23928bc3613
 EBUILD streamripper-1.64.6.ebuild 875 BLAKE2B 9681460e4d97fab1cb862b1cc73735083f9f883d3c99816dbf16ef5595541658658fd02d4c1f5be69957c843ea21660b768910dc7a589d7fa77be3e5b2776cb2 SHA512 ef511d36b8d52fb0afbb8e53b7ebb64160b6512a839160bd74bfb3a5fb33377e462c24c519c125a669ad60f37e17265cae7adb055a89098f2b5c9c05f031a8cc
 MISC metadata.xml 346 BLAKE2B 676b46ee59507f6893d33744c01d5864fa50923718eb8907db92b05b2ee9449ddd2514c378d8dbe715a82e26633c7d370a62fc0414a4c2924c5a6cf950701167 SHA512 71db384aebbce86d8f5c01eeacd3064aa31678026e0d54a57e9eaf0080c0ac450d54fe4f9fc036b7225147b7483def87cd2e29b7dedb921696a59116fc4cce4d
diff --git a/media-sound/streamripper/streamripper-1.64.6-r1.ebuild b/media-sound/streamripper/streamripper-1.64.6-r1.ebuild
index bcca9437797a..b9c1741e4f77 100644
--- a/media-sound/streamripper/streamripper-1.64.6-r1.ebuild
+++ b/media-sound/streamripper/streamripper-1.64.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="vorbis"
 
 RDEPEND="