Now systray icon works, Bug #170364. Country options can be changed, Bug #170363. Thanks to Mirko Günther for the changes.

Package-Manager: portage-2.1.2.2

5 files changed, 199 insertions, 5 deletions

diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog
index bf09265707f2..a1b8ece11557 100644
--- a/media-tv/tvbrowser/ChangeLog
+++ b/media-tv/tvbrowser/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/tvbrowser
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.10 2007/01/30 04:45:55 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.11 2007/03/11 16:15:16 zzam Exp $
+
+*tvbrowser-2.5-r1 (11 Mar 2007)
+
+  11 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/tvbrowser-2.5_Localizer.patch, +tvbrowser-2.5-r1.ebuild:
+  Now systray icon works, Bug #170364. Country options can be changed, Bug
+  #170363. Thanks to Mirko Günther for the changes.
 
   30 Jan 2007; Steve Dibb <beandog@gentoo.org> tvbrowser-2.2.1.ebuild:
   Add ~amd64, bug 151858
diff --git a/media-tv/tvbrowser/Manifest b/media-tv/tvbrowser/Manifest
index 70e595906845..d6d780c2d5db 100644
--- a/media-tv/tvbrowser/Manifest
+++ b/media-tv/tvbrowser/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tvbrowser-2.1-makefiles.patch 3385 RMD160 dc09af2ddba09eb90657c9b61eead3e40002cd00 SHA1 836ca66cc7bd1fdd7fac5c71ba68e60b495b3d52 SHA256 e33caa5f099590fa3c0da2ccbff7189a442f12404775ee19b26319747c7613ed
 MD5 2a50d11a23b770a3d4b7b34bbaca2c36 files/tvbrowser-2.1-makefiles.patch 3385
 RMD160 dc09af2ddba09eb90657c9b61eead3e40002cd00 files/tvbrowser-2.1-makefiles.patch 3385
@@ -10,6 +13,10 @@ AUX tvbrowser-2.5-makefiles.patch 2244 RMD160 e50f4bcd3342bbba1dee17e64b18fc6aab
 MD5 52fe69030cad5afb748a9ffc01cf42a3 files/tvbrowser-2.5-makefiles.patch 2244
 RMD160 e50f4bcd3342bbba1dee17e64b18fc6aab5a012d files/tvbrowser-2.5-makefiles.patch 2244
 SHA256 5ceafd294ebeff4bc2356d2db6abd6b74093fc53987842ddba9bc70eb45c613d files/tvbrowser-2.5-makefiles.patch 2244
+AUX tvbrowser-2.5_Localizer.patch 582 RMD160 f4819fef17b1d5c639d271c38b126598f75af9e9 SHA1 87c323f13d8465c9cb9dd8f962441db9b859cb51 SHA256 19ef0fc4ccbea0dab3fe014022402a0ccda09c191adf5bffb470f6e8f96a32b9
+MD5 44680445916b2e138444ca5b0973145b files/tvbrowser-2.5_Localizer.patch 582
+RMD160 f4819fef17b1d5c639d271c38b126598f75af9e9 files/tvbrowser-2.5_Localizer.patch 582
+SHA256 19ef0fc4ccbea0dab3fe014022402a0ccda09c191adf5bffb470f6e8f96a32b9 files/tvbrowser-2.5_Localizer.patch 582
 AUX tvbrowser-2.5_buildxml.patch 2333 RMD160 76810c14672c13fdd3f71c71fadb37309154e4ef SHA1 7b8c75598a4b36bb4d706f4cb49445b97d75057f SHA256 0b0cefbfcf6029165c267ab32d0c6147289d355491f989f01e3e63f686e3de74
 MD5 4aab200a74118131175771529bc2ccad files/tvbrowser-2.5_buildxml.patch 2333
 RMD160 76810c14672c13fdd3f71c71fadb37309154e4ef files/tvbrowser-2.5_buildxml.patch 2333
