media-sound/songbird-bin: Version bump to songbird-bin 1.4.3.1438, end of development notice, thanks to all contributors on bug 139019

svn path=/sunrise/; revision=10472

6 files changed, 125 insertions, 141 deletions

diff --git a/media-sound/songbird-bin/ChangeLog b/media-sound/songbird-bin/ChangeLog
index 7a850bb1a..742b11bfb 100644
--- a/media-sound/songbird-bin/ChangeLog
+++ b/media-sound/songbird-bin/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for media-sound/songbird-bin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Apr 2010; Michael Weber (xmw) <gentoo@xmw.de>
+  -files/songbird-bin-1.0.0_rc2-symlink.patch,
+  -songbird-bin-1.2.0.1146.ebuild, +files/songbird-bin-1.2.0-symlink.patch,
+  +songbird-bin-1.4.3.1438.ebuild:
+  Version bump to songbird-bin 1.4.3.1438, end of development notice, thanks
+  to all contributors on bug 139019
+
   22 Sep 2009; Sebastian Pipping (sping) <sebastian@pipping.org>
   -songbird-bin-1.0.0.860.ebuild, +songbird-bin-1.2.0.1146.ebuild:
   Version bump to songbird-bin 1.2.0.1146
diff --git a/media-sound/songbird-bin/Manifest b/media-sound/songbird-bin/Manifest
index 6cb0b5737..e86f67617 100644
--- a/media-sound/songbird-bin/Manifest
+++ b/media-sound/songbird-bin/Manifest
@@ -1,6 +1,6 @@
-AUX songbird-bin-1.0.0_rc2-symlink.patch 855 RMD160 bb0401d9d88ece3e5fd57e3bc69fe32519404d8c SHA1 0333847515104ee216a4e8365dd7b3fd76c55810 SHA256 2b3e927e4d4ecbbe803e46e22509eb5d2dc30003da76f73848a2c99c44811239
-DIST Songbird_1.2.0-1146_linux-i686.tar.gz 17675437 RMD160 4187003d524ea8fa5170bc5d271e159246c664eb SHA1 ad3e1cd52ab730339fc13b59521d1247e260d24d SHA256 8b129fe90fed8c18a4aeca5315935a5134cec052291151f8acf8dd0ff2d44e41
-DIST Songbird_1.2.0-1146_linux-x86_64.tar.gz 19048044 RMD160 36e899155a6e338dd22f44d8bb7a58340e764d44 SHA1 2bbfbeedbe11c3a61e35052c33da9e2b06629e1d SHA256 a90e093a67bee3a176346c345684cbde3e3a0fa3c063faaf8f375977d5e78eb5
-EBUILD songbird-bin-1.2.0.1146.ebuild 3022 RMD160 7d001600e3c97b1fe25754c88fa8a87f6d9d75a6 SHA1 835ddbecc1641d1edf22731b1468ff4ba2990d6c SHA256 0ad138ce668fffd009ac1cc637ef505d538254c032dc0fd3e31e4655bf188184
-MISC ChangeLog 1802 RMD160 470906dc35db4f16ea722dfdeaeb00d53c7695bf SHA1 6e29d92624b418ca2db100189461efda0bd0ae7a SHA256 4c7d892a4a3a1201b9b366bc43630289c75f63f351bd4404d441d31e8c7abfbb
+AUX songbird-bin-1.2.0-symlink.patch 494 RMD160 75bbeecc622b4a35d9848043d38e4597f39f08f7 SHA1 d01799dcafed666c36064e2768835d6a8378d2c0 SHA256 25ea3e029882d933e779cb4515bca28d900a67a517a8b2a2f1e76338a1942e85
+DIST Songbird_1.4.3-1438_linux-i686.tar.gz 18163828 RMD160 4e1746694f2b1a1ffceec3dc78d9c8160d5109ce SHA1 f540bfebea72e2c5a6d333ed11baea19d57bb1fd SHA256 13b3606044a4099d9c54c27702415cef2883c6ad12092efda3dfd5ee7f900aae
+DIST Songbird_1.4.3-1438_linux-x86_64.tar.gz 19469332 RMD160 69c41994fa164151ab36f829224b4ab910579384 SHA1 ef69319d431bbbd2d10ad4136b98cb7c3cbc101f SHA256 31f75bdb40eb02fb2beb416fa5594cd7f7d4479abcc7ea0a9418a1f87777a35b
+EBUILD songbird-bin-1.4.3.1438.ebuild 2938 RMD160 8e910b50e56b2b635574b79d2fad24a8b8894075 SHA1 2468ac81ea6eb18d0e0d19dcfddf0a117f07aacd SHA256 8e6d2bcbf51011d54fc9916a4561d97b9ef302f6e2013a16935a15366ab2a81d
+MISC ChangeLog 2125 RMD160 e3c94187e0959f82c7898065b2dd575d0d644908 SHA1 24d3bb102abeda6eef812cd9a4f28eba0f18ef76 SHA256 3202fbe9fdf63a99501c7e5b8b75b6a623d2e373fa3f4c2943ff59f4cc0e1c26
 MISC metadata.xml 378 RMD160 8cf685d97f8f81eb8f348d44b511d66f57636d3b SHA1 07760300ac2322f33b46a71b7357b2988cca4bab SHA256 42bee0526566b874fa7c459c6a327ca466eb06f8aa820a685095bac21c60441d
