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

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

5 files changed, 35 insertions, 29 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/Manifest b/media-video/dvdrip/Manifest
index 0dd289a0802e..516f649a354c 100644
--- a/media-video/dvdrip/Manifest
+++ b/media-video/dvdrip/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX parallelmakefix.diff 997 RMD160 cea887083c129930e64ef457bc99d436860140e1 SHA1 67e0763570117e824af2aca79da20405b959a66a SHA256 a0a58570f5a755c05b39876c2d31baa4a2fb457169e102f8615463887214251e
+AUX dvdrip-0.98.11-fix_parallel_make.patch 880 RMD160 1b31987b2f3a449f753494d95d8aa500f3f79200 SHA1 3dbbc9d97505376f537baf7d4beaeeb2f065c316 SHA256 c5a6418038f97c9a04ac165d7305e42fcedf28d1564024fe4ad913e78cccc83b
 DIST dvdrip-0.98.11.tar.gz 2075302 RMD160 008afcecd1eaf6842e907d325b079cc60f4a6b1e SHA1 b91d65e7307b5fecd1509ace03c02564ac9591c0 SHA256 586c20968b2daa55c0afaaf334d5b9b8b6896d6ea45078a577e165806858c3a5
-EBUILD dvdrip-0.98.11-r1.ebuild 2132 RMD160 2d9f2a7eaee18ce2d2e82b905dd61de2c448c5ff SHA1 a349fcccef23156df2273fa60407656944de09e6 SHA256 f629d89a856b3aa68613e935ad9b441411f8645cd8a668c1f7729898f4aab9ca
-MISC ChangeLog 22316 RMD160 06d1869d015180ab0b9778db1363067056315b68 SHA1 69e28d625f833827e280c50f62456a95bb635173 SHA256 0628568a9c9a22915a15a96cca5222e72f2e84e0df5e6592192fc8e1369332f0
-MISC metadata.xml 322 RMD160 9392e9ac94f39c22cad7a11e03f12393b67268ae SHA1 3963e60794cbc87f6f47ec4c3cce8f81d14210c0 SHA256 6562d809cb4dd01f2e30997df4f42ade13abac1071aeac87c7299144561efc65
+EBUILD dvdrip-0.98.11-r1.ebuild 2008 RMD160 eb52dddbb561eb8238ab402280a09072bc21803f SHA1 127aa2c0be00c3bd8e6a951381759fe84aa09e70 SHA256 40c4e24ce5ad6417cc67ddb6856c660d30f07c6892c0ddf7f4aa8bc149aea96f
+MISC ChangeLog 22522 RMD160 4dd4430c50b47291d7f3cd0b723253c72e937820 SHA1 f84ce97f4dfcda5f7d255989812e806d79b3bad0 SHA256 a7211bca868ffbaee030cfcd89a050684e19ea920c210d0590af087af6be1235
+MISC metadata.xml 395 RMD160 5a43112e9714a0a8eccc204860a6ab02af2985c5 SHA1 bbd737ef88515dc59abdb6cab08528c7b3543f42 SHA256 59a4b3a5cc6c45e05789255d98de899a7ecad50a034f3377ffd063658e4f8599
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPSB4DAAoJEEdUh39IaPFN380H+QFZGCRWTYfuUx3I0ZJuCpG+
-zevfW5wUyoa4LbdvkiSczOrNtOeYbHB0aynWNGCQ0KoT9NMptealAb2cApLbhH4S
-XezOzFig+lEVZgJT77m2kzNfPX837/sUIFhWnH8hhbzNYWHMhtuMcnFm/U+Ednze
-drXjFlqhpg3YpaB9Ma6QsOaSWQ8dp03CLqrJQpSuyTD0nNM9hst8hkn1pmRlC0Gb
-PEaVvORoQt89KHgOO3gO6enT0T92kdDJDGRVmN0JDK5jMnMKmu7QUoF55s+IP8vA
-GWXI459BGIuGnccXuDLicYZ+gYsGif9ngRd3sZRzlnaD+pglzIdJIJk0CAkm7v4=
-=/osW
+iQEcBAEBAgAGBQJPSCF3AAoJEEdUh39IaPFNe3oH/itdrIVnEByTGb1nbfFvPwyi
+rABFRfaZTH7vxablYLI1DxFu75vyntGXC799+yPbMO1J96MBAGO6qUfa80FpWfPW
+ISM8wzLbAZoczc4TNg6vnoJpt2K8cfi21YC1l2fU1ccei8UQ5Ab3Q04kelpIbbug
+VpvEZKKREUMOvQ51diGE0SAwmwLR5S/m/8vjxfNSOcKsVFwgAo19zm5BQAeLncs4
+ADYk3YUhSAzErXWwuztHzYhb1EBIllM4RjtrjB53/V1g9cdeHCzv+oCQfeljwgxB
+xBSTPZUG3PRvVFGCM9uT2G7rd1CrIKMwRBltEN+tq21odLT1QW8nTHPAk/PbS+U=
+=P9b6
 -----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
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>