EAPI=4, rename patch, bug # numbers and more

(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

4 files changed, 24 insertions, 18 deletions

diff --git a/media-video/dvdrip/ChangeLog b/media-video/dvdrip/ChangeLog
index 1d4a6fdac56d..8c2b76e5aff1 100644
--- a/media-video/dvdrip/ChangeLog
+++ b/media-video/dvdrip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/dvdrip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/ChangeLog,v 1.140 2012/02/24 23:32:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/ChangeLog,v 1.141 2012/02/24 23:47:17 ssuominen Exp $
+
+  24 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> dvdrip-0.98.11-r1.ebuild,
+  +files/dvdrip-0.98.11-fix_parallel_make.patch, -files/parallelmakefix.diff:
+  EAPI=4, rename patch, bug # numbers and more
 
   24 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> -dvdrip-0.98.11.ebuild:
   old
@@ -24,7 +28,7 @@
   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.
+  wrt bug 266739. 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/dvdrip-0.98.11-r1.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r1.ebuild
index e9964175fb3a..fcc803a8c2fe 100644
--- a/media-video/dvdrip/dvdrip-0.98.11-r1.ebuild
+++ b/media-video/dvdrip/dvdrip-0.98.11-r1.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2012 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.5 2012/02/24 23:31:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.98.11-r1.ebuild,v 1.6 2012/02/24 23:47:17 ssuominen Exp $
 
-EAPI=2
+EAPI=4
 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 x86"
 IUSE="ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid"
@@ -20,8 +19,7 @@ DEPEND=">=dev-perl/Event-ExecFlow-0.64
 	>=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] )"
+	>=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis]"
 RDEPEND="${DEPEND}
 	x11-libs/gdk-pixbuf:2[jpeg]
 	x11-libs/gtk+:2
@@ -47,16 +45,15 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die
-	epatch "${FILESDIR}"/parallelmakefix.diff
+	sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die #333739
+	epatch "${FILESDIR}"/${P}-fix_parallel_make.patch
 }
 
 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"
+	make_desktop_entry dvdrip dvd::rip
 
-	perl-module_src_install
+	mydoc="Changes* Credits README TODO" perl-module_src_install
 }
 
 pkg_postinst() {
diff --git a/media-video/dvdrip/files/parallelmakefix.diff b/media-video/dvdrip/files/dvdrip-0.98.11-fix_parallel_make.patch
index c44874a47585..df766c07cbcc 100644
--- a/media-video/dvdrip/files/parallelmakefix.diff
+++ b/media-video/dvdrip/files/dvdrip-0.98.11-fix_parallel_make.patch
@@ -1,5 +1,7 @@
---- src/Makefile	2011-05-12 08:47:37.601613368 -0400
-+++ Makefile.new	2011-05-12 08:52:59.412613500 -0400
+http://bugs.gentoo.org/266739
+
+--- src/Makefile
++++ src/Makefile
 @@ -3,10 +3,10 @@
  all:	../bin/dvdrip-splitpipe ../bin/dvdrip-progress
  
@@ -13,8 +15,8 @@
  
  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
+--- Makefile.PL
++++ Makefile.PL
 @@ -52,7 +52,7 @@
  sub MY::postamble {
      '
diff --git a/media-video/dvdrip/metadata.xml b/media-video/dvdrip/metadata.xml
index 7b688ce54e69..56992d03b50b 100644
--- a/media-video/dvdrip/metadata.xml
+++ b/media-video/dvdrip/metadata.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+  </maintainer>
   <use>
-    <flag name="fping">Enables fping support for cluster rendering</flag>
-    <flag name="subtitles">Enables support for subtitle ripping</flag>
+    <flag name='fping'>Enables fping support for cluster rendering</flag>
+    <flag name='subtitles'>Enables support for subtitle ripping</flag>
   </use>
 </pkgmetadata>