gentoo auto-resync : 09:07:2023 - 16:25:07

5 files changed, 25 insertions, 54 deletions

diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index f12b7bae037d..38d46d7a01f2 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -1,5 +1,5 @@
 AUX devedeng-4.14.0-no_compress_man.patch 878 BLAKE2B f3460e0b28e1a1a80c3f9c1c41e26e608f203e4f9fa59ed93ff837e430ad14231b7375efaf14886fba16ac4f1a1f7247f03a43775441579c364ab91e6b830515 SHA512 d669cd0f55215e90f622acb1ec1895e25b29850ecb1ec5ebe2c5cbf9283f63f8448d064a5938cef250c748feeee0c0da25cdd5370f85d9a61b89532b2e5915cb
+AUX devedeng-4.17.0-locale_install.patch 783 BLAKE2B f4917043d5c2f0787c3ee029e13b55ad0f9ac0fa405b5f64fb475f5859c74d4d8e503ad6c06148357d053c928f0f5a4c4be9656117dd5799526ff08499ddf64a SHA512 ad8550b40151d682cd59ee804ad52f28566cf31dac0cdfe8f56fe89983413c4af5146a9493a6b7600ad095c34e3c51ea3a63c2b87fcbb8640790f580813d6bd7
 DIST devedeng-4.17.0.tar.bz2 1773455 BLAKE2B 46d91145f94122bb3a9e83368f50dde6f1b25cecf5101c7d79bbc237bad69cb3d80d3b78429be76af2e4652eeb09e99e12c6c014c6bac8e71a7dd01d689ba634 SHA512 942e9a969146ae87bf1f1a5fa7441459801258f7dcac5a2f2ac8def146c6d88d8d3db27c474b7741cdc980c0757f99e6ee03b0da524f71895ebdbe2fe442a179
-EBUILD devedeng-4.17.0-r1.ebuild 1232 BLAKE2B 12dc1aaf112933e25502ba778576a7c0a32cfec1021bfc60ef74201af6fbd9345dc2a03dd390b5f95765827be71c6a5818f9835e7ded496453b17917c594ee18 SHA512 300e96cf06b60c859d44d5ea6fb111d49d58b98e3d0e3d7d2b5be76a68ee9db26eac49eddaa1c38f5f79216ae9ac72f4cfe65a2e9df0108297e4cc933fba5ee9
-EBUILD devedeng-4.17.0.ebuild 1230 BLAKE2B 343dd8025fcf8edd8353db1aea9996e9d7f805ca2e5042700ab1907b1096b29110a1288b90e5ba37d4b2fe215f6569b4f05f6e5f5e50b00d682c2b7d6ea4c37f SHA512 960af925aca9845e852d67211507062ce6ad6dbb7d59a103b82520e7b74b64c3a4e0708bbf77a533b2b6efdd535328217585e7ece50180619de8f669df785db7
-MISC metadata.xml 944 BLAKE2B 1dd92770403fc8ea2d4b6032341a0b7591d4f01e067c4d3196895da9c5a294db79961a5451673e03f4cfa6f647a8d35f74e95cb3255a52f3b95771195e826196 SHA512 140cc1c7ef35dfac691fffafec4f72d5badd0eaf074ec95aa7924401ce76fd511f4fd0309606d9d420e5a277b9210680ec83c783d736fc28a702bd2b557a8f2f
+EBUILD devedeng-4.17.0-r2.ebuild 1278 BLAKE2B 925f109feef396c71ac082313f0b102ee7152c13bf69800571fd2055460841f78cb6890d639b25fd5f587be85b2c13c48a32908b7254d07d6398c85ddc87b155 SHA512 922954f36ef7a513eb317d6512712bc4e2957994433cbd6a39e47a0ed98284720d9650565e4b15b44a3170b2cdde9f94eed48e304b458842e3265395a3385e1f
+MISC metadata.xml 944 BLAKE2B c2b50b5c9acb851aae770a9cadb5ec843e6bb00fb1dc388717c91c5fdb30f8e17771bc405e988ae3b53c2faff02f0dc795e7ecc858ba93710c396f7daa3d619c SHA512 796edd86345d05e5ee65f4e8472b226c60765ffa80f40fd1f2f744bf9bc5a8d4ae91f0f4a32c13d955f340745107b5fa10669340174accbebec54903026c9886
diff --git a/media-video/devedeng/devedeng-4.17.0-r1.ebuild b/media-video/devedeng/devedeng-4.17.0-r2.ebuild
index 36b0979743be..451ce0cb30ea 100644
--- a/media-video/devedeng/devedeng-4.17.0-r1.ebuild
+++ b/media-video/devedeng/devedeng-4.17.0-r2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
 
 inherit distutils-r1 xdg
 
