media-video/dvdrip: Revump. Fix respect to jobserver wrt bug 266739. Fix respect to toolchain.

Package-Manager: portage-2.2.0_alpha34/cvs/Linux x86_64

4 files changed, 129 insertions, 2 deletions

diff --git a/media-video/dvdrip/ChangeLog b/media-video/dvdrip/ChangeLog
index 330b04c35ec2..f7dd54cc8d37 100644
--- a/media-video/dvdrip/ChangeLog
+++ b/media-video/dvdrip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/dvdrip
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/ChangeLog,v 1.134 2011/02/17 16:44:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/ChangeLog,v 1.135 2011/05/19 17:12:00 c1pher Exp $
+
+*dvdrip-0.98.11-r1 (19 May 2011)
+
+  19 May 2011; Dane Smith <c1pher@gentoo.org> +dvdrip-0.98.11-r1.ebuild,
+  +files/parallelmakefix.diff:
+  Non-maintainer commit: Revbump. Add new patch to address parallel make issues
+  wrt bug 266738. Also address issues with respect to the toolchain.
 
   17 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> dvdrip-0.98.11.ebuild:
   Fix USE="jpeg" depend for x11-libs/gdk-pixbuf:2 split wrt #354279.
diff --git a/media-video/dvdrip/Manifest b/media-video/dvdrip/Manifest
index ff8fd8e08740..1c0787d75100 100644
--- a/media-video/dvdrip/Manifest
+++ b/media-video/dvdrip/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX parallelmakefix.diff 997 RMD160 cea887083c129930e64ef457bc99d436860140e1 SHA1 67e0763570117e824af2aca79da20405b959a66a SHA256 a0a58570f5a755c05b39876c2d31baa4a2fb457169e102f8615463887214251e
 DIST dvdrip-0.98.11.tar.gz 2075302 RMD160 008afcecd1eaf6842e907d325b079cc60f4a6b1e SHA1 b91d65e7307b5fecd1509ace03c02564ac9591c0 SHA256 586c20968b2daa55c0afaaf334d5b9b8b6896d6ea45078a577e165806858c3a5
+EBUILD dvdrip-0.98.11-r1.ebuild 2156 RMD160 8a5144307416b85d0acb4bf70b461ce20d8e7986 SHA1 503c2890991619786c60ed9da45f1326cdf53296 SHA256 9c62eb3abac5be197b9f0734594ad9cd3e85baf5e8b1576f751886a48762759f
 EBUILD dvdrip-0.98.11.ebuild 2137 RMD160 c64247600108b81b71a9fbdd98723cfe5d523c27 SHA1 59eb48ee256b85db6f0741478a700389a75cfb01 SHA256 b4bc3825f50b5aaf9fc108e5adc761329eda70f034df79583e822dc2d69146db
-MISC ChangeLog 21432 RMD160 6e2b1526bf9ae91180581170c7b54ad83a08c8c8 SHA1 c9af9c4aae9cc9c4b0ee799abb926ad190cc5d4e SHA256 90a39cd4d14aba512d579f4bb36028b0c5019ac81aee2a3933e6a4cec6b66ecd
+MISC ChangeLog 21717 RMD160 3209564815613b0213a3141631134af5e95b15aa SHA1 b79f0dee168dda0fcbaf45586abf295ce737b2c7 SHA256 034730334917f6576b11ab7a52172a5381f1695b4c21d6a0f91e17a88d38d33f
 MISC metadata.xml 322 RMD160 9392e9ac94f39c22cad7a11e03f12393b67268ae SHA1 3963e60794cbc87f6f47ec4c3cce8f81d14210c0 SHA256 6562d809cb4dd01f2e30997df4f42ade13abac1071aeac87c7299144561efc65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJN1U5iAAoJEEsurZwMLhUxx0AQALzR+DVZnkeEglYiqkGSDHfC
