public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-video/devedeng/, media-video/devedeng/files/
@ 2023-07-09  9:20 Bernard Cafarelli
  0 siblings, 0 replies; 2+ messages in thread
From: Bernard Cafarelli @ 2023-07-09  9:20 UTC (permalink / raw
  To: gentoo-commits

commit:     bc2e5af414308c736b501beed7ed1e6bfb187a41
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  9 09:17:55 2023 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Jul  9 09:20:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc2e5af4

media-video/devedeng: switch to PEP517

Fix setup.py to use setuptools mode (locale install)

Closes: https://bugs.gentoo.org/909995
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 ...-4.17.0-r1.ebuild => devedeng-4.17.0-r2.ebuild} |  9 +++--
 media-video/devedeng/devedeng-4.17.0.ebuild        | 47 ----------------------
 .../files/devedeng-4.17.0-locale_install.patch     | 15 +++++++
 3 files changed, 21 insertions(+), 50 deletions(-)

diff --git a/media-video/devedeng/devedeng-4.17.0-r1.ebuild b/media-video/devedeng/devedeng-4.17.0-r2.ebuild
similarity index 86%
rename from media-video/devedeng/devedeng-4.17.0-r1.ebuild
rename to 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]))
+ 


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/devedeng/, media-video/devedeng/files/
@ 2025-01-21 15:10 Bernard Cafarelli
  0 siblings, 0 replies; 2+ messages in thread
From: Bernard Cafarelli @ 2025-01-21 15:10 UTC (permalink / raw
  To: gentoo-commits

commit:     d9a0a5c684f6ef3b6c224781e51f80f97decc701
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 15:03:27 2025 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 15:05:57 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9a0a5c6

media-video/devedeng: drop 4.17.0-r2, 4.18.0

Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 media-video/devedeng/Manifest                      |  2 -
 media-video/devedeng/devedeng-4.17.0-r2.ebuild     | 50 ----------------------
 media-video/devedeng/devedeng-4.18.0.ebuild        | 50 ----------------------
 .../files/devedeng-4.14.0-no_compress_man.patch    | 25 -----------
 .../files/devedeng-4.17.0-locale_install.patch     | 15 -------
 5 files changed, 142 deletions(-)

diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index 061f0d2691d8..44ca56e217e8 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -1,3 +1 @@
-DIST devedeng-4.17.0.tar.bz2 1773455 BLAKE2B 46d91145f94122bb3a9e83368f50dde6f1b25cecf5101c7d79bbc237bad69cb3d80d3b78429be76af2e4652eeb09e99e12c6c014c6bac8e71a7dd01d689ba634 SHA512 942e9a969146ae87bf1f1a5fa7441459801258f7dcac5a2f2ac8def146c6d88d8d3db27c474b7741cdc980c0757f99e6ee03b0da524f71895ebdbe2fe442a179
-DIST devedeng-4.18.0.tar.bz2 1775035 BLAKE2B f8588af82183ad5824a2d9abfa575b8facc592046845e98a4b9beb6dc73db7ba575b176e2edaf2f7e6d1e95a591932e20fa320efda2a44bbe23cf9c9df072b05 SHA512 0e4b816accf55c896d76c96bffb8ca2f2041310a019ef15b5bd3b0b4099edfae384854c670e564534e8eb1d569706e28810dc226ade6595aeea1e1a17e67391a
 DIST devedeng-4.19.0.tar.bz2 1772188 BLAKE2B 8a84f09c7d0dc24da31bfb0948ecd3f70d1357393276c70ee6e7951f93a8025d7f6d389e81415d43bceed8bb2f148f29ff673d27c4321ece9eb1bcdbccdb29ce SHA512 77204553ceec014b43872c9be4f2c915557c2a2f4be1533062a0ff376f7c199da911f0eb664c40a2262b4f2dcc2e6c8fb4e6d9c4e4813e63836cd20fb0375347

diff --git a/media-video/devedeng/devedeng-4.17.0-r2.ebuild b/media-video/devedeng/devedeng-4.17.0-r2.ebuild
deleted file mode 100644
index 451ce0cb30ea..000000000000
--- a/media-video/devedeng/devedeng-4.17.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..12} )
-
-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
-	"${FILESDIR}"/${P}-locale_install.patch
-)
-
-src_prepare() {
-	default
-
-	# Documentation path
-	sed -e "s#/usr/share/doc/devedeng#/usr/share/doc/${PF}#" \
-		-i src/devedeng/configuration_data.py || die
-	sed -e "/'doc'/s/devedeng/${PF}/" -i setup.py || die
-
-	# Desktop icon
-	sed -e "/^Icon/s/.svg$//#" -i data/devede_ng.py.desktop || die
-}

diff --git a/media-video/devedeng/devedeng-4.18.0.ebuild b/media-video/devedeng/devedeng-4.18.0.ebuild
deleted file mode 100644
index 3537b0871278..000000000000
--- a/media-video/devedeng/devedeng-4.18.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..12} )
-
-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
-	"${FILESDIR}"/${PN}-4.17.0-locale_install.patch
-)
-
-src_prepare() {
-	default
-
-	# Documentation path
-	sed -e "s#/usr/share/doc/devedeng#/usr/share/doc/${PF}#" \
-		-i src/devedeng/configuration_data.py || die
-	sed -e "/'doc'/s/devedeng/${PF}/" -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.14.0-no_compress_man.patch b/media-video/devedeng/files/devedeng-4.14.0-no_compress_man.patch
deleted file mode 100644
index f9d1bfbcbbd4..000000000000
--- a/media-video/devedeng/files/devedeng-4.14.0-no_compress_man.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur devedeng-4.14.0.orig/setup.py devedeng-4.14.0/setup.py
---- devedeng-4.14.0.orig/setup.py	2019-02-04 23:15:33.000000000 +0100
-+++ devedeng-4.14.0/setup.py	2019-04-15 19:44:50.048675427 +0200
-@@ -26,7 +26,7 @@
-         (os.path.join('share', 'devedeng', 'backgrounds'),
-          glob('data/pixmaps/backgrounds/*')),
-         (os.path.join('share', 'doc', 'devedeng', 'html'), glob('doc/*')),
--        (os.path.join('share', 'man', 'man1'), ['data/devede.1.gz'])
-+        (os.path.join('share', 'man', 'man1'), ['data/devede.1'])
-     ]
- 
-     for lang_name in [f for f in os.listdir('locale')]:
-@@ -73,12 +73,6 @@
- except:
-     print("Failed to generate the translations")
- 
--try:
--    if os.path.isfile('data/devede.1'):
--        os.system("gzip -c data/devede.1 > data/devede.1.gz")
--except:
--    pass
--
- #here = os.path.abspath(os.path.dirname(__file__))
- 
- setup(

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
deleted file mode 100644
index c8cfefad093b..000000000000
--- a/media-video/devedeng/files/devedeng-4.17.0-locale_install.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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]))
- 


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2025-01-21 15:10 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-09  9:20 [gentoo-commits] repo/gentoo:master commit in: media-video/devedeng/, media-video/devedeng/files/ Bernard Cafarelli
  -- strict thread matches above, loose matches on Subject: below --
2025-01-21 15:10 Bernard Cafarelli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox