remove 0.97.2 because it's old, and 0.97.5 because it breaks cluster mode, adding 0.97.6 to replace the other two

Package-Manager: portage-2.0.53_rc7

8 files changed, 40 insertions, 88 deletions

diff --git a/media-video/dvdrip/ChangeLog b/media-video/dvdrip/ChangeLog
index a154d2db8513..167b4d7e1eb0 100644
--- a/media-video/dvdrip/ChangeLog
+++ b/media-video/dvdrip/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/dvdrip
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/ChangeLog,v 1.55 2006/01/12 23:30:23 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/ChangeLog,v 1.56 2006/01/30 00:33:17 morfic Exp $
+
+*dvdrip-0.97.6 (30 Jan 2006)
+
+  30 Jan 2006; Daniel Goller <morfic@gentoo.org>
+  +files/dvdrip-0.97.6-fix_nptl_workaround.patch, -dvdrip-0.97.2.ebuild,
+  -dvdrip-0.97.5.ebuild, +dvdrip-0.97.6.ebuild:
+  remove 0.97.2 because it's old, and 0.97.5 because it breaks cluster mode,
+  adding 0.97.6 to replace the other two
 
   12 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   dvdrip-0.52.3.ebuild, dvdrip-0.52.3-r1.ebuild, dvdrip-0.52.5.ebuild,
diff --git a/media-video/dvdrip/Manifest b/media-video/dvdrip/Manifest
index a4cd7d9ff18d..d602de780861 100644
--- a/media-video/dvdrip/Manifest
+++ b/media-video/dvdrip/Manifest
@@ -1,15 +1,24 @@
-MD5 1eefba4b84ee5bd4f5c53be08fdf160d ChangeLog 9364
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 53e731e3b80d13c959d049fe13cb76bc ChangeLog 9681
 MD5 de19b8a4324067dd89f2ffc368d9565b dvdrip-0.52.0.ebuild 1517
 MD5 647ef96c893914f3743c3b9af4794ea4 dvdrip-0.52.3-r1.ebuild 1900
 MD5 2db87743e35571499417fdbe37620092 dvdrip-0.52.3.ebuild 1817
 MD5 e264303157dc6337ffd89ab2350f0846 dvdrip-0.52.5.ebuild 2149
-MD5 7d8c54b11a37e6783f8275b3f0a5b42a dvdrip-0.97.2.ebuild 2145
-MD5 dbb9ec28841bb2af453c830cf599bdbb dvdrip-0.97.5.ebuild 2019
+MD5 e2a13d7db02d91f27a367e23337590b3 dvdrip-0.97.6.ebuild 2210
 MD5 748c8776c847405991432e3a345432fd files/digest-dvdrip-0.52.0 71
 MD5 2754107db18d3dea07e9d0a57e8bab32 files/digest-dvdrip-0.52.3 71
 MD5 2754107db18d3dea07e9d0a57e8bab32 files/digest-dvdrip-0.52.3-r1 71
 MD5 14587c2ff6ca6a5d6b84323f64de11d0 files/digest-dvdrip-0.52.5 71
-MD5 bdb952ef59732d9d67760a5d7b49f40b files/digest-dvdrip-0.97.2 71
-MD5 30514612efaf92047f0cc279816529ac files/digest-dvdrip-0.97.5 71
+MD5 766f489d01572bf50a6a31a0c1b49bcc files/digest-dvdrip-0.97.6 71
 MD5 889de67168579e889b441c8b6892b429 files/dvdrip-0.97.5-fix_nptl_workaround.patch 293
