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])) +