@@ -30,14 +37,18 @@ EBUILD tvbrowser-2.2.1.ebuild 2938 RMD160 20d463c38e3e4639ea558ebbf670acb7ae108e
 MD5 9959fea7c5aee007963796cc0d8be5aa tvbrowser-2.2.1.ebuild 2938
 RMD160 20d463c38e3e4639ea558ebbf670acb7ae108e40 tvbrowser-2.2.1.ebuild 2938
 SHA256 28701a007fa2687a7d75408c16ec43c40fd793cea2c515c5c621a8daa0668877 tvbrowser-2.2.1.ebuild 2938
+EBUILD tvbrowser-2.5-r1.ebuild 3458 RMD160 878d3d0b015711d358e5af61fed86a1fd87f7777 SHA1 109c0cacc5958df7532c9dd3d5502180f6e6e997 SHA256 a0bbf99459751560f42b3d556a05f67669ca0c10adf72859b5446a4b7689c281
+MD5 ef7313a5be60b01fd2ddffbc102c4081 tvbrowser-2.5-r1.ebuild 3458
+RMD160 878d3d0b015711d358e5af61fed86a1fd87f7777 tvbrowser-2.5-r1.ebuild 3458
+SHA256 a0bbf99459751560f42b3d556a05f67669ca0c10adf72859b5446a4b7689c281 tvbrowser-2.5-r1.ebuild 3458
 EBUILD tvbrowser-2.5.ebuild 3269 RMD160 7f99c310e0eddbc87b938c1ea2dc8ce9a8ecf442 SHA1 31a6b72048a5a9af4aec04f39a466a70abe3e72b SHA256 ed13f112b24db4e19c7940fd6d7ca08a02316c96d04a9309792190640fc2753e
 MD5 be7b8235f127b19374bb91e024c5dd8b tvbrowser-2.5.ebuild 3269
 RMD160 7f99c310e0eddbc87b938c1ea2dc8ce9a8ecf442 tvbrowser-2.5.ebuild 3269
 SHA256 ed13f112b24db4e19c7940fd6d7ca08a02316c96d04a9309792190640fc2753e tvbrowser-2.5.ebuild 3269
-MISC ChangeLog 2246 RMD160 63b6b3f047fc3e05bd47207129f7bdd6c1983c18 SHA1 a25985f17f4cc909bc7e1a4bee7848ef5acd639d SHA256 85c62a91f7ce577b37081c21435d8dfe9f904ffae61b0500a6c3670a9c8fc439
-MD5 a3e8a4ce5dd075662191eb0994021925 ChangeLog 2246
-RMD160 63b6b3f047fc3e05bd47207129f7bdd6c1983c18 ChangeLog 2246
-SHA256 85c62a91f7ce577b37081c21435d8dfe9f904ffae61b0500a6c3670a9c8fc439 ChangeLog 2246
+MISC ChangeLog 2524 RMD160 b17c9a46b36f7ab2c4660aeec436bd467efbfa31 SHA1 4cc49230c21ec802390275c56e0515c5dbec7bb4 SHA256 dd1d89214e8d4107f352bf6079ec9d3e15584143750c9b0cd77dc9e3caf3e3e9
+MD5 5ff941099697e2d82e88c8083cfedfbb ChangeLog 2524
+RMD160 b17c9a46b36f7ab2c4660aeec436bd467efbfa31 ChangeLog 2524
+SHA256 dd1d89214e8d4107f352bf6079ec9d3e15584143750c9b0cd77dc9e3caf3e3e9 ChangeLog 2524
 MISC metadata.xml 395 RMD160 a22f8ae33da65ccc0ff251b07c15adafd6c1e615 SHA1 5589ca30d70f5334e2003b17f7594d4a283a280b SHA256 d51789b8a015ccbfd70a9b6ba7ca2e8e5022d9d67e008a96f7920fe93f16ff88
 MD5 4c44116c92d8282ca90875480b20a362 metadata.xml 395
 RMD160 a22f8ae33da65ccc0ff251b07c15adafd6c1e615 metadata.xml 395
@@ -51,3 +62,13 @@ SHA256 fc70e99e069aedc9fb22663048ea97fa19354b6ca710828474511266faad8ab5 files/di
 MD5 76bc03e5e93fb8cad40e4bad9887764b files/digest-tvbrowser-2.5 479
 RMD160 705415ee3ec009d874f6509a93dc04b4d9c90812 files/digest-tvbrowser-2.5 479
 SHA256 cdf4ac7a77d4ddaef54024266241e8731fcbd27348b4d055af262dbe2e992152 files/digest-tvbrowser-2.5 479
