Fix corner cases where dependency checks in Makefile can fail, relying on portage to ensure they are met instead, bug 299173

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

4 files changed, 88 insertions, 16 deletions

diff --git a/media-video/acidrip/ChangeLog b/media-video/acidrip/ChangeLog
index 044e45f9099b..5ce2931f9295 100644
--- a/media-video/acidrip/ChangeLog
+++ b/media-video/acidrip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/acidrip
 # Copyright 2000-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/ChangeLog,v 1.33 2014/07/27 16:57:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/ChangeLog,v 1.34 2014/08/22 15:49:05 beandog Exp $
+
+*acidrip-0.14-r3 (22 Aug 2014)
+
+  22 Aug 2014; Steve Dibb <beandog@gentoo.org> +acidrip-0.14-r3.ebuild,
+  +files/acidrip-0.14-makefile.patch:
+  Fix corner cases where dependency checks in Makefile can fail, relying on
+  portage to ensure they are met instead, bug 299173
 
   27 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> -acidrip-0.14-r1.ebuild:
   old
diff --git a/media-video/acidrip/Manifest b/media-video/acidrip/Manifest
index e985bdc28442..d2bef045dca7 100644
--- a/media-video/acidrip/Manifest
+++ b/media-video/acidrip/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX acidrip-0.14-makefile.patch 2360 SHA256 62a1c221da8f36646a5003cc894df7fa588fff701c877f29e7557d9daec95696 SHA512 7e91ea9ad24e20f620f0d406f2dd5d5ed5364cf92d57566c969e17aef0a0bb3d172142692a08766b4cbce0f4e1c2594672542765e68c559e9c9679a27012441b WHIRLPOOL dd8681a7b572faf37bf3797dae2bbd33f702aac635de3ab01e1675e1816c3142df93e99b3e9e7c08aee507d34246c67445038f3e1506eb296e3e521bef1764e5
 AUX acidrip-mplayer.patch 1079 SHA256 18638433fc407fc42fcb468a15b0c545581dced034ca5c867adac2b521cafc88 SHA512 ae1b57efbd49de33f60dd0d6daffb4c4ddf6bf726ad5fc2fab485a4af39d5c1326c43471dbbe8a28147e3a0f42e1ea55bd98554a1fbd8ee0fa3a150a180f4f23 WHIRLPOOL b04df065f9486ea315684e9e3242f604a13c3e99353580f332e3c5a57bd221d92bf48e31b42f1cc8fefdd417dfe1c94513b7bda99cb8379b2260f6f22f8b6643
 DIST acidrip-0.14.tar.gz 92086 SHA256 51bb84174e8dae733ddd1f69a16b90d875e4455135ed20a024a79b98ae7d58c1 SHA512 3ee0e329bd7e5eb4067d618fc79a49707084526d53e8c10cd9ec560828cf621e8d7263259cc8bc7944e6f9d7b7fd1fc5b8a42a8f37f18666f1974f240edb99a0 WHIRLPOOL 8aa1f2aeaa8e29a97399f714989be38fc60803a7a3ba3f872750a4a440741c1f2173e88f3a0b3421651e3c86bf64721ec24077165e664cf107ab0e9cefcd2917
 EBUILD acidrip-0.14-r2.ebuild 692 SHA256 c8cc6055cd5f28a4ae7dcb6c6c18bad5738bf922afa214c40db1628cfdf583ca SHA512 4c0122a1b51a4255e45c73bbfaced473f9ac7a1351fd92f22840f6f7762d62ea267627b883c03a894f9c5c4072d7f3a121edc8985abb993cec2193b13e5fff08 WHIRLPOOL 9ba99c48bc4c811976223affc7f8aabdeb094653810894d2d30e480326a423837ed49c1d4866a3b3d33ee09abeeb224e973ef1a12db2b71832d708c85ffdf020
-MISC ChangeLog 4182 SHA256 8ff28cb9e616f44a7c9c47393148d628c05071ff0a4084f0b391c9309422d2b0 SHA512 795d46b3f714db2b3fc80432b917e5f21109ad55b47582394ffbc13d1432a5887fb2a5027f12d5a9ea852adde8ec56f3ef37e3097da3def6f233d5feb01e65e4 WHIRLPOOL f93288fd4d401d3b7a9a0026e99aa5266c27649e96ad3446d103bda5808077806561a6eb45487b668193ee5621f1d80587239ce6030184d20267ad80488245e2
+EBUILD acidrip-0.14-r3.ebuild 742 SHA256 0871a9e563e255b8c72c29775ad9b324ba35e78b5237edcf609f37a7b21c3589 SHA512 13a0b85eeeae4b3ce03a680d18d782f56c972363281e83d37dc5854c0a43dc78b5afe792c7d5ca4826f415947865ca8b0561f8c433a063b04b56de4083c935f5 WHIRLPOOL 9dcf46e8c92ad8e084a83374ff544342a4827b917d75ff8c0723e31ebc40b2c03a61c5b39d2adabe8f1b853314ac9e74d6d6cf4cb18b5684c5fdddce88fc04d0
+MISC ChangeLog 4452 SHA256 c999a3ff412a772f06419cd02d54e4ecb313961b429dd104da794ab335505e7b SHA512 709ce99052d5e6dd6fc343c3576d49c6a99a9c2e27451f8bb313948b25ef1be2dd6a50e381e1bc167b8c5c86d9d9772a36d78f6410a4649454f0d14f70846b7b WHIRLPOOL 3fe188331d1ccbf1c059948366c590570263caf62f8169e872f65c61649cb88080ce6dcd83a038c28aaad4057a227e4177ca01f1b4ed1ba79cd6645dc990cea6
 MISC metadata.xml 223 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 SHA512 cacba929b8688a7270637f34d348216fdeb89e725cdee4b40e5577ca3f626c5f72e73c1c125605a284506aff47265f41e3fedaa76ed4074c540fc1f200e6d494 WHIRLPOOL dcd04d57abcfe2704036097ed68500917f74b7024b46580e9054e1c933d55678992c350fe07ff0efd590b9345fbcdd81665b8ce546f786dd31f5a0f4eb654da3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJT1S9+AAoJEEdUh39IaPFNja8IAKJ4IU+zmdJnewyZ62fGn685