diff --git a/media-sound/songbird-bin/files/songbird-bin-1.0.0_rc2-symlink.patch b/media-sound/songbird-bin/files/songbird-bin-1.0.0_rc2-symlink.patch
deleted file mode 100644
index 15b09a960..000000000
--- a/media-sound/songbird-bin/files/songbird-bin-1.0.0_rc2-symlink.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- Songbird/songbird	2008-11-13 21:33:20.000000000 +0100
-+++ Songbird/songbird	2008-11-15 01:38:51.000000000 +0100
-@@ -310,6 +310,32 @@
- 	elif [ -x "$MOZ_DIST_BIN/$MOZ_APPRUNNER_NAME" ]
- 	then
- 		MOZ_PROGRAM=$MOZ_DIST_BIN/$MOZ_APPRUNNER_NAME
-+	##
-+	## Try resolving symlinks
-+	##
-+	else
-+		here=`/bin/pwd`
-+		progname="$0"
-+		while [ -h "$progname" ]; do
-+			bn=`basename "$progname"`
-+			cd `dirname "$progname"`
-+			progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' `
-+			progbase=`basename "$progname"`
-+			if [ ! -x "$progname" ]; then
-+				break
-+			fi
-+			curdir=`dirname "$progname"`
-+			run_moz="$curdir/songbird-bin"
-+			echo run_moz: $run_moz
-+			if [ -x "$run_moz" ]; then
-+				cd "$curdir"
-+				MOZ_DIST_BIN=`/bin/pwd`
-+				MOZ_PROGRAM=$MOZ_DIST_BIN/songbird-bin
-+				echo xx $MOZ_PROGRAM
-+				break
-+			fi
-+		done
-+		cd "$here"
- 	fi
- fi
- #
-
diff --git a/media-sound/songbird-bin/files/songbird-bin-1.2.0-symlink.patch b/media-sound/songbird-bin/files/songbird-bin-1.2.0-symlink.patch
new file mode 100644
index 000000000..12b198569
--- /dev/null
+++ b/media-sound/songbird-bin/files/songbird-bin-1.2.0-symlink.patch
@@ -0,0 +1,17 @@
+diff -Naru o/Songbird/songbird n/Songbird/songbird
+--- Songbird/songbird	2009-03-09 23:03:30.000000000 +0100
++++ Songbird/songbird	2009-03-17 11:05:34.000000000 +0100
+@@ -324,11 +324,11 @@
+ 			break
+ 		fi
+ 		curdir=`dirname "$progname"`
+-		run_moz="$curdir/$MOZ_DEFAULT_NAME"
++		run_moz="$curdir/songbird-bin"
+ 		if [ -x "$run_moz" ]; then
+ 			cd "$curdir"
+ 			MOZ_DIST_BIN=`pwd`
+-			MOZ_PROGRAM=$MOZ_DIST_BIN/$MOZ_DEFAULT_NAME
++			MOZ_PROGRAM=$MOZ_DIST_BIN/songbird-bin
+ 			break
+ 		fi
+ 	done
diff --git a/media-sound/songbird-bin/songbird-bin-1.2.0.1146.ebuild b/media-sound/songbird-bin/songbird-bin-1.2.0.1146.ebuild
deleted file mode 100644
index b6583479e..000000000
--- a/media-sound/songbird-bin/songbird-bin-1.2.0.1146.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils versionator
-
-MY_PN="Songbird"
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="A multimedia player, inspired by iTunes"
-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="~amd64 ~x86"
-IUSE="alsa esd faac faad ffmpeg flac gnome jpeg lame mpeg musepack ogg oss speex theora ugly vorbis"
-
-RDEPEND="alsa? ( media-plugins/gst-plugins-alsa )
-	esd?  ( media-plugins/gst-plugins-esd )
-	faac? ( media-plugins/gst-plugins-faac )
-	faad? ( media-plugins/gst-plugins-faad )
-	ffmpeg? ( media-plugins/gst-plugins-ffmpeg )
-	flac? ( media-plugins/gst-plugins-flac )
-	gnome? ( media-plugins/gst-plugins-gconf
-		media-plugins/gst-plugins-gnomevfs )
-	jpeg? ( media-plugins/gst-plugins-jpeg )
-	lame? ( media-plugins/gst-plugins-lame )
-	mpeg? ( media-plugins/gst-plugins-mpeg2dec )
-	musepack? ( media-plugins/gst-plugins-musepack )
-	ogg? ( media-plugins/gst-plugins-ogg )
-	oss?  ( media-plugins/gst-plugins-oss )
-	speex? ( media-plugins/gst-plugins-speex )
-	theora? ( media-plugins/gst-plugins-ogg
-		media-plugins/gst-plugins-theora )
-	ugly?  ( media-libs/gst-plugins-ugly )
-	vorbis? ( media-plugins/gst-plugins-ogg
-		media-plugins/gst-plugins-vorbis )
-	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
-	x11-libs/pango
-	dev-libs/liboil
-	media-libs/gstreamer
-	media-libs/gst-plugins-base
-	media-plugins/gst-plugins-x
-	media-plugins/gst-plugins-xvideo
-	media-plugins/gst-plugins-mad
-	>=net-misc/neon-0.26.4
-	media-plugins/gst-plugins-neon
-	>=sys-libs/glibc-2.3.2
-	>=x11-libs/gtk+-2.0.0
-	x11-libs/libXft"
-
-S=${WORKDIR}/${MY_PN}
-
-RESTRICT="strip"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-1.0.0_rc2-symlink.patch
-}
-
-src_install() {
-	insinto /opt/songbird
-	doins -r *
-	fperms 755 /opt/songbird/songbird
-	fperms 755 /opt/songbird/songbird-bin
-	dosym /opt/songbird/songbird /opt/bin/songbird-bin
-
-	newicon "${S}"/chrome/icons/default/default.xpm ${PN}.xpm
-	make_desktop_entry ${PN} ${PN} ${PN}.xpm "AudioVideo;Player"
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Songbird is still under development!"
-	ewarn "This ebuild is not supported by Gentoo, so"
-	ewarn "please do not send any bugs at Gentoo's bugzilla."
-	einfo "If you need help, find it there:"
-	einfo "http://tnij.org/songbird-community"
-	einfo "or"
-	einfo "http://tnij.org/songbird-at-fgo"
-	einfo ""
-	einfo "If You need other music/video plugins, look at"
-	einfo "Your portage tree into media-plugins/gst-plugins-*,"
-	einfo "but remember, that not all plugins are supported yet."
-	einfo ""
-	einfo "If You don't want too much deps on it package,"
-	einfo "disable gnome support"
-	echo
-}
diff --git a/media-sound/songbird-bin/songbird-bin-1.4.3.1438.ebuild b/media-sound/songbird-bin/songbird-bin-1.4.3.1438.ebuild
new file mode 100644
index 000000000..9232b9a31
--- /dev/null
+++ b/media-sound/songbird-bin/songbird-bin-1.4.3.1438.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils versionator
+
+MY_PN="Songbird"
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="A multimedia player, inspired by iTunes"
+HOMEPAGE="http://www.songbirdnest.com/"
+SRC_URI="amd64? (
+http://download.songbirdnest.com/installer/linux/x86_64/${MY_PN}_${MY_PV}_linux-x86_64.tar.gz  )
+	x86? ( http://download.songbirdnest.com/installer/linux/i686/${MY_PN}_${MY_PV}_linux-i686.tar.gz ) "
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa esd faac faad ffmpeg flac gnome jpeg lame mpeg musepack ogg oss speex theora ugly vorbis"
+
+RDEPEND="dev-libs/liboil
+	media-libs/gst-plugins-base
+	media-libs/gstreamer
+	media-plugins/gst-plugins-mad
+	media-plugins/gst-plugins-neon
+	media-plugins/gst-plugins-x
+	media-plugins/gst-plugins-xvideo
+	net-misc/neon
+	sys-libs/glibc
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/pango
+	alsa? ( media-plugins/gst-plugins-alsa )
+	esd?  ( media-plugins/gst-plugins-esd )
+	faac? ( media-plugins/gst-plugins-faac )
+	faad? ( media-plugins/gst-plugins-faad )
+	ffmpeg? ( media-plugins/gst-plugins-ffmpeg )
+	flac? ( media-plugins/gst-plugins-flac )
+	gnome? ( media-plugins/gst-plugins-gconf
+		media-plugins/gst-plugins-gnomevfs )
+	jpeg? ( media-plugins/gst-plugins-jpeg )
+	lame? ( media-plugins/gst-plugins-lame )
+	mpeg? ( media-plugins/gst-plugins-mpeg2dec )
+	musepack? ( media-plugins/gst-plugins-musepack )
+	ogg? ( media-plugins/gst-plugins-ogg
+		theora? ( media-plugins/gst-plugins-theora )
+		vorbis? ( media-plugins/gst-plugins-vorbis )
+	)
+	oss? ( media-plugins/gst-plugins-oss )
+	speex? ( media-plugins/gst-plugins-speex )
+	ugly?  ( media-libs/gst-plugins-ugly )"
+
+S=${WORKDIR}/${MY_PN}
+
+RESTRICT="strip"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.0-symlink.patch"
+}
+
+src_install() {
+	einfo "unbundling gst, theora and vorbis libs"
+	find lib \( \
+		-name "libgst*" -o -name "libtheora*" -o \
+		-name "libvorbis*" -o -name "libogg*" -o \
+		-name "libFLAC*" \) -delete || die
+	insinto /opt/songbird
+	doins -r * || die
+	fperms 755 /opt/songbird/songbird || die
+	fperms 755 /opt/songbird/songbird-bin || die
+	dosym /opt/songbird/songbird /opt/bin/songbird-bin || die
+
+	newicon "${S}"/chrome/icons/default/default.xpm ${PN}.xpm || die
+	make_desktop_entry ${PN} ${PN} ${PN}.xpm "AudioVideo;Player"
+}
+
+pkg_postinst() {
+	einfo "The Linux branch of songbird is no longer under active development,"
+	einfo "bug 139019 is RESOLVED/WONTFIX according to this. Please see"
+	einfo "http://blog.songbirdnest.com/2010/04/02/songbird-singing-a-new-tune/"
+	einfo "for details."
+	einfo "If you need other music/video plugins, search for"
+	einfo "media-plugins/gst-plugins-*, but some might not be supported."
+}