gentoo resync : 25.03.2022

3 files changed, 2 insertions, 77 deletions

diff --git a/media-video/dvdrip/Manifest b/media-video/dvdrip/Manifest
index 52416071cce5..4f9cc03fb584 100644
--- a/media-video/dvdrip/Manifest
+++ b/media-video/dvdrip/Manifest
@@ -1,6 +1,5 @@
 AUX dvdrip-0.98.11-fix_parallel_make.patch 880 BLAKE2B 3011cc4503bedfd056f6c587d65cf6bdd42d481f09f5c3644d8337ea11053fb6b91a0d88112385969c3592c8407294b8d1c661701e2b4f27ef4339e096125c80 SHA512 0fabe81659cb510357381d99ae8eea73a6a986e7c646dfd6b0fb7d38920a8b7cf9e79cb40a3606cb88a97f7ff9250d5e64aefb0fa599b9d9e6ae4ce91e692fb9
 AUX dvdrip-0.98.11-r5-fix_parallel_make.patch 888 BLAKE2B ca4882e1f0166a3fecfb8703f5f445d55a62dd84127cc0be0b6a51c85e8fa9d8b4a3bc1d9cd640f351a0aa1393fd6e2f537fa855162b2155333c282cb2f9b6f1 SHA512 db928fb2db6f5d7bffe909667650b444ed7c43291bb0970a298055072687847cf9e2e8c24395cde4f7d911bec668c6b846b44ab7af8dae180693b7b4233c84a2
 DIST dvdrip-0.98.11.tar.gz 2075302 BLAKE2B 875ea2d9ee679657b7bebce10ecf037a2467f7e61a8ae8f9417bbb93115368d439e1347b8e0f9c9aae88e8e6d0886ac7dc9b5650420618231550994cca0b65ff SHA512 8bb2e4cb72666ac3f7d1953e02ac868070503f00b05ea39b4961f54042088d07abd4ef020a9cefec11e96e965d84dd95d00288e7562d92551f480ccba88b9dce
-EBUILD dvdrip-0.98.11-r4.ebuild 1994 BLAKE2B fa6944e5480ffdade034941f2a5cc5c4192e296e73b7affd2857dff384b75d042fd7e97f6ce241e31d23bf679941d2c4a805a575bf55fa28d9f2dbec4c3ee104 SHA512 13e1948af8f392c12e5ca7abf8aa0a8e79ff45ceb52921e78cec58d2f92cffeaf454bf31605241275a703501962ae53c39341ada173af572afdd5dbd27329609
-EBUILD dvdrip-0.98.11-r5.ebuild 2061 BLAKE2B 1da14a7ad6a2572c42f84a885c21339daa06dc658824c52c916039007fa2dd6f437658d4fc22921f9972bd3142bcabc9b5afd6660ba8b7abf4f51f83b179652a SHA512 7b1dd11e462c016b10ff494d0e181c42c84d3c2ada608fed97d4cb17bb83b65350150f8c72478cd52f1be37f737fd1b910c0413721ae7e8c1fb116076c3889ac
+EBUILD dvdrip-0.98.11-r5.ebuild 2058 BLAKE2B b20a673a00184258b496c0003f6d2be0d82909dca0e113a42c9beff34492e248d8da52e4aad885ef831e882d5203a541aa5e2bfb0bbfae0c0da51e8328bc916c SHA512 59229cd20272a51b480ac84b98d0d11ce763000b3cf8e1563180117edfd9d7aebc2d03310837126e29fdc47f37fa5ee5f510f7c5b00763d3f2f13abcefec125c
 MISC metadata.xml 390 BLAKE2B 607a5aa0d8230544494b28dd72922939d279c924f8a9f164887ff948c788f612852907770e5f0cc4729458a13b564fbdc7ca490ea727996b8491621c78886828 SHA512 3147fd355b1c207a3edcc1ba098a4832e45d656789d4980ea219fdfd02ae36126a866b61ebd9c352c2c81449d03e1dc829231bf5a7ea5f58c91fea92cf9270a8
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
deleted file mode 100644
index 31a52bda60c5..000000000000
--- a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch flag-o-matic perl-module
-
-DESCRIPTION="dvd::rip is a graphical frontend for transcode"
-HOMEPAGE="https://www.exit1.org/dvdrip/"
-SRC_URI="https://www.exit1.org/dvdrip/dist/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid"
-
-DEPEND=">=dev-perl/Event-ExecFlow-0.64
-	>=dev-perl/Event-RPC-0.89
-	dev-perl/Gtk2
-	>=dev-perl/gtk2-ex-formfactory-0.65
-	>=dev-perl/libintl-perl-1.16
-	>=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis]
-	virtual/imagemagick-tools
-	>=virtual/perl-podlators-2.5.3
-"
-RDEPEND="${DEPEND}
-	x11-libs/gdk-pixbuf:2[jpeg]
-	x11-libs/gtk+:2
-	ffmpeg? ( media-video/ffmpeg:0 )
-	fping? ( >=net-analyzer/fping-2.2 )
-	mplayer? ( media-video/mplayer )
-	ogg? ( media-sound/ogmtools )
-	subtitles? ( media-video/subtitleripper )
-	vcd? (
-		media-video/transcode[mjpeg]
-		>=media-video/mjpegtools-1.6.0
-	)
-	vorbis? ( media-sound/vorbis-tools )
-	xine? ( media-video/xine-ui )
-	xvid? ( media-video/xvid4conf )
-	>=media-video/lsdvd-0.15
-"
-
-pkg_setup() {
-	filter-flags -ftracer
-	export SKIP_UNPACK_REQUIRED_MODULES=1 #255269
-
-	perl_set_version
-}
-
-src_prepare() {
-	sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die #333739
-	epatch "${FILESDIR}"/${P}-fix_parallel_make.patch
-	# Fix default device for >=udev-180 wrt #224559
-	sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die
-}
-
-src_install() {
-	newicon lib/Video/DVDRip/icon.xpm dvdrip.xpm
-	make_desktop_entry dvdrip dvd::rip
-
-	mydoc="Changes* Credits README TODO" perl-module_src_install
-}
-
-pkg_postinst() {
-	# bug 173924
-	if use fping; then
-		ewarn "For dvdrip-master to work correctly with cluster mode,"
-		ewarn "the fping binary must be setuid."
-		ewarn ""
-		ewarn "Run this command to fix it:"
-		ewarn "chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-		ewarn ""
-		ewarn "Note that this is a security risk when enabled."
-	fi
-}
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r5.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r5.ebuild
index cf6e6e1f3569..7065ceb972ad 100644
--- a/media-video/dvdrip/dvdrip-0.98.11-r5.ebuild
+++ b/media-video/dvdrip/dvdrip-0.98.11-r5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.exit1.org/dvdrip/"
 SRC_URI="https://www.exit1.org/dvdrip/dist/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid"
 
 DEPEND=">=dev-perl/Event-ExecFlow-0.64