+MD5 76bc03e5e93fb8cad40e4bad9887764b files/digest-tvbrowser-2.5-r1 479
+RMD160 705415ee3ec009d874f6509a93dc04b4d9c90812 files/digest-tvbrowser-2.5-r1 479
+SHA256 cdf4ac7a77d4ddaef54024266241e8731fcbd27348b4d055af262dbe2e992152 files/digest-tvbrowser-2.5-r1 479
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFF9Csct2vP6XvVdOcRAmjgAJ4tE6vMcZoG8uvq1CXPZkDSf2h1AgCfe50J
+CZxoiqs+8FV2ig9cfX1702A=
+=PzhZ
+-----END PGP SIGNATURE-----
diff --git a/media-tv/tvbrowser/files/digest-tvbrowser-2.5-r1 b/media-tv/tvbrowser/files/digest-tvbrowser-2.5-r1
new file mode 100644
index 000000000000..5eaf2ca3a1f3
--- /dev/null
+++ b/media-tv/tvbrowser/files/digest-tvbrowser-2.5-r1
@@ -0,0 +1,6 @@
+MD5 672a2f53c54511ced3f796c65a9183f7 allthemepacks.zip 210954
+RMD160 6d456534bd504c98eb57ff39876ee2c2ffabee70 allthemepacks.zip 210954
+SHA256 602d229f734c2fa3e2984a2d86faf6c1825d6db56329b00ce25ba1a2eb5b64b7 allthemepacks.zip 210954
+MD5 a37f6a90cbe52077308649da4dcfe8ae tvbrowser-2.5-src.zip 8865427
+RMD160 2f47f2a9d56f9fac26dae77f6f34dac06bd17b7d tvbrowser-2.5-src.zip 8865427
+SHA256 f2f60303a5600dd3bcd94dc681f469f9e0e6e408581db4eccc2bad3cbdbb3c7a tvbrowser-2.5-src.zip 8865427
diff --git a/media-tv/tvbrowser/files/tvbrowser-2.5_Localizer.patch b/media-tv/tvbrowser/files/tvbrowser-2.5_Localizer.patch
new file mode 100644
index 000000000000..f3065dcf9504
--- /dev/null
+++ b/media-tv/tvbrowser/files/tvbrowser-2.5_Localizer.patch
@@ -0,0 +1,12 @@
+diff -ru tvbrowser-2.5-orig/src/util/ui/Localizer.java tvbrowser-2.5/src/util/ui/Localizer.java
+--- tvbrowser-2.5-orig/src/util/ui/Localizer.java	2007-03-11 17:03:17.662679355 +0100
++++ tvbrowser-2.5/src/util/ui/Localizer.java	2007-03-11 17:03:39.741495254 +0100
+@@ -348,7 +348,7 @@
+       langArray.add(Locale.ENGLISH);

+       

+       // First Step: look into tvbrowser.jar

+-      JarFile file = new JarFile(new File("tvbrowser.jar"));

++      JarFile file = new JarFile(new File("lib/tvbrowser.jar"));

+       

+       Enumeration<JarEntry> entries = file.entries();

+       

