gentoo resync : 25.11.2020

3 files changed, 2 insertions, 44 deletions

diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index 87b1a1e33837..7ba28fe527df 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -1,5 +1,4 @@
 AUX devedeng-4.14.0-no_compress_man.patch 878 BLAKE2B f3460e0b28e1a1a80c3f9c1c41e26e608f203e4f9fa59ed93ff837e430ad14231b7375efaf14886fba16ac4f1a1f7247f03a43775441579c364ab91e6b830515 SHA512 d669cd0f55215e90f622acb1ec1895e25b29850ecb1ec5ebe2c5cbf9283f63f8448d064a5938cef250c748feeee0c0da25cdd5370f85d9a61b89532b2e5915cb
 DIST devedeng-4.16.0.tar.bz2 1763318 BLAKE2B ab3e5b3a94ed8f1dfe0482218786a8ab131c16259635c1297c7fb01a0eb7f7106d53ff24665e056f18796d87cf0430d375278e1c074026b134be9308aa8a3f3f SHA512 032c276eeecc3d85b53bf72ee2a3132aac41c2496cabfd1e30cbee7316f1ce3136c8b476bf03bb88930a532a06f6fad7a098d91f0b9a85e4ecabf9f728783f8a
-EBUILD devedeng-4.16.0-r1.ebuild 1125 BLAKE2B a06d89364e532a6987ca081b79d0b2075a702e731fb811773a3183e82573a59b023a41f44c80b62da909d39f866b0983b3316e27241d339bc7c76cdcf9fc19af SHA512 73f4022a734e0933300519bc10c770aa5c541577a5a87b10d23b255efedd8db84a2a9dfe997167de5310ee148bd879f3e8b35523088b0b6062c364ee52140966
-EBUILD devedeng-4.16.0.ebuild 1121 BLAKE2B 5d961fb2a7dfbdee2e6e20e133f79259412bb1a988c54d95172abbccbf3d9fe4dc041d95ad9cfd27ab4487c0b6968abb88e6ec2d7a058800ffff918f8abc139d SHA512 e338aa2952ce0c481e0e9e04822a10be592f8855860322e7031a1bd90b3c40a91f6e13e42d46f86f7922019e9bdf596728cf5611be580343a10d5caea50c4d14
+EBUILD devedeng-4.16.0-r1.ebuild 1153 BLAKE2B 4b9e797c72982028e95c64bb7ff8267b47f4da2c578758899227abca3e191d92a6f036e847e542f1554f152ea73d3b48f58e6c54a7087467f471263da362d77d SHA512 f7df38a6ee4d178fc50d8838dc395960f0f0b18f236bc86a999767f285223aa669b1c481e9fd28e57456ac6a5cbdda9b76e72fccebc262d96edccfde681ee1b0
 MISC metadata.xml 943 BLAKE2B e1e02dde0b9b21f3d398d1b38cb302842b6f5748405709ba2066dc5497c699f3d7daae40c4daf00eec37a739b5f3ab9d54a78c7e2d700f677abfaeceae75ed09 SHA512 9c5cf515b958e7125d383fc9513546f9a663ea45e4c60308fb20e85eb6eedf22c71a94561721ebffd156ee5b61d5ac309c66c9a7782d905b98a95c2ad8b7b545
diff --git a/media-video/devedeng/devedeng-4.16.0-r1.ebuild b/media-video/devedeng/devedeng-4.16.0-r1.ebuild
index a2069a356968..ebc7d38d6cb4 100644
--- a/media-video/devedeng/devedeng-4.16.0-r1.ebuild
+++ b/media-video/devedeng/devedeng-4.16.0-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 xdg
diff --git a/media-video/devedeng/devedeng-4.16.0.ebuild b/media-video/devedeng/devedeng-4.16.0.ebuild
deleted file mode 100644
index 03b4b6840a40..000000000000
--- a/media-video/devedeng/devedeng-4.16.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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="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
-	virtual/cdrtools
-	|| ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn )"
-
-DEPEND="${PYTHON_DEPS}"
-
-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
-}