Remove dev-perl/module-build depend (bug #246942); fix other dependencies

Package-Manager: portage-2.1.6.8/cvs/Linux i686

3 files changed, 29 insertions, 11 deletions

diff --git a/media-sound/squeezecenter/ChangeLog b/media-sound/squeezecenter/ChangeLog
index 19b572e75324..60467421015d 100644
--- a/media-sound/squeezecenter/ChangeLog
+++ b/media-sound/squeezecenter/ChangeLog
@@ -1,6 +1,12 @@
 # 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.37 2009/01/26 03:29:21 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/ChangeLog,v 1.38 2009/03/18 11:53:26 lavajoe Exp $
+
+*squeezecenter-7.3.2-r1 (18 Mar 2009)
+
+  18 Mar 2009; Joe Peterson <lavajoe@gentoo.org>
+  -squeezecenter-7.3.2.ebuild, +squeezecenter-7.3.2-r1.ebuild:
+  Remove dev-perl/module-build depend (bug #246942); fix other dependencies
 
 *squeezecenter-7.3.2 (26 Jan 2009)
 
diff --git a/media-sound/squeezecenter/Manifest b/media-sound/squeezecenter/Manifest
index 578245ef21f7..8bae1a05e82c 100644
--- a/media-sound/squeezecenter/Manifest
+++ b/media-sound/squeezecenter/Manifest
@@ -44,6 +44,6 @@ EBUILD squeezecenter-7.2.0-r1.ebuild 13035 RMD160 aa0cf2b49a9233e7c4d3c3716d925b
 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.3.1.ebuild 15750 RMD160 ef46c6f85adc61275c5090ada150fa969e922718 SHA1 c1e0fb5462960dfdd33d62203f502fdc12e76be9 SHA256 168c2fd9cb208e02cd1c59e412c3ec515b526bb5cc05224291a238dda11c6d88
-EBUILD squeezecenter-7.3.2.ebuild 15750 RMD160 b845b04d7ec2233e296269f8295a58dbc066d578 SHA1 3706afbf2479627d89710030e1d21a8f6c6ad240 SHA256 b9f53bc9ae1a1669c3461292b2909fb69007d4fdeae12266bdf8181504adc40c
-MISC ChangeLog 8012 RMD160 956d1dc0f45a7e5f0292c3b802df069a45fbedb1 SHA1 6ab4dee1f476215249214a63603f22aad26ba11c SHA256 b64329ddea1f711629c94703643dde180738fdb379c2724f425ce7c233f0b35b
+EBUILD squeezecenter-7.3.2-r1.ebuild 16038 RMD160 d5d8e2c1d329c63c3c82a9de25aada1dc3628395 SHA1 58c6981bba422c80db87fef4251c51c16164b3a2 SHA256 590ccfad8143137ec3746b5945630135e9f860c6503cd48bc1ff1861020f1794
+MISC ChangeLog 8240 RMD160 63eabf3a5eebaed402d84dd9fd33c94efaeb95f7 SHA1 cb907b434b2bcfdc715533c9cf81e8d91445c5dd SHA256 9fdfa7005c9b9b468c5f6b38cb90d4b9d4af7a48cda50883e3844d7a05a4bc24
 MISC metadata.xml 1111 RMD160 09bbcc60edfa73e0b04a509c43a9e3a38396c9a5 SHA1 091e7172538d6f37f885752a2ab72d1cbf40334a SHA256 3f92fd179e06f52bd8af1caf6d160bacadb9b5ad90e3d34c98255379e075e1fe
diff --git a/media-sound/squeezecenter/squeezecenter-7.3.2.ebuild b/media-sound/squeezecenter/squeezecenter-7.3.2-r1.ebuild
index 366017f26119..f39d5c5b548e 100644
--- a/media-sound/squeezecenter/squeezecenter-7.3.2.ebuild
+++ b/media-sound/squeezecenter/squeezecenter-7.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.1 2009/01/26 03:29:21 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/squeezecenter-7.3.2-r1.ebuild,v 1.1 2009/03/18 11:53:26 lavajoe Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ SRC_URI="http://www.slimdevices.com/downloads/${SRC_DIR}/${MY_P}.tgz
 	mirror://gentoo/SqueezeCenter-Class-XSAccessor-Array-0.05.tar.gz
 	mirror://gentoo/SqueezeCenter-POE-XS-Queue-Array-0.002.tar.gz"
 
-# Note: dev-perl/module-build necessary because of SC bug#5882
+# Note: virtual/perl-Module-Build necessary because of SC bug#5882
 # (http://bugs.slimdevices.com/show_bug.cgi?id=5882).
 DEPEND="
 	dev-perl/File-Which
@@ -32,9 +32,12 @@ DEPEND="
 	"
 # Note: dev-perl/GD necessary because of SC bug#6143
 # (http://bugs.slimdevices.com/show_bug.cgi?id=6143).
-RDEPEND="${DEPEND}
+RDEPEND="
+	dev-perl/File-Which
+	virtual/logger
+	virtual/mysql
+	avahi? ( net-dns/avahi )
 	>=dev-lang/perl-5.8.8
-	>=app-admin/sudo-1.6.8
 	>=dev-perl/GD-2.35
 	>=virtual/perl-Compress-Zlib-2.015
 	>=dev-perl/YAML-Syck-1.05
@@ -65,7 +68,6 @@ RDEPEND="${DEPEND}
 	>=dev-perl/Path-Class-0.16
 	>=dev-perl/SQL-Abstract-1.22
 	>=dev-perl/SQL-Abstract-Limit-0.12
-	>=dev-perl/TimeDate-1.16
 	>=dev-perl/URI-1.35
 	>=dev-perl/XML-Simple-2.18
 	>=perl-core/version-0.76
@@ -82,7 +84,10 @@ RDEPEND="${DEPEND}
 	alac? ( media-sound/alac_decoder )
 	wavpack? ( media-sound/wavpack )
 	bonjour? ( net-misc/mDNSResponder )
-	flac? ( media-libs/flac )
+	flac? (
+		media-libs/flac
+		media-sound/sox
+		)
 	musepack? ( media-sound/musepack-tools )
 	ogg? ( media-sound/sox )
 	aac? ( media-libs/faad2 )
@@ -133,11 +138,18 @@ OLDPLUGINSDIR=/opt/squeezecenter/Plugins
 NEWPLUGINSDIR=/var/lib/squeezecenter/Plugins
 
 pkg_setup() {
-	# Sox has optional OGG support, so make sure it has been built that way
+	# Sox has optional OGG and FLAC support, so make sure it has that included
+	# if required
 	if use ogg; then
 		if ! built_with_use media-sound/sox ogg; then
 			eerror "media-sound/sox not built with USE=ogg"
-			die "media-sound/sox not built with USE=ogg"
+			die "SqueezeCenter needs media-sound/sox to be built with USE=ogg"
+		fi
+	fi
+	if use flac; then
+		if ! built_with_use media-sound/sox flac; then
+			eerror "media-sound/sox not built with USE=flac"
+			die "SqueezeCenter needs media-sound/sox to be built with USE=flac"
 		fi
 	fi