+MD5 889de67168579e889b441c8b6892b429 files/dvdrip-0.97.6-fix_nptl_workaround.patch 293
 MD5 6f041773f1239601a17e6201405f82ac metadata.xml 218
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD3WIE/aM9DdBw91cRAs3bAKDCvKfOMkeogy2O95SXn9M7rz9begCfXiAy
+A+fN1/plSvEHhk7RaCzQRfI=
+=eA++
+-----END PGP SIGNATURE-----
diff --git a/media-video/dvdrip/dvdrip-0.97.2.ebuild b/media-video/dvdrip/dvdrip-0.97.2.ebuild
deleted file mode 100644
index 26438099e33c..000000000000
--- a/media-video/dvdrip/dvdrip-0.97.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.97.2.ebuild,v 1.2 2006/01/12 23:30:23 compnerd Exp $
-
-
-
-inherit perl-module eutils
-
-MY_P=${P/dvdr/Video-DVDR}
-MY_URL="dist/pre"
-
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Dvd::rip is a graphical frontend for transcode"
-HOMEPAGE="http://www.exit1.org/dvdrip/"
-SRC_URI="http://www.exit1.org/${PN}/${MY_URL}/${MY_P}.tar.gz"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-# ~ppc needs subtitleripper
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="cdr gnome xvid rar mplayer ogg fping subtitles"
-
-DEPEND="gnome? ( gnome-extra/gtkhtml )
-	cdr? ( >=media-video/vcdimager-0.7.19
-		>=app-cdr/cdrdao-1.1.7
-		virtual/cdrtools
-		>=media-video/mjpegtools-1.6.0 )
-	xvid? ( media-video/xvid4conf )
-	rar? ( app-arch/rar )
-	mplayer? ( media-video/mplayer )
-	>=media-video/transcode-0.6.14
-	>=media-gfx/imagemagick-5.5.3
-	dev-perl/gtk2-perl
-	>=dev-perl/gtk2-ex-formfactory-0.57
-	>=dev-perl/Event-RPC-0.84
-	perl-core/Storable
-	dev-perl/Event"
-RDEPEND="${DEPEND}
-	fping? ( >=net-analyzer/fping-2.3 )
-	ogg? ( >=media-sound/ogmtools-1.000 )
-	subtitles? ( media-video/subtitleripper )
-	virtual/eject
-	dev-perl/libintl-perl"
-
-pkg_setup() {
-	built_with_use media-video/transcode dvdread \
-		|| die	"transcode needs dvdread support builtin." \
-				"Please re-emerge transcode with the dvdread USE flag."
-
-	built_with_use sys-libs/glibc nptlonly \
-		&& die	"dvd::rip will not function without the" \
-				"linuxthreads fallback in glibc. This is" \
-				"being worked on upstream."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e 's:cc :$(CC) :' src/Makefile || die "sed failed"
-}
-
-src_install() {
-	newicon lib/Video/DVDRip/icon.xpm dvdrip.xpm
-	make_desktop_entry dvdrip dvd::rip dvdrip.xpm Video
-
-	perl-module_src_install
-}
-
-pkg_postinst() {
-	einfo "If you want to use the cluster-mode, you need to SUID fping"
-	einfo "chmod u+s /usr/sbin/fping"
-	einfo
-	einfo "for Perl 5.8.x you have to set PERLIO to read TOC properly"
-	einfo "for bash: export PERLIO=stdio"
-	einfo "for csh:  setenv PERLIO stdio"
-	einfo "into your /.${shell}rc"
-}
-
diff --git a/media-video/dvdrip/dvdrip-0.97.5.ebuild b/media-video/dvdrip/dvdrip-0.97.6.ebuild
index d08ca8406a73..4379ba6e3b8a 100644
--- a/media-video/dvdrip/dvdrip-0.97.5.ebuild
+++ b/media-video/dvdrip/dvdrip-0.97.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.97.5.ebuild,v 1.2 2006/01/12 23:30:23 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.97.6.ebuild,v 1.1 2006/01/30 00:33:17 morfic Exp $
 
 
 inherit perl-module eutils
@@ -30,7 +30,7 @@ DEPEND="gnome? ( gnome-extra/gtkhtml )
 	>=media-video/transcode-0.6.14
 	>=media-gfx/imagemagick-5.5.3
 	dev-perl/gtk2-perl
-	>=dev-perl/gtk2-ex-formfactory-0.58
+	>=dev-perl/gtk2-ex-formfactory-0.59
 	>=dev-perl/Event-RPC-0.84
 	perl-core/Storable
 	dev-perl/Event"
@@ -45,6 +45,9 @@ pkg_setup() {
 	built_with_use media-video/transcode dvdread \
 		|| die	"transcode needs dvdread support builtin." \
 				"Please re-emerge transcode with the dvdread USE flag."
+	built_with_use >=media-video/transcode-1.0.2-r1 extrafilters \
+		&& die  "Please remerge transcode with -extrafilters in USE=, " \
+				"you have filters installed not compatible with dvdrip."
 }
 
 src_unpack() {
diff --git a/media-video/dvdrip/files/digest-dvdrip-0.97.2 b/media-video/dvdrip/files/digest-dvdrip-0.97.2
deleted file mode 100644
index 79bcdb71e0b2..000000000000
--- a/media-video/dvdrip/files/digest-dvdrip-0.97.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b49e727f36646f41d43a73aa602e834b Video-DVDRip-0.97.2.tar.gz 528423
diff --git a/media-video/dvdrip/files/digest-dvdrip-0.97.5 b/media-video/dvdrip/files/digest-dvdrip-0.97.5
deleted file mode 100644
index ebf8f43515b9..000000000000
--- a/media-video/dvdrip/files/digest-dvdrip-0.97.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dbf5cecb719cdd1736f3ed449e2a3fa0 Video-DVDRip-0.97.5.tar.gz 545238
diff --git a/media-video/dvdrip/files/digest-dvdrip-0.97.6 b/media-video/dvdrip/files/digest-dvdrip-0.97.6
new file mode 100644
index 000000000000..19ee661bb456
--- /dev/null
+++ b/media-video/dvdrip/files/digest-dvdrip-0.97.6
@@ -0,0 +1 @@
+MD5 46be5f514cb072d0746acac82d8dd05b Video-DVDRip-0.97.6.tar.gz 545472
diff --git a/media-video/dvdrip/files/dvdrip-0.97.6-fix_nptl_workaround.patch b/media-video/dvdrip/files/dvdrip-0.97.6-fix_nptl_workaround.patch
new file mode 100644
index 000000000000..906d589c630f
--- /dev/null
+++ b/media-video/dvdrip/files/dvdrip-0.97.6-fix_nptl_workaround.patch
@@ -0,0 +1,11 @@
+--- lib/Video/DVDRip/Config.pm~	2005-08-08 18:30:56.000000000 +0200
++++ lib/Video/DVDRip/Config.pm	2005-08-08 18:31:02.000000000 +0200
+@@ -306,7 +306,7 @@
+ 	workaround_nptl_bugs => {
+ 		label	=> __"Workaround transcode NPTL bugs",
+ 		type	=> 'switch',
+-		value	=> 1,
++		value	=> 0,
+ 	},
+ );
+