+NatzaFEjIu9OFsbFQPGK0PscvA7ZU/UDXmOtZI0/ejZLBA9N/HVa26eZQNGKucFD
+Gipra8f/8Ar1rSZU7tRbqEXkF8ZSyX6xbijG8Ps4shUXbon2DoKehyAtUY0DtoH9
+Q3bSOImYxjkdXSAHn2+CgpYaQRxf85MKr3jsCxg54nmZdh0zZU34QlB4PmoDvqKM
+pJz5BS2wF/ziWKdSDczq3MsCLabmVq5c3ASRsM+dCJVNRjUyCanpsu5fBMnQIYJZ
+N3OqN1nAL2oKYwmB0FFmypT6IgBsyc7kQiy2A5obC8/KzRXGysqfLBcjje/tAAnq
+X1xHTQMXGKuOPznWvE5Db/SyDpspnSyptp7d4sI7gfK9mFtuPnDmryAhKaUPb11n
+i63/o0LvCKca+n1LWpqgkXqmhjMRTprhK913Q5KUTaOAGRfD4wPy1VYFWfxTSEKs
+RSN/rlhlciSS2w/tUZ3aVNRmVvYZhpNfgEJRYINIBOsTyETOr6QCIXJ9Zb6T3WZL
+PjUkK1dGQCgKCUZL7UipwJUkXnegh2MlNGTyQOwjym4pbXowxuMN/FSUnytDZlvM
+/NE+f78YmDhJWped16bQOGKZpWfRxB+sijGfYSNdqtvrm8u4BSoKmMRXwF86RCHX
+0vWzIPqgr3er3Oln+v6O
+=59c4
+-----END PGP SIGNATURE-----
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r1.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r1.ebuild
new file mode 100644
index 000000000000..bcf881a8899c
--- /dev/null
+++ b/media-video/dvdrip/dvdrip-0.98.11-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.98.11-r1.ebuild,v 1.1 2011/05/19 17:12:00 c1pher Exp $
+
+EAPI=2
+inherit eutils flag-o-matic perl-module
+
+DESCRIPTION="dvd::rip is a graphical frontend for transcode"
+HOMEPAGE="http://www.exit1.org/dvdrip/"
+SRC_URI="http://www.exit1.org/dvdrip/dist/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~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-perl
+	>=dev-perl/gtk2-ex-formfactory-0.65
+	>=dev-perl/libintl-perl-1.16
+	|| ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick )
+	|| ( <media-video/transcode-1.1.0_pre0[dvd,jpeg,mp3,mpeg,ogg,vorbis]
+		>=media-video/transcode-1.1.0_pre0[dvd,jpeg,mp3,ogg,vorbis] )"
+RDEPEND="${DEPEND}
+	|| ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] )
+	ffmpeg? ( media-video/ffmpeg )
+	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-module_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die
+	epatch "${FILESDIR}/parallelmakefix.diff"
+}
+
+src_install() {
+	newicon lib/Video/DVDRip/icon.xpm dvdrip.xpm
+	make_desktop_entry dvdrip dvd::rip dvdrip AudioVideo
+	DOCS="Changes Changes.0.46 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/files/parallelmakefix.diff b/media-video/dvdrip/files/parallelmakefix.diff
new file mode 100644
index 000000000000..c44874a47585
--- /dev/null
+++ b/media-video/dvdrip/files/parallelmakefix.diff
@@ -0,0 +1,26 @@
+--- src/Makefile	2011-05-12 08:47:37.601613368 -0400
++++ Makefile.new	2011-05-12 08:52:59.412613500 -0400
+@@ -3,10 +3,10 @@
+ all:	../bin/dvdrip-splitpipe ../bin/dvdrip-progress
+ 
+ ../bin/dvdrip-splitpipe:	dvdrip-splitpipe.c
+-	$(CC) $(OTHERLDFLAGS) $(CFLAGS) -o dvdrip-splitpipe dvdrip-splitpipe.c && mv dvdrip-splitpipe ../bin
++	$(CC) $(OTHERLDFLAGS) $(CFLAGS) -o ../bin/dvdrip-splitpipe dvdrip-splitpipe.c
+ 
+ ../bin/dvdrip-progress:	dvdrip-progress.c
+-	$(CC) $(OTHERLDFLAGS) $(CFLAGS) -o dvdrip-progress dvdrip-progress.c && mv dvdrip-progress ../bin
++	$(CC) $(OTHERLDFLAGS) $(CFLAGS) -o ../bin/dvdrip-progress dvdrip-progress.c
+ 
+ clean:
+ 	rm -f dvdrip-splitpipe ../bin/dvdrip-splitpipe dvdrip-progress ../bin/dvdrip-progress
+--- Makefile.PL	2009-12-19 08:42:17.000000000 -0500
++++ Makefile.PL.new	2011-05-17 15:57:46.447000011 -0400
+@@ -52,7 +52,7 @@
+ sub MY::postamble {
+     '
+ bin/dvdrip-splitpipe bin/dvdrip-progress: src/Makefile
+-	cd src && make
++	cd src && ( $(MAKE) CC=$(CC) )
+ ';
+ }
+