Use correct build-perl-modules-gentoo.patch for specific versions (bug #265506)

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

6 files changed, 89 insertions, 11 deletions

diff --git a/media-sound/squeezecenter/ChangeLog b/media-sound/squeezecenter/ChangeLog
index 70dc70c03f1a..20239532d923 100644
--- a/media-sound/squeezecenter/ChangeLog
+++ b/media-sound/squeezecenter/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/squeezecenter
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/ChangeLog,v 1.39 2009/03/25 17:10:40 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/ChangeLog,v 1.40 2009/04/10 05:41:46 lavajoe Exp $
+
+  10 Apr 2009; Joe Peterson <lavajoe@gentoo.org>
+  +files/squeezecenter-7.2.1-build-perl-modules-gentoo.patch,
+  +files/squeezecenter-7.3.0-build-perl-modules-gentoo.patch,
+  -files/build-perl-modules-gentoo.patch, squeezecenter-7.2.1.ebuild,
+  squeezecenter-7.3.0.ebuild:
+  Use correct build-perl-modules-gentoo.patch for specific versions (bug
+  #265506)
 
 *squeezecenter-7.3.2-r2 (25 Mar 2009)
 
diff --git a/media-sound/squeezecenter/Manifest b/media-sound/squeezecenter/Manifest
index e876751902c0..cda3e0e58c0e 100644
--- a/media-sound/squeezecenter/Manifest
+++ b/media-sound/squeezecenter/Manifest
@@ -1,6 +1,5 @@
 AUX Gentoo-plugins-README.txt 981 RMD160 d5efb4a5d704ff6b4c3de49b7143cbb9bc132445 SHA1 c3aedb74c3f5b7a54a3bad278750ed1632241e1d SHA256 6f84ab8159022447d3f434afb6403947ae9514fec55f33c9e74257ff75735428
 AUX avahi-squeezecenter.service 326 RMD160 174b4a900bea817b3b1995449c1c0a0f3f96cacb SHA1 b84fa32fc82c84cb749d8aed2cc4f1367937a4bc SHA256 868102c1b4eb5e497e8a0f899c794023643018b66e8f3855b772908647b59b2d
-AUX build-perl-modules-gentoo.patch 2214 RMD160 0686bf15b2bfaa30b7977433c2df23b09ca44ab5 SHA1 ad4d6687a37e8e1f0cbd2e8c6a46a05ee84f4b76 SHA256 75929caaeb955762e70a0e1a4a5ece9a444a372ec24ffdb3bec5ab245823f764
 AUX dbcreate-gentoo.sql 165 RMD160 36fe87c398aee02890710f970245032488b857bb SHA1 e86a26c73addb4b74c345ec70155f2b9d079075b SHA256 d8cf85879e74dc1e429251f5bd4ae7f99e2a460fa668c0abde2c2725b90f10a1
 AUX dbdrop-gentoo.sql 64 RMD160 bc60b46ea56642c28ffbd8731e120722e42b66a9 SHA1 a02eab2a62e67d81ff2ad3d3700cd7695f6d31c1 SHA256 0c8e1f3cddd54d6659a014dbcefa928f6d8b9174860cb07d53e01fe9940e8aba
 AUX filepaths-7.1-gentoo.patch 4328 RMD160 ddbb9c6dae371230bc22efc64dbbf9534ad1a923 SHA1 4b8d9fe565ad56be5f98fa6275d97634990030f4 SHA256 df0edea36a4eb2de0589c776f72e52b24c749cc7d1892041d1dd673433292466
@@ -8,6 +7,8 @@ AUX filepaths-gentoo.patch 4328 RMD160 ddbb9c6dae371230bc22efc64dbbf9534ad1a923
 AUX gentoo-filepaths.pm 2688 RMD160 0d4ab3ad5ae5d20cf1608ad6f3fd3257eeda20ec SHA1 ceaec7483f20f1edea03b6e71f04bce88a4ec8e0 SHA256 1ccc31d75eccbaa3d089d291e96e3b1b1332041ef5eadacd3d6aa3942e7d52be
 AUX mDNSResponder-7.1-gentoo.patch 351 RMD160 c4f7ee74c7ec70496ffe845f10cd61a533742968 SHA1 c5b23edc04d47003cbd66504439a82c6a12c5a8c SHA256 18039bf06a8712195b492f792f78943bae3546d0985f17accb0419efc83e5095
 AUX mDNSResponder-gentoo.patch 351 RMD160 084a1374d5f8f9f4586bfade7a1bda22a4f78381 SHA1 86a4e0ed901172ac68c46616cc58a7629cb6a18a SHA256 fcc17eecdef9a3dafd23b36fbea1cba649aee786649aa238eb5782f23c10ea2d
+AUX squeezecenter-7.2.1-build-perl-modules-gentoo.patch 2214 RMD160 c598de544f7ed733ff79dad88ac7e02ec6c33193 SHA1 8006046b0a32f844ef4005f2fde917dd1b78e01a SHA256 860628ac8c399844e94a2e890655e38583b3429a3874fd860ac01d83c1cea975
+AUX squeezecenter-7.3.0-build-perl-modules-gentoo.patch 2214 RMD160 0686bf15b2bfaa30b7977433c2df23b09ca44ab5 SHA1 ad4d6687a37e8e1f0cbd2e8c6a46a05ee84f4b76 SHA256 75929caaeb955762e70a0e1a4a5ece9a444a372ec24ffdb3bec5ab245823f764
 AUX squeezecenter-7.3.1-aac-transcode-gentoo.patch 1244 RMD160 85596b04058021f5f94e56b6b6d0f904e74f14a7 SHA1 15d589f3071ac4efa61ac4d3a5467b57809d6d12 SHA256 1e744d9cacd5898956eddf834347759a5465a947e3e042128986afca6fca5770
 AUX squeezecenter-7.3.1-build-perl-modules-gentoo.patch 2749 RMD160 6e38831b81ac200c40f7f7f8a5efaaab69e27d61 SHA1 f4c2e18591cee050f543b2aef51647d045b254af SHA256 d3c2ab3609e28676d34755ef673161b831abbc755b5f6e4b72403f1ca2ac4d01
 AUX squeezecenter-7.3.1-json-xs-gentoo.patch 506 RMD160 c489bd77c7ea2bb2db7c67e6f3a0686346bda36b SHA1 a305b87c3550bbf69456b7a7a57887d600529259 SHA256 db6db5e28afdbf36c938d3bd406997340b4ad7c718f26289fbfab0dee564116a
@@ -42,10 +43,10 @@ DIST squeezecenter-7.3.1-noCPAN.tgz 23765464 RMD160 d114c4fcf5bee255d9f20e7a685f
 DIST squeezecenter-7.3.2-noCPAN.tgz 25322353 RMD160 80c06cb53fe0bded3801b27e9528b595f84ce7b6 SHA1 9d88cd99fc260736d2c6eebca2aeb9cde81c29ac SHA256 42be2af96fd0924df3fb69bb6cbeb3d73304608bd865cb7f2c505c254f8d664d
 EBUILD squeezecenter-7.1.0-r1.ebuild 13058 RMD160 25e1d30268ddb1e03dc8b281455e3de9c894ca7e SHA1 8952f15b62700d17b4de626decc5725f5fd9513f SHA256 3141c32deaafe93a7e0331abd28b9d58b2eaa2be7cd9f0af01af0113d9084ea0
 EBUILD squeezecenter-7.2.0-r1.ebuild 13035 RMD160 aa0cf2b49a9233e7c4d3c3716d925b76f4313b77 SHA1 c351aebb1dd2a0dfdf545de007211394c10b4a41 SHA256 4bf15144a2306578cd12b5c58b49b60747e124873862200e1c250af303d747ee
-EBUILD squeezecenter-7.2.1.ebuild 13953 RMD160 50f4112c1a6b0ff031f423ca7bc6129bab311d4f SHA1 d3f4fcd74c51e436cc6ea1b6fca51cc95579c710 SHA256 502c88dc62b02ee2386c58f12d68fd7768cba94f825dde5fdd089fdeab3af3f1
-EBUILD squeezecenter-7.3.0.ebuild 14586 RMD160 a71e0f2aa15e1736fcc87419cab871796af02f55 SHA1 b70fef2ea3b64855a2f70dd62f7496ff1f639ea3 SHA256 ace2578c9388e017d3bc20bac735853dfceb15cf6462ae5ac43ad8768966b573
+EBUILD squeezecenter-7.2.1.ebuild 13961 RMD160 8f802a67f54d1133ec1cc21158f13721535ea7ce SHA1 b14be451495598bdbabd13f0366e5905572c9099 SHA256 88cb6d94da31da63862f28f576857a7adaff239a9c9a61b81f7de3215250a7cc
+EBUILD squeezecenter-7.3.0.ebuild 14591 RMD160 7410b6a8d2dfcf7785dce5c7a369a407e025206c SHA1 96bba779f163e864a87acb9626754b0d41060279 SHA256 801205f4364f8cbcccd0176683a0dde9438ccfaec056482f069d94370b7eae97
 EBUILD squeezecenter-7.3.1.ebuild 15750 RMD160 ef46c6f85adc61275c5090ada150fa969e922718 SHA1 c1e0fb5462960dfdd33d62203f502fdc12e76be9 SHA256 168c2fd9cb208e02cd1c59e412c3ec515b526bb5cc05224291a238dda11c6d88
 EBUILD squeezecenter-7.3.2-r1.ebuild 16038 RMD160 d5d8e2c1d329c63c3c82a9de25aada1dc3628395 SHA1 58c6981bba422c80db87fef4251c51c16164b3a2 SHA256 590ccfad8143137ec3746b5945630135e9f860c6503cd48bc1ff1861020f1794
 EBUILD squeezecenter-7.3.2-r2.ebuild 16039 RMD160 70b256f4b70877ee035aeac305d6071d47307efc SHA1 3bfd90e0c6e25ceddfc5848bf8e8415a5a845b23 SHA256 c6a7fac9eebb6f3c1d0b56b22399f1fddf5f9dd7624f80ed316ec6fc4ef1c96a
-MISC ChangeLog 8459 RMD160 d4036a8853ff8ca51938765f1ad6ef203d0e2aae SHA1 08a9ad199a75980e644de259e888f767395f353c SHA256 20789ba53759471deceed0597789c35ce568f376efc7d16a78fcebe85243579b
+MISC ChangeLog 8817 RMD160 de0d27118a8ded32440d54356329b3cd7c35c644 SHA1 f90465293d877413f7e5399074229c836828b03e SHA256 80e9fde2dba44f8df3a0240090dae8c4f66085a0c634ca18a4d386a11489eaff
 MISC metadata.xml 1111 RMD160 09bbcc60edfa73e0b04a509c43a9e3a38396c9a5 SHA1 091e7172538d6f37f885752a2ab72d1cbf40334a SHA256 3f92fd179e06f52bd8af1caf6d160bacadb9b5ad90e3d34c98255379e075e1fe
diff --git a/media-sound/squeezecenter/files/squeezecenter-7.2.1-build-perl-modules-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.2.1-build-perl-modules-gentoo.patch
new file mode 100644
index 000000000000..0055b1a49fd8
--- /dev/null
+++ b/media-sound/squeezecenter/files/squeezecenter-7.2.1-build-perl-modules-gentoo.patch
@@ -0,0 +1,69 @@
+--- Bin/build-perl-modules.pl.old	2008-11-18 19:07:45.000000000 +0000
++++ Bin/build-perl-modules.pl	2008-11-18 19:42:04.000000000 +0000
+@@ -21,13 +21,11 @@
+ 
+ # NOTE: If you change this in a future version of SC, create a new
+ # versioned directory under vendor/src for all files for that version
+-my $SOURCE = 'http://svn.slimdevices.com/repos/slim/vendor/src/7.2';
+ my $dlext  = $Config{'dlext'};
+ 
+ # The list of all the packages needed.
+ my %packages = (
+ 	'Class::XSAccessor::Array' => 'Class-XSAccessor-Array-0.05.tar.gz',
+-	'Class::C3::XS'            => 'Class-C3-XS-0.08.tar.gz',
+ 	'Compress::Zlib'           => 'Compress-Zlib-1.41.tar.gz',
+ 	'DBI'                      => 'DBI-1.604.tar.gz',
+ 	'DBD::mysql'               => 'DBD-mysql-3.0002.tar.gz',
+@@ -197,36 +195,16 @@
+ 		}
+ 	}
+ 
++	# Utilise AutoXS::Header as we need that to support the following builds.
++	chdir($pwd) or die "Couldn't change to $pwd : $!";
++	# Include this when performing the following builds.
++	$ENV{'PERL5LIB'} = cwd() . "/AutoXS-Header-0.03/lib";
++
+ 	for my $package (@packages) {
+ 
+ 		chdir($pwd) or die "Couldn't change to $pwd : $!";
+ 
+-		print "\nDownloading $package to: $pwd\n";
+-
+-		# Remove any previous version.
+-		unlink $package;
+-
+-		if ($downloadUsing eq 'lwp') {
+-
+-			LWP::Simple::getstore("$SOURCE/$package?view=auto", $package);
+-
+-		} elsif ($downloadUsing =~ /curl$/) {
+-
+-			`$downloadUsing --silent -o $package $SOURCE/$package?view=auto`;
+-
+-		} else {
+-
+-			`$downloadUsing -q -O $package $SOURCE/$package?view=auto`;
+-		}
+-
+-		unless (-r $package) {
+-			print "Something looks wrong - I couldn't read $pwd/$package, which I just downloaded.\n";
+-		}
+-
+-		print "Uncompressing..\n";
+-		`gzip -d < $package | tar xvf -`;
+-
+-		unlink $package;
++		print "\nBuilding $package\n";
+ 
+ 		# Just the directory name.
+ 		my ($packageDir) = ($package =~ /(\S+?)\.tar\.gz/);
+--- Slim/bootstrap.pm.old	2008-11-22 15:14:07.000000000 +0000
++++ Slim/bootstrap.pm	2008-11-22 15:14:30.000000000 +0000
+@@ -176,7 +176,6 @@
+ 
+ 		print "The following modules failed to load: $failed\n\n";
+ 
+-		print "To download and compile them, please run: $libPath/Bin/build-perl-modules.pl $failed\n\n";
+ 		print "Exiting..\n";
+ 
+ 		exit;
diff --git a/media-sound/squeezecenter/files/build-perl-modules-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.0-build-perl-modules-gentoo.patch
index 6ae452f8604d..6ae452f8604d 100644
--- a/media-sound/squeezecenter/files/build-perl-modules-gentoo.patch
+++ b/media-sound/squeezecenter/files/squeezecenter-7.3.0-build-perl-modules-gentoo.patch
diff --git a/media-sound/squeezecenter/squeezecenter-7.2.1.ebuild b/media-sound/squeezecenter/squeezecenter-7.2.1.ebuild
index e86cf8e146db..cabb887199df 100644
--- a/media-sound/squeezecenter/squeezecenter-7.2.1.ebuild
+++ b/media-sound/squeezecenter/squeezecenter-7.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/squeezecenter-7.2.1.ebuild,v 1.2 2008/11/18 16:15:29 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/squeezecenter-7.2.1.ebuild,v 1.3 2009/04/10 05:41:46 lavajoe Exp $
 
 inherit eutils
 
@@ -90,7 +90,7 @@ src_unpack() {
 	# Apply patches
 	epatch "${FILESDIR}/mDNSResponder-gentoo.patch"
 	epatch "${FILESDIR}/filepaths-gentoo.patch"
-	epatch "${FILESDIR}/build-perl-modules-gentoo.patch"
+	epatch "${FILESDIR}/${P}-build-perl-modules-gentoo.patch"
 
 	# Prune GD from the SqueezeCenter local CPAN. This is due to
 	# SC bug#5882 which means we need to bring in Portage's version of GD,
diff --git a/media-sound/squeezecenter/squeezecenter-7.3.0.ebuild b/media-sound/squeezecenter/squeezecenter-7.3.0.ebuild
index 325d121ccea8..5a966ccfa421 100644
--- a/media-sound/squeezecenter/squeezecenter-7.3.0.ebuild
+++ b/media-sound/squeezecenter/squeezecenter-7.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/squeezecenter-7.3.0.ebuild,v 1.1 2008/12/20 01:24:43 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/squeezecenter-7.3.0.ebuild,v 1.2 2009/04/10 05:41:46 lavajoe Exp $
 
 inherit eutils
 
@@ -87,7 +87,7 @@ src_unpack() {
 
 	# Apply patches
 	epatch "${FILESDIR}/mDNSResponder-gentoo.patch"
-	epatch "${FILESDIR}/build-perl-modules-gentoo.patch"
+	epatch "${FILESDIR}/${P}-build-perl-modules-gentoo.patch"
 
 	# Prune GD from the SqueezeCenter local CPAN. This is due to
 	# SC bug#5882 which means we need to bring in Portage's version of GD,