media-sound/songbird-bin: QA: Cleanup dependencies

svn path=/sunrise/; revision=2139

3 files changed, 57 insertions, 53 deletions

diff --git a/media-sound/songbird-bin/ChangeLog b/media-sound/songbird-bin/ChangeLog
index b91337a73..85c12c51d 100644
--- a/media-sound/songbird-bin/ChangeLog
+++ b/media-sound/songbird-bin/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Dec 2006; Markus Ullmann <jokey@gentoo.org> songbird-bin-0.2.1.ebuild:
+  QA: Cleanup dependencies
+
   05 Dec 2006; Jorge Vargas (elpargo) <jorge.vargas@gmail.com>
   +songbird-bin-0.2.1.ebuild, +metadata.xml:
   fixed a lot of stuff around gstreamer, please read the ebuild if you want to
diff --git a/media-sound/songbird-bin/Manifest b/media-sound/songbird-bin/Manifest
index 4ae48bb55..262a33d3e 100644
--- a/media-sound/songbird-bin/Manifest
+++ b/media-sound/songbird-bin/Manifest
@@ -1,13 +1,13 @@
 DIST Songbird_0_2_1_linux-i686.tar.gz 18133995 RMD160 0c9c9e558f5d1729667f2d6a9260864702fc3861 SHA1 be8355af3afdc69a158fa9152c4447718a372f80 SHA256 adff82aba97d36944d4e79646eb28d4b46cd233eaf13c03fd4f2cc1c029d55f8
 DIST Songbird_0_2_1_linux-x86_64.tar.gz 18358214 RMD160 e1737f5b373b45ee1e2cebcf3011e84aa85c2af5 SHA1 bb7a2ea8d042c1ecbb546044c69ecdd57e1f0e52 SHA256 ed2bda72a5e1c24693e1942801fdadbc596de2d6cedabb91a980df3bf0262d3b
-EBUILD songbird-bin-0.2.1.ebuild 2737 RMD160 dbacc61f5326b17f3fb69c410002b9016b037790 SHA1 fcfbff60e324fd1fb2986a026811350c258aaaa0 SHA256 6a8d1574475d5a4921628a6528c5b273253c92ef52a0d7fa8a541977d044fd6c
-MD5 ddcc33d0f323ded9df6aa34cc85ee1dc songbird-bin-0.2.1.ebuild 2737
-RMD160 dbacc61f5326b17f3fb69c410002b9016b037790 songbird-bin-0.2.1.ebuild 2737
-SHA256 6a8d1574475d5a4921628a6528c5b273253c92ef52a0d7fa8a541977d044fd6c songbird-bin-0.2.1.ebuild 2737
-MISC ChangeLog 428 RMD160 cbd289155698975ac721379812bbb2b3b72452a6 SHA1 15d6867e635ab4758e61ae3e4705170f5234929c SHA256 dbdee2620f96847579cfa3ba9df3215011538de6ac84f25ce78e3c565b598a32
-MD5 46a8448e09f50b2da25cbd5dcca20e64 ChangeLog 428
-RMD160 cbd289155698975ac721379812bbb2b3b72452a6 ChangeLog 428
-SHA256 dbdee2620f96847579cfa3ba9df3215011538de6ac84f25ce78e3c565b598a32 ChangeLog 428
+EBUILD songbird-bin-0.2.1.ebuild 2624 RMD160 53c114e7010c455a49fd743bba9f13035d836ab6 SHA1 63bcc43e5296b88df3874fce37f7c43208f71b7d SHA256 9b0cba7c4d368f190490d2ed2ebfd0ec75f25de529b9d1cb64ba6c44b883437a
+MD5 7808320f8895188e61b5ef74fd093f65 songbird-bin-0.2.1.ebuild 2624
+RMD160 53c114e7010c455a49fd743bba9f13035d836ab6 songbird-bin-0.2.1.ebuild 2624
+SHA256 9b0cba7c4d368f190490d2ed2ebfd0ec75f25de529b9d1cb64ba6c44b883437a songbird-bin-0.2.1.ebuild 2624
+MISC ChangeLog 532 RMD160 ad1c615ca54ff25cd131fa6a864867ab7192b3ce SHA1 97d1ddff4649c0a4d624097bf8eeaf0b225aae9b SHA256 dda25359c862796d608bf641ad8fda768adcb03676ba873917a9c852de9763d9
+MD5 2954af49767fccf440f7b520582c0a97 ChangeLog 532
+RMD160 ad1c615ca54ff25cd131fa6a864867ab7192b3ce ChangeLog 532
+SHA256 dda25359c862796d608bf641ad8fda768adcb03676ba873917a9c852de9763d9 ChangeLog 532
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
diff --git a/media-sound/songbird-bin/songbird-bin-0.2.1.ebuild b/media-sound/songbird-bin/songbird-bin-0.2.1.ebuild
index 4235a9a77..148b60ff6 100644
--- a/media-sound/songbird-bin/songbird-bin-0.2.1.ebuild
+++ b/media-sound/songbird-bin/songbird-bin-0.2.1.ebuild
@@ -6,26 +6,21 @@ inherit eutils versionator
 
 MY_PN="Songbird"
 MY_PV="$(replace_all_version_separators _ )"
