gentoo auto-resync : 07:11:2024 - 03:03:27

3 files changed, 48 insertions, 15 deletions

diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index 9bb491169d0c..b664fccf6277 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,5 +1,5 @@
-DIST gpodder-3.11.3.tar.gz 1183434 BLAKE2B 553642b17beaadc686c2a2b01971436ca44e84029269f776423905bbac1c2448878d4fb8f3d9f8a1776da5c0417b5df425a884bb2b4d2a80c19e952ceb922a92 SHA512 643097fe209cc69a7674fd265a64099c9b34cc9b2dcee4cc09004113559334822db1dea5359f302956e15b74d3f9c5e1ce8727b89e02f067e7ee6b8261c53ca6
+AUX gpodder-3.11.4-make-build.patch 552 BLAKE2B 788fbcc1f280640d7625e8e65461edbb0bacdec7de36c4eda0f4f1a95de8bbad1a53b55470fce69ca6c106b968a7bf3b19d1a7cd6afabebb3a5e0b7cf85f6cb0 SHA512 163bf1ae6fe1f7d8fc5647cb724dd8af119754987782e47fc0110212222cff4f6aee303c3c7f8ce9e9c8efc9d4399ade48924c350fdf5133dd28e31e5777d607
 DIST gpodder-3.11.4.tar.gz 1183463 BLAKE2B ec16bd8dbe531869dd68b062e12013adeb4010a1423b274e52e5cf765828ddffccbfe021a3936e1a6985c2a00f9d1aaf63b80f89beace968501b2e55d284d53d SHA512 f60e2e04abec7d9713d169f9eccb431325bcfe40303e14d0cb42c3b5b4696d7435b86eb1c69b430ef99f81a6b71f89dffafec84d1f1c51118af59e57dcfa0d2d
-EBUILD gpodder-3.11.3.ebuild 2119 BLAKE2B e383de02cb4211b2b0ae1c6ba6365dc634a255082f69e703cda33fc9a3799ecbbc75ca8a65c6a6c01a32345ce7a358b0bf4269d24a38b397a6c5e6538d8a0bf3 SHA512 e1c488309668e0fd14bcc9dce93d5c950e940b5db442e6b1d2dc1fe13fdd00934d49b7c1204f46f072b8fe9bdf18324757815972978feee279b2e30a4a362dff
+EBUILD gpodder-3.11.4-r1.ebuild 2171 BLAKE2B bc40d7561d88792f3f24316b9ff037cf96d2b3e8b6de012acd1a57bbf00ee18e4fa912d62ab836a87077fd1092295d77d8db5a5b346aa8b2cfcca3e9d9ae8aa1 SHA512 8d8c57fa0f2108ecdbe1a471f47bfdd73e11c1b50b38a948c7470c4a32141ced6171950037875ff7c633bc2b30b5c8b6b6da8fc58d25c16511e8899504a85d2f
 EBUILD gpodder-3.11.4.ebuild 2119 BLAKE2B e383de02cb4211b2b0ae1c6ba6365dc634a255082f69e703cda33fc9a3799ecbbc75ca8a65c6a6c01a32345ce7a358b0bf4269d24a38b397a6c5e6538d8a0bf3 SHA512 e1c488309668e0fd14bcc9dce93d5c950e940b5db442e6b1d2dc1fe13fdd00934d49b7c1204f46f072b8fe9bdf18324757815972978feee279b2e30a4a362dff
 MISC metadata.xml 358 BLAKE2B 272a71d2d7d519dca74a2d1dbbd25d0c48b55b265eca16962967f57dc29edfeca9d454100a84a7dd505f5bab7778778ff45b89f2ddaca152b562733e8c0dcce8 SHA512 31b12848c3f24a103f2bfa39bec4b2c4e3251ed70de194d569acfbe2b7df3f8ea28dd5ba274b4add0fbc1b55d998cf13f5b8f7bf89bb4a95fd1e60e988bce6f6
diff --git a/media-sound/gpodder/files/gpodder-3.11.4-make-build.patch b/media-sound/gpodder/files/gpodder-3.11.4-make-build.patch
new file mode 100644
index 000000000000..c9f2d323b52e
--- /dev/null
+++ b/media-sound/gpodder/files/gpodder-3.11.4-make-build.patch
@@ -0,0 +1,16 @@
+From: Brand Huntsman <bgo-7187AEA9-brand@qzx.com>
+Bug: https://bugs.gentoo.org/909991#c6
+
+--- a/makefile
++++ b/makefile
+@@ -93,7 +93,9 @@ $(GPODDER_SERVICE_FILE): $(GPODDER_SERVICE_FILE_IN)
+ %.desktop.in.h: %.desktop.in
+ 	intltool-extract --quiet --type=gettext/ini $<
+ 
+-install: messages $(GPODDER_SERVICE_FILE) $(DESKTOP_FILES)
++build: messages $(GPODDER_SERVICE_FILE) $(DESKTOP_FILES)
++
++install: build
+ 	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --optimize=1
+ 
+ install-win: messages $(GPODDER_SERVICE_FILE) $(DESKTOP_FILES)
diff --git a/media-sound/gpodder/gpodder-3.11.3.ebuild b/media-sound/gpodder/gpodder-3.11.4-r1.ebuild
index 08280b1bfa58..4f73c0e097bc 100644
--- a/media-sound/gpodder/gpodder-3.11.3.ebuild
+++ b/media-sound/gpodder/gpodder-3.11.4-r1.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{11..13} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 optfeature xdg
 
 DESCRIPTION="A free cross-platform podcast aggregator"
 HOMEPAGE="https://gpodder.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+dbus bluetooth mtp"
 
 RDEPEND="
@@ -45,30 +47,45 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-make-build.patch"
+)
+
 distutils_enable_tests pytest
 
 src_prepare() {
 	default
 
-	sed -i -e 's:--cov=gpodder::' makefile || die
+	sed -e 's:--cov=gpodder::' -i makefile || die
+
+	emake PYTHON="${EPYTHON}" build
 }
 
 python_test() {
 	# These are pulled out from the Makefile to give us more control
 	# See bug #795165
 	# Previously, we used 'emake releasetest' in src_test
-	LC_ALL=C epytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py \
-		-p no:localserver
-	LC_ALL=C epytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient \
-		-p no:localserver
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	local -x EPYTEST_IGNORE=(
+		src/gpodder/utilwin32ctypes.py
+	)
+
+	epytest \
+		--ignore=tests \
+		--doctest-modules src/gpodder/util.py \
+		src/gpodder/jsonconfig.py
+
+	epytest tests \
+		--ignore=src/mygpoclient \
+		-p pytest_httpserver
 }
 
 src_install() {
-	emake PYTHON="${EPYTHON}" DESTDIR="${D}" install
-
 	distutils-r1_src_install
 
-	touch "${ED}"/usr/share/gpodder/no-update-check || die
+	touch "${ED}/usr/share/gpodder/no-update-check" || die
 }
 
 pkg_postinst() {