-xsWzSYKhILBa9LacucbquUs8SnVBWLRSIbysbsQbi862MCHptwjT7fmOcrTG6wIX
-l7662BkTTRLvj6TlbQ0IvWEr1MJGpJNvMupdh501BrxZaZSOBf0x+C2IBHNVcKlH
-YDOvElsy8MYJ48ngWp5ocpi0bFAr9NToEpP+MUiXGX+nd86Wf9OW2lOXXa2hKloa
-4MTWBBWufIGd+GESR2k2doV1suH5g+2PIxApBWqxtL2XISstDQ49GoK2RpECPZSD
-a9kCXhpHDng6J3l5644qrQNL0GpAVbb+HoVPaz27056G8eRcIhw/qchwlUcVJLM=
-=joMW
------END PGP SIGNATURE-----
diff --git a/media-video/acidrip/acidrip-0.14-r3.ebuild b/media-video/acidrip/acidrip-0.14-r3.ebuild
new file mode 100644
index 000000000000..649e4e1b7981
--- /dev/null
+++ b/media-video/acidrip/acidrip-0.14-r3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/acidrip-0.14-r3.ebuild,v 1.1 2014/08/22 15:49:05 beandog Exp $
+
+EAPI=5
+inherit perl-app
+
+DESCRIPTION="A gtk-perl mplayer/mencoder frontend for ripping DVDs"
+HOMEPAGE="http://sourceforge.net/acidrip/"
+SRC_URI="mirror://sourceforge/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="encode"
+
+RDEPEND="dev-lang/perl
+	dev-perl/gtk2-perl
+	media-video/lsdvd
+	media-video/mplayer[encode]
+	encode? ( >=media-sound/lame-3.92 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-mplayer.patch #168012
+	epatch "${FILESDIR}/${P}-makefile.patch" #299173
+}
diff --git a/media-video/acidrip/files/acidrip-0.14-makefile.patch b/media-video/acidrip/files/acidrip-0.14-makefile.patch
new file mode 100644
index 000000000000..bbaf340799c3
--- /dev/null
+++ b/media-video/acidrip/files/acidrip-0.14-makefile.patch
@@ -0,0 +1,50 @@
+--- acidrip-0.14/Makefile.PL.orig	2014-08-22 09:38:46.179128473 -0600
++++ acidrip-0.14/Makefile.PL	2014-08-22 09:40:33.045103299 -0600
+@@ -36,47 +36,7 @@
+     $_;
+ }
+ 
+-print "\nRunning additional test to be sure acidrip will work\n";
+-
+-print "test for lsdvd: "; 
+-my $lsdvd = `lsdvd -V 2>&1`;
+-if ( $lsdvd !~ /0.(\d+)\s/ ) {
+-die "Not Found!\n\n***************\n" . 
+-  "AcidRip needs my little app \"lsdvd\" in order to see what is on your dvd\'s\n" .
+-  "Download it and install it (and libdvdread) before trying to use AcidRip.\n" .
+-  "If it\'s simply not on your path then set the full path inside AcidRip.\n" .
+-  "***************\n\n"
+-}
+-if ( $1 < 9 ) {
+-die "Too old!\n\n***************\n" . 
+-  "AcidRip needs at least version 0.9 of lsdvd, but version 0.$1 was found\n" .
+-  "Download it and install it (and libdvdread) before trying to use AcidRip.\n" .
+-  "***************\n\n"
+-}
+-print "found\n";
+-
+-print "test for MPlayer: "; die "Not Found!\n\n***************\n" .
+-  "AcidRip is based around the MPlayer video player. it has not been found on\n" .
+-  "your current path. Install it from http://mplayerhq/hu see INSTALL.html or\n" .
+-  "INSTALL for installation instructions.\n" .
+-  "***************\n\n" if ( system "mplayer 2&>1 > /dev/null" ); print "found\n";
+-
+-print "test for MEncoder: "; die "Not Found!\n\n***************\n" .
+-  "AcidRip uses MEncoder, which is part of MPlayer video player package. This\n" .
+-  "was not found. Install it from http://mplayerhq/hu see INSTALL.html or\n" .
+-  "INSTALL for installation instructions.\n" .
+-  "***************\n\n" if ( system "mencoder -ovc help 2> /dev/null | grep MEncoder > /dev/null" ); print "found\n";
+-
+-print "test for MP3 support in mencoder: "; die "Not Found!\n\n***************\n" .
+-  "MEncoder was found, however it does not have MP3 support built into it.\n" .
+-  "If you DO want MP3 support you'll need to recompile mplayer with mp3 support\n" .
+-  "See INSTALL or INSTALL.html for more information\n" .
+-  "***************\n\n" if ( system "mencoder -oac help 2> /dev/null | grep mp3lame > /dev/null" ); print "found\n";
+-
+-print "Everything looks good here...\n"; 
+-
+ print "\nPlease send any feedback to me, I actually do want to know what you think of it.";
+ print "\nMaybe then I can make it suck less. acid_kewpie\@users.sourceforge.net\n\n"; 
+ 
+ exit(0);
+-