-S="${WORKDIR}/${MY_PN}"
 
-DESCRIPTION="Songbird is a desktop Web player, a digital jukebox and Web
-browser mash-up"
+DESCRIPTION="Songbird is a desktop Web player, a digital jukebox and Web browser mash-up"
 HOMEPAGE="http://www.songbirdnest.com/"
 SRC_URI="x86? ( http://download.songbirdnest.com/installer/linux/i686/${MY_PN}_${MY_PV}_linux-i686.tar.gz )
 	amd64? ( http://download.songbirdnest.com/installer/linux/x86_64/${MY_PN}_${MY_PV}_linux-x86_64.tar.gz ) "
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-RESTRICT="strip"
-DEPEND=""
+IUSE="ffmpeg dvd flac mad mpeg ogg theora vorbis"
 
-#gstreamer deps are a mix of 
+#gstreamer deps are a mix of
 # - a copy of totem and
 # - http://publicsvn.songbirdnest.com/trac/wiki/SettingUpGStreamer
 
-
-IUSE="ffmpeg dvd flac mad mpeg ogg theora vorbis"
-
 #local useflags?
 #lame? (>=media-plugins/gst-plugins-lame-0.10)
 #faad? (>=media-plugins/gst-plugins-faad-0.10)
@@ -37,43 +32,49 @@ IUSE="ffmpeg dvd flac mad mpeg ogg theora vorbis"
 # IUSE="win32codecs"
 # win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.10 )
 
+DEPEND=""
 RDEPEND="x11-libs/libXdmcp
-		x11-libs/libXau
-		x11-libs/libXfixes
-		x11-libs/libXcursor
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXext
-		x11-libs/libX11
-		>=sys-libs/glibc-2.3.2
-	 	>=x11-libs/gtk+-2.0.0
-	 	>=virtual/xft-7.0
-	 	>=virtual/libstdc++-3.3
-		x11-libs/pango
-		>=media-libs/gstreamer-0.10.1
-		>=media-libs/gst-plugins-base-0.10
-		>=media-plugins/gst-plugins-xvideo-0.10
-		>=media-plugins/gst-plugins-x-0.10
-		>=media-plugins/gst-plugins-gconf-0.10
-		>=media-plugins/gst-plugins-gnomevfs-0.10
-		>=media-libs/gst-plugins-good-0.10
-		>=media-plugins/gst-plugins-pango-0.10
-		!sparc? ( ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 ) )
-		>=media-libs/gst-plugins-ugly-0.10
-		mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 )
-		flac? ( >=media-plugins/gst-plugins-flac-0.10 )
-		mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-		!sparc? ( mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 ) )
-		ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
-		theora? (
-					>=media-plugins/gst-plugins-ogg-0.10
-					>=media-plugins/gst-plugins-theora-0.10
-				)
-		vorbis? (
-					>=media-plugins/gst-plugins-ogg-0.10
-					>=media-plugins/gst-plugins-vorbis-0.10
-				)"
+	x11-libs/libXau
+	x11-libs/libXfixes
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/pango
+	>=sys-libs/glibc-2.3.2
+	>=x11-libs/gtk+-2.0.0
+	>=virtual/xft-7.0
+	>=virtual/libstdc++-3.3
+	>=media-libs/gstreamer-0.10.1
+	>=media-libs/gst-plugins-base-0.10
+	>=media-plugins/gst-plugins-xvideo-0.10
+	>=media-plugins/gst-plugins-x-0.10
+	>=media-plugins/gst-plugins-gconf-0.10
+	>=media-plugins/gst-plugins-gnomevfs-0.10
+	>=media-libs/gst-plugins-good-0.10
+	>=media-plugins/gst-plugins-pango-0.10
+	>=media-libs/gst-plugins-ugly-0.10
+	!sparc? (
+		ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 )
+	)
+	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 )
+	flac? ( >=media-plugins/gst-plugins-flac-0.10 )
+	mad? ( >=media-plugins/gst-plugins-mad-0.10 )
+	ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
+	theora? (
+		>=media-plugins/gst-plugins-ogg-0.10
+		>=media-plugins/gst-plugins-theora-0.10
+	)
+	vorbis? (
+		>=media-plugins/gst-plugins-ogg-0.10
+		>=media-plugins/gst-plugins-vorbis-0.10
+	)"
+
+S="${WORKDIR}/${MY_PN}"
+
+RESTRICT="strip"
 
 src_install() {
 	insinto /opt/songbird