6 files changed, 170 insertions, 151 deletions
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index d80dd4dba886..0463100146d7 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,2 +1,2 @@
-DIST lollypop-1.2.35.tar.xz 509916 BLAKE2B 8cf9ea74287b6ac7d4942c2312cc4d6e07d4748d505cc9e45a896129f9e4a43ef5c65c0c18764597d7ce3c4d2fc93804c501f68ea3b67625e200497613077af6 SHA512 179fa5e77482db35de9e30e392e6d07bb5c832d5d1decaee06982570bdcbb809dc99375eeb6fe3dce75829af3570953ce517e3b4eaabceac807b9d5c382bd53e
-DIST lollypop-1.4.18.tar.xz 575120 BLAKE2B 62ff404c0e7c2ac7029ebb45143db35b0b93b30bfc386fb08aa4a2fc10916efb190118f41e40a0f795bef4f8d0b21b0353b9e27bbb75c5471132145028fc8b27 SHA512 17f2db91a56fd140c66c251732eca4b2a6cc1849b5dc72f0a4014c766c64eee475bc9d2305d307e2a54184ab5dd812a5fb27b39acf60a1c468770d1d34307982
+DIST lollypop-1.4.37.tar.xz 600812 BLAKE2B 08719d3c370332d398cb7dfc3c89128c895f89b0f5ca2b10fd85b1ef88d79ec96fbf945bbf4549e029e80726c80ccf6212e87d13b8808c08615626c6f01a4297 SHA512 9266677e8200626859793693e8cbf0e76b134fe37ff1b915841c1aebb5785eaaf1af5325c57bed78e887c98e947101103b1898d81c62cd9517b3420aebfeb685
+DIST lollypop-1.4.39.tar.xz 599984 BLAKE2B c985bda8f8ec979cc222f3860f17f2d2329bbd04f808462011f92dcca350c9b5a99af6e5aa3efc68e128946f932890d35602e1dcfbb4b86d46468dc188e5443d SHA512 5a7fe675fb70d7f4f8d4c15f8a6e4faad0f430689f3612dd72801da10174218feb444f40ee90bdcbcf39f63b0df5889c2244772f50b7389d27f3a9e969f7cdbf
diff --git a/media-sound/lollypop/lollypop-1.2.35.ebuild b/media-sound/lollypop/lollypop-1.2.35.ebuild
deleted file mode 100644
index 7f583f5eecab..000000000000
--- a/media-sound/lollypop/lollypop-1.2.35.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 gnome2-utils meson xdg
-
-DESCRIPTION="Modern music player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
-SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
-KEYWORDS="amd64"
-
-LICENSE="GPL-3"
-SLOT="0"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="${PYTHON_DEPS}
-	dev-libs/appstream-glib[introspection]
-	dev-libs/glib:2
-	dev-libs/gobject-introspection[cairo(+)]
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	gnome-base/gnome-common
-	x11-libs/gtk+:3
-"
-BDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pkgconfig[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	dev-util/intltool
-"
-RDEPEND="${DEPEND}
-	app-crypt/libsecret[introspection]
-	dev-libs/totem-pl-parser
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dbus-python
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pylast-1.0.0[${PYTHON_MULTI_USEDEP}]
-	')
-	media-libs/gst-plugins-base:1.0[introspection]
-"
-
-RESTRICT="test"
-
-src_install() {
-	meson_src_install
-	python_optimize
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/media-sound/lollypop/lollypop-1.4.18.ebuild b/media-sound/lollypop/lollypop-1.4.18.ebuild
deleted file mode 100644
index affb509a01eb..000000000000
--- a/media-sound/lollypop/lollypop-1.4.18.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 gnome2-utils meson xdg
-
-DESCRIPTION="Modern music player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
-SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3"
-SLOT="0"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="${PYTHON_DEPS}
-	dev-libs/appstream-glib[introspection]
-	dev-libs/glib:2
-	dev-libs/gobject-introspection[cairo(+)]
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	gnome-base/gnome-common
-	x11-libs/gtk+:3
-"
-BDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pkgconfig[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	dev-util/intltool
-"
-RDEPEND="${DEPEND}
-	app-crypt/libsecret[introspection]
-	dev-libs/totem-pl-parser
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dbus-python
-		dev-python/gst-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-	')
-	gui-libs/libhandy:1
-	media-libs/gst-plugins-base:1.0[introspection]
-"
-
-RESTRICT="test"
-
-src_install() {
-	meson_src_install
-	python_optimize
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/media-sound/lollypop/lollypop-1.4.37.ebuild b/media-sound/lollypop/lollypop-1.4.37.ebuild
new file mode 100644
index 000000000000..9aa0ae1192be
--- /dev/null
+++ b/media-sound/lollypop/lollypop-1.4.37.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+inherit python-single-r1 gnome2-utils meson xdg
+
+DESCRIPTION="Modern music player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
+SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# Dependencies being checked by Meson
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	net-libs/libsoup:3.0[introspection]
+	x11-libs/gtk+:3[introspection]
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-libs/appstream-glib
+		dev-util/desktop-file-utils
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	media-plugins/gst-plugins-pulse
+	app-crypt/libsecret[introspection]
+	dev-libs/totem-pl-parser[introspection]
+	gui-libs/libhandy:1[introspection]
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	')
+"
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}/usr/bin"
+}
+
+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."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/lollypop/lollypop-1.4.39.ebuild b/media-sound/lollypop/lollypop-1.4.39.ebuild
new file mode 100644
index 000000000000..7806e83ea85f
--- /dev/null
+++ b/media-sound/lollypop/lollypop-1.4.39.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+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"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# Dependencies being checked by Meson
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	net-libs/libsoup:3.0[introspection]
+	x11-libs/gtk+:3[introspection]
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-libs/appstream-glib
+		dev-util/desktop-file-utils
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	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}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	')
+"
+
+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
+
+	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() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/lollypop/metadata.xml b/media-sound/lollypop/metadata.xml
index 15fd2f3a22be..28a02ea04c47 100644
--- a/media-sound/lollypop/metadata.xml
+++ b/media-sound/lollypop/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
+	<maintainer type="person" proxied="yes">
+		<email>liaoyuan@gmail.com</email>
+		<name>Yuan Liao</name>
 	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gnome-gitlab">World/lollypop</remote-id>
+	</upstream>
 </pkgmetadata>