@@ -32,7 +32,10 @@ DEPEND="${PYTHON_DEPS}"
 # src/unitests only works against system installed devedeng
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/${PN}-4.14.0-no_compress_man.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.14.0-no_compress_man.patch
+	"${FILESDIR}"/${P}-locale_install.patch
+)
 
 src_prepare() {
 	default
diff --git a/media-video/devedeng/devedeng-4.17.0.ebuild b/media-video/devedeng/devedeng-4.17.0.ebuild
deleted file mode 100644
index 765cb590e3ee..000000000000
--- a/media-video/devedeng/devedeng-4.17.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1 xdg
-
-DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
-HOMEPAGE="https://www.rastersoft.com/programas/devede.html"
-SRC_URI="https://gitlab.com/rastersoft/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-cdr/cdrtools
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3
-	|| ( media-video/vlc media-video/mpv media-video/mplayer )
-	media-video/ffmpeg
-	media-video/dvdauthor
-	media-video/vcdimager
-	|| ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn )"
-
-DEPEND="${PYTHON_DEPS}"
-
-# src/unitests only works against system installed devedeng
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.14.0-no_compress_man.patch )
-
-src_prepare() {
-	default
-
-	# Documentation path
-	sed -e "s#/usr/share/doc/devedeng#/usr/share/doc/${P}#" \
-		-i src/devedeng/configuration_data.py || die
-	sed -e "/'doc'/s/devedeng/${P}/" -i setup.py || die
-
-	# Desktop icon
-	sed -e "/^Icon/s/.svg$//#" -i data/devede_ng.py.desktop || die
-}
diff --git a/media-video/devedeng/files/devedeng-4.17.0-locale_install.patch b/media-video/devedeng/files/devedeng-4.17.0-locale_install.patch
new file mode 100644
index 000000000000..c8cfefad093b
--- /dev/null
+++ b/media-video/devedeng/files/devedeng-4.17.0-locale_install.patch
@@ -0,0 +1,15 @@
+diff -Naur devedeng-4.17.0.orig/setup.py devedeng-4.17.0/setup.py
+--- devedeng-4.17.0.orig/setup.py	2022-03-02 16:03:24.000000000 +0100
++++ devedeng-4.17.0/setup.py	2023-07-09 11:07:43.855950815 +0200
+@@ -33,10 +33,7 @@
+     for lang_name in [f for f in os.listdir('locale')]:
+         mofile = os.path.join('locale', lang_name,
+                               'LC_MESSAGES', 'devedeng.mo')
+-        # translations must be always in /usr/share because Gtk.builder only
+-        # search there. If someone knows how to fix this...
+-        # share/locale/fr/LC_MESSAGES/
+-        target = os.path.join('/usr', 'share', 'locale',
++        target = os.path.join('share', 'locale',
+                               lang_name, 'LC_MESSAGES')
+         data_files.append((target, [mofile]))
+ 
diff --git a/media-video/devedeng/metadata.xml b/media-video/devedeng/metadata.xml
index 6fd493ed47c4..45d3c80bfe20 100644
--- a/media-video/devedeng/metadata.xml
+++ b/media-video/devedeng/metadata.xml
@@ -11,6 +11,6 @@ DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD), suitables
 The suffix NG is because it is a rewrite from scratch of the old Devede, to work with Python3 and Gtk3, and with a new internal architecture that allows to expand it and easily add new features.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">rastersoft/devedeng</remote-id>
+		<remote-id type="gitlab">rastersoft/devedeng</remote-id>
 	</upstream>
 </pkgmetadata>