From: Joe Peterson <lavajoe@gentoo.org>
Date: Tue, 11 May 2010 21:34:48 +0000 (+0000)
Subject: Downgrade dev-perl/Audio-Scan to fix issue (bug #314073); move patching to src_prepare()
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a867721a9ec06245bb6e1b25aa30bf72f598a57;p=gentoo.git

Downgrade dev-perl/Audio-Scan to fix issue (bug #314073); move patching to src_prepare()
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

diff --git a/media-sound/squeezeboxserver/ChangeLog b/media-sound/squeezeboxserver/ChangeLog
index bdecbc21cbcf..ddff065f5322 100644
--- a/media-sound/squeezeboxserver/ChangeLog
+++ b/media-sound/squeezeboxserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/squeezeboxserver
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/ChangeLog,v 1.5 2010/04/25 22:26:28 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/ChangeLog,v 1.6 2010/05/11 21:34:48 lavajoe Exp $
+
+*squeezeboxserver-7.5.0-r1 (11 May 2010)
+
+  11 May 2010; Joe Peterson <lavajoe@gentoo.org>
+  -squeezeboxserver-7.5.0.ebuild, +squeezeboxserver-7.5.0-r1.ebuild:
+  Downgrade dev-perl/Audio-Scan to fix issue (bug #314073); move patching to
+  src_prepare()
 
 *squeezeboxserver-7.5.0 (25 Apr 2010)
 
diff --git a/media-sound/squeezeboxserver/Manifest b/media-sound/squeezeboxserver/Manifest
index c6e435a67922..d10fb3b72554 100644
--- a/media-sound/squeezeboxserver/Manifest
+++ b/media-sound/squeezeboxserver/Manifest
@@ -19,6 +19,6 @@ DIST SqueezeboxServer-EV-3.8.tar.gz 151268 RMD160 0bb514debdb615b37f5c16164a47c5
 DIST squeezeboxserver-7.4.2-noCPAN.tgz 22197375 RMD160 a52088edcb01d8114d02e80eb35c2eaacdca215f SHA1 0d59db03cd4162f5162f75443e46fef2963f5ba4 SHA256 6f2555c53f0514477935593526e027eb35e9f8735283fe996ecfcfdf0d563b8b
 DIST squeezeboxserver-7.5.0-noCPAN.tgz 20701362 RMD160 a2758d2a0340851bdf860a26d7bdcb227de987a2 SHA1 8519061735cc61b690fe96d883e2094ffd06b458 SHA256 a92116e702809087fa12c8e2386375101a9ead4c8bc42452f0be979e39c67a9f
 EBUILD squeezeboxserver-7.4.2-r1.ebuild 17538 RMD160 d1a7c83fc905f3006a78df8435492e832cb86587 SHA1 41b94e41adf4921be433906e0aa92920119acfdc SHA256 172c751108eaf014dc0e266dc4e8bb6edf6f180494d37e3737b446693780d6bd
-EBUILD squeezeboxserver-7.5.0.ebuild 17688 RMD160 f10116ba163873149ee7a65c9d9b5815d0a33823 SHA1 465ccb73a0af8470f02db799ac35413f4b914651 SHA256 05203d681dcf951c206d249cc4cd80c2663dcb967097a02414da637c19c5aed6
-MISC ChangeLog 2378 RMD160 134369972d24d12b49b04c7d23272c1e0a2c2339 SHA1 76613220f28808a809898d54a96bf7fd5359ca7c SHA256 2d96dd0e685c40189588eb2102ca45d45ffa53ce29fb1160a853dc937ba27b31
+EBUILD squeezeboxserver-7.5.0-r1.ebuild 17666 RMD160 4b36d4efd6762eb04ec5f1fa24f3ecfdb730c945 SHA1 8b2562683ecd01703eadf20c4c6f248d1837a820 SHA256 0e1727a206d98f816f199702804d17ba4737bf617c57615a35edb949e2f6fcea
+MISC ChangeLog 2632 RMD160 5caf58760389b2d95014578a02ef3aa60e71d6a6 SHA1 4c8656b0ea9687f9b8133e5959c92bb980594259 SHA256 87baa8d5a9d2f72994a78582ffb564a20f94f6d0df03cedf3f289e88a7a64ed7
 MISC metadata.xml 935 RMD160 bed42783ef261d072900ba296052be0e67143d6e SHA1 13567e24801ecf74fe91c6bc2bc2d1202c3fac49 SHA256 6e17e84756f35acb251d9134fac66ba08b41a78861edadc523f065a9eb1016d6
diff --git a/media-sound/squeezeboxserver/squeezeboxserver-7.5.0.ebuild b/media-sound/squeezeboxserver/squeezeboxserver-7.5.0-r1.ebuild
similarity index 99%
rename from media-sound/squeezeboxserver/squeezeboxserver-7.5.0.ebuild
rename to media-sound/squeezeboxserver/squeezeboxserver-7.5.0-r1.ebuild
index 905866401ace..850454506ce8 100644
--- a/media-sound/squeezeboxserver/squeezeboxserver-7.5.0.ebuild
+++ b/media-sound/squeezeboxserver/squeezeboxserver-7.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/squeezeboxserver-7.5.0.ebuild,v 1.1 2010/04/25 22:26:28 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/squeezeboxserver-7.5.0-r1.ebuild,v 1.1 2010/05/11 21:34:48 lavajoe Exp $
 
 EAPI="2"
 
@@ -38,7 +38,7 @@ RDEPEND="
 	virtual/logger
 	virtual/mysql
 	>=dev-lang/perl-5.8.8
-	>=dev-perl/Audio-Scan-0.59
+	~dev-perl/Audio-Scan-0.62
 	>=dev-perl/GD-2.41
 	>=virtual/perl-IO-Compress-2.015
 	>=dev-perl/YAML-Syck-1.05
@@ -148,10 +148,7 @@ pkg_setup() {
 	enewuser squeezeboxserver -1 -1 "/dev/null" squeezeboxserver
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# Apply patches
 	epatch "${FILESDIR}/${P}-build-perl-modules-gentoo.patch"
 	epatch "${FILESDIR}/${P}-uuid-gentoo.patch"