media-tv/zattoo-bin: Version bump, thanks go to lubomir, he did the tests

svn path=/sunrise/; revision=7211

4 files changed, 71 insertions, 61 deletions

diff --git a/media-tv/zattoo-bin/ChangeLog b/media-tv/zattoo-bin/ChangeLog
index bed0bf7fa..90038c041 100644
--- a/media-tv/zattoo-bin/ChangeLog
+++ b/media-tv/zattoo-bin/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Oct 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -zattoo-bin-3.1.0.11060.ebuild, +zattoo-bin-3.3.0.17284.ebuild:
+  Version bump, thanks go to lubomir, he did the tests
+
   01 Apr 2008; Felix Bechstein (flx\) <f@ub0r.de>
   -zattoo-bin-3.0.8.9191.ebuild, +zattoo-bin-3.1.0.11060.ebuild:
   version bump for zattoo-bin
diff --git a/media-tv/zattoo-bin/Manifest b/media-tv/zattoo-bin/Manifest
index 52290a0b9..03875f4d3 100644
--- a/media-tv/zattoo-bin/Manifest
+++ b/media-tv/zattoo-bin/Manifest
@@ -1,4 +1,4 @@
-DIST zattoo-3.1.0.11060-i386.tgz 5921463 RMD160 13a24d066d46fa5160628ecb782312ac114e5bca SHA1 4f09df1c66f8921dbc980cd9dd0ff437639510e3 SHA256 acb8f42bcc245b27260d96d7b056bcade39dd761597e8e579be3a1c44fb28a52
-EBUILD zattoo-bin-3.1.0.11060.ebuild 1687 RMD160 76b5da94cd2452879c858c5200c929f38f23dde3 SHA1 8bbd9109454cb4ec106146044e5325300ea66473 SHA256 c5a21b967c81c1173a7d441600e567d7e2ce19f6ee1564387983d9dd4717ef20
-MISC ChangeLog 1833 RMD160 d9a2ac469cbe748d7ebc323bfb914ec2a37ab0f4 SHA1 7b8fb711a25a5139ee8cccd20142f1f8c72fc449 SHA256 b0f1f32d0e8befd823e5bf0c53c6a83aea5ac1eda7dc1bf8023a42b01e8b4817
+DIST zattoo-3.3.0.17284-i386.tgz 2265427 RMD160 7d27d51eb31b2725ca677b83e2769f916af7f30f SHA1 b9aacaba933e1672b01b18dc41bce34600336fc5 SHA256 437cdf0d9f447f485fba9ad54ba71c47e5f2bde2589457f797e9bb9566d0c4ee
+EBUILD zattoo-bin-3.3.0.17284.ebuild 1918 RMD160 e2ced10b65b39fdd54b92c052955d6189cdae2d3 SHA1 2796c02fe861367c95f3f122089749a6f29a1387 SHA256 01f454a805b3849381f766979c0edeb55321f654674317cd517471e3b0d14026
+MISC ChangeLog 2014 RMD160 085f2f3b71dda734308a886749824bbe1b5f160f SHA1 fada3afcd0d5d8278714b3a79985e0fb86ba77c9 SHA256 210d96ff229046b8387ed05d686a3356d6e46f22314e2f1ca26f7c313b135e44
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/media-tv/zattoo-bin/zattoo-bin-3.1.0.11060.ebuild b/media-tv/zattoo-bin/zattoo-bin-3.1.0.11060.ebuild
deleted file mode 100644
index 4898f5025..000000000
--- a/media-tv/zattoo-bin/zattoo-bin-3.1.0.11060.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-MY_P=${PN/-bin}-${PV}
-
-DESCRIPTION="live TV via Internet"
-HOMEPAGE="http://zattoo.com/"
-SRC_URI="http://download.zattoo.com/${MY_P}-i386.tgz"
-
-LICENSE="Zattoo"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-#NOTE: As there is no real documentation, I don't know
-#      exactly what dependancies are needed.
-#      These are just the ones I came across:
-DEPEND=""
-RDEPEND=">=sys-libs/glibc-2.4
-	x11-libs/gtkglext
-	net-libs/libgssglue
-	app-crypt/mit-krb5
-	gnome-base/libgnome
-	gnome-base/libgnomeui
-	media-libs/alsa-lib
-	net-dns/libidn
-	net-libs/xulrunner
-	net-www/netscape-flash
-	dev-libs/nspr
-	dev-libs/openssl"
-
-RESTRICT="fetch mirror strip"
-QA_TEXTRELS="usr/lib/zattoo/*"
-
-S=${WORKDIR}/dist
-
-src_install() {
-	dobin usr/bin/zattoo_player usr/bin/zattood
-	insinto /usr/lib/zattoo
-	doins usr/lib/zattoo/*
-	insinto /usr/share/zattoo_player
-	doins -r usr/share/zattoo_player/*
-	domenu usr/share/applications/zattoo_player.desktop
-
-	dosym /usr/lib/xulrunner/libgtkembedmoz.so /usr/lib/zattoo/libgtkembedmoz.so.0d
-	dosym /usr/lib/xulrunner/libmozjs.so /usr/lib/zattoo/libmozjs.so.0d
-	dosym /usr/lib/nspr/libnspr4.so /usr/lib/zattoo/libnspr4.so.0d
-	dosym /usr/lib/nspr/libplc4.so /usr/lib/zattoo/libplc4.so.0d
-	dosym /usr/lib/nspr/libplds4.so /usr/lib/zattoo/libplds4.so.0d
-	dosym /usr/lib/xulrunner/libxpcom.so /usr/lib/zattoo/libxpcom.so.0d
-	dosym /usr/lib/xulrunner/libxul.so /usr/lib/zattoo/libxul.so.0d
-
-	dosym /opt/netscape/plugins/flashplayer.xpt /usr/lib/zattoo/flashplayer.xpt
-	dosym /opt/netscape/plugins/libflashplayer.so /usr/lib/zattoo/libflashplayer.so
-}
diff --git a/media-tv/zattoo-bin/zattoo-bin-3.3.0.17284.ebuild b/media-tv/zattoo-bin/zattoo-bin-3.3.0.17284.ebuild
new file mode 100644
index 000000000..f527a85fa
--- /dev/null
+++ b/media-tv/zattoo-bin/zattoo-bin-3.3.0.17284.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="live TV via Internet"
+HOMEPAGE="http://zattoo.com/"
+SRC_URI="http://download.zattoo.com/${PN/-bin}-${PV}-i386.tgz"
+
+LICENSE="Zattoo"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="app-crypt/mit-krb5
+	dev-libs/nspr
+	dev-libs/openssl
+	gnome-base/libgnome
+	gnome-base/libgnomeui
+	media-libs/alsa-lib
+	net-dns/libidn
+	net-libs/libgssglue
+	<net-libs/xulrunner-1.9
+	net-misc/curl
+	net-www/netscape-flash
+	>=sys-libs/glibc-2.4
+	x11-libs/gtkglext"
+
+RESTRICT="fetch"
+
+S=${WORKDIR}/dist
+
+QA_EXECSTACK="opt/zattoo/bin/zattood
+	opt/zattoo/bin/zattoo_player"
+
+pkg_nofetch() {
+	einfo "Due to license reasons download manually ${SRC_URI} to ${DISTDIR}"
+}
+
+src_install() {
+	echo "LD_LIBRARY_PATH=\"/opt/zattoo/lib\" /opt/zattoo/bin/zattoo_player">zattoo
+	dobin zattoo || die
+	into /opt/zattoo
+	dobin usr/bin/zattoo{d,_player,-uri-handler} || die
+	newlib.so usr/lib/zattoo/libfaad.so.0.0.0  libfaad.so.0 || die
+	sed -i "s:/usr/bin/zattoo_player:/usr/bin/zattoo:g"  usr/share/applications/zattoo_player.desktop
+	domenu usr/share/applications/zattoo_player.desktop
+
+	insinto /usr/share/
+	doins -r usr/share/{locale,zattoo_player}
+
+	dosym ../../../usr/lib/xulrunner/libgtkembedmoz.so /opt/zattoo/lib/libgtkembedmoz.so.0d
+	dosym ../../../usr/lib/xulrunner/libmozjs.so /opt/zattoo/lib/libmozjs.so.0d
+	dosym ../../../usr/lib/nspr/libnspr4.so /opt/zattoo/lib/libnspr4.so.0d
+	dosym ../../../usr/lib/nspr/libplc4.so /opt/zattoo/lib/libplc4.so.0d
+	dosym ../../../usr/lib/nspr/libplds4.so /opt/zattoo/lib/libplds4.so.0d
+	dosym ../../../usr/lib/xulrunner/libxpcom.so /opt/zattoo/lib/libxpcom.so.0d
+	dosym ../../../usr/lib/xulrunner/libxul.so /opt/zattoo/lib/libxul.so.0d
+	dosym ../../../usr/lib/libcurl.so /opt/zattoo/lib/libcurl.so.3
+	elog " "
+	elog "just enter zattoo to run the player"
+	elog " "
+}