diff --git a/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild b/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild
new file mode 100644
index 000000000000..3726fc31064c
--- /dev/null
+++ b/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5-r1.ebuild,v 1.1 2007/03/11 16:15:16 zzam Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils java-pkg-2 java-ant-2 autotools flag-o-matic
+
+DESCRIPTION="Themeable and easy to use TV Guide - written in Java"
+HOMEPAGE="http://www.tvbrowser.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip
+themes? ( http://www.tvbrowser.org/downloads/themepacks/allthemepacks.zip )"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+# missing dependencies commons-compress, TVAnytimeAPI, jRegistryKey , gdata-calendar, gdata-client and jcom
+
+RDEPEND="|| ( ( x11-libs/libXt
+			x11-libs/libSM
+			x11-libs/libICE
+			x11-libs/libXext
+			x11-libs/libXtst
+			x11-libs/libX11
+			x11-libs/libXau
+			x11-libs/libXdmcp
+		)
+		virtual/x11
+	)
+	>=virtual/jre-1.5
+	dev-java/junit
+	dev-java/commons-net
+	>=dev-java/jgoodies-forms-1.0.7
+	>=dev-java/jgoodies-looks-2.0
+	>=dev-java/bsh-2.0_beta1
+	dev-java/skinlf
+	dev-java/l2fprod-common"
+
+DEPEND=">=virtual/jdk-1.5
+	${RDEPEND}
+	>=dev-java/ant-core-1.5.4
+	app-arch/unzip
+	source? ( app-arch/zip )"
+
+LICENSE="GPL-2"
+
+IUSE="doc themes source"
+
+src_unpack() {
+	unpack ${P}-src.zip
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-makefiles.patch
+	epatch ${FILESDIR}/${P}_noWin32.patch
+	epatch ${FILESDIR}/${P}_buildxml.patch
+
+	#fix bug #170363
+	epatch ${FILESDIR}/${P}_Localizer.patch
+
+	# missing commons-compress, gdata-calendar, gdata-client
+	rm -r ${S}/src/calendarexportplugin
+	rm -r ${S}/src/bbcbackstagedataservice
+
+	local J_ARCH
+	case "${ARCH}" in
+		x86)	J_ARCH=i386 ;;
+		amd64)	J_ARCH=amd64 ;;
+		*) die "not supported arch for this ebuild" ;;
+	esac
+
+	sed -i ${S}/deployment/x11/src/Makefile.am \
+		-e "s-/lib/i386/-/lib/${J_ARCH}/-"
+
+	cd ${S}/lib
+	rm *.jar
+
+	java-pkg_jar-from junit
+	java-pkg_jar-from commons-net
+	java-pkg_jar-from jgoodies-forms forms.jar forms-1.0.7.jar
+	java-pkg_jar-from jgoodies-looks-2.0 looks.jar looks-2.0.4.jar
+	java-pkg_jar-from bsh bsh.jar bsh-2.0b1.jar
+	java-pkg_jar-from skinlf
+	java-pkg_jar-from l2fprod-common l2fprod-common-tasks.jar
+
+	#fix bug #170364
+	cd ${S}/deployment/x11
+	chmod u+x configure
+	rm src/libDesktopIndicator.so
+
+	# converting to unix line-endings
+	edos2unix missing depcomp
+
+	eautoreconf
+}
+
+src_compile() {
+	local antflags="runtime-linux"
+	use doc && antflags="${antflags} public-doc"
+	cd ${S}
+	mkdir public
+	eant ${antflags}
+
+	# second part: DesktopIndicator
+	cd ${S}/deployment/x11
+	append-flags -fPIC
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dohtml -r doc/*
+	cd runtime/${PN}_linux
+
+	java-pkg_dojar ${PN}.jar
+
+	local todir="/usr/share/${PN}"
+	if [ ${SLOT}q != "0q" ] ; then
+		todir="${todir}-${SLOT}"
+	fi
+
+	cp -a imgs ${D}/${todir}
+	cp -a icons ${D}/${todir}
+	cp -a plugins ${D}/${todir}
+	cp linux.properties ${D}/${todir}
+
+	insinto "/usr/share/${PN}/themepacks"
+	doins themepacks/themepack.zip
+
+	if use themes; then
+		cd "${D}/usr/share/${PN}/themepacks"
+		unpack allthemepacks.zip
+	fi
+
+	java-pkg_dolauncher "tvbrowser" \
+		--jar ${todir}/lib/tvbrowser.jar \
+		--pwd ${todir} \
+		--java_args "-Djava.library.path=${todir} -Dpropertiesfile=${todir}/linux.properties"
+
+	cp ${S}/deployment/x11/src/libDesktopIndicator.so ${D}/${todir}
+}
+
+pkg_postinst() {
+	elog
+	elog "If you want Systray you have to use a jre >= 1.5 !"
+	elog
+}