Version bumped. Bug #258280.

Package-Manager: portage-2.2_rc50/cvs/Linux i686

3 files changed, 206 insertions, 3 deletions

diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog
index 209677cdae11..38679e6330b2 100644
--- a/media-tv/tvbrowser/ChangeLog
+++ b/media-tv/tvbrowser/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/tvbrowser
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.29 2008/11/08 18:12:26 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.30 2009/11/16 10:05:00 zzam Exp $
+
+*tvbrowser-2.7.4 (16 Nov 2009)
+
+  16 Nov 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +tvbrowser-2.7.4.ebuild:
+  Version bumped. Bug #258280.
 
 *tvbrowser-2.7.1 (08 Nov 2008)
 
diff --git a/media-tv/tvbrowser/Manifest b/media-tv/tvbrowser/Manifest
index 2f8ed55e7ac6..3140dc424529 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
 AUX tvbrowser-2.2.1-makefiles.patch 3518 RMD160 c694519a6be2999e87f8d6e87d103c29cf52c3ed SHA1 b2c8a92a7c4ed02c9b3a67305a9dec4af6872175 SHA256 4e7094d7eb3495cac5689c9391bbb1bfcae16da080ef6f3dd9476a6c505d1595
 AUX tvbrowser-2.5-makefiles.patch 2244 RMD160 e50f4bcd3342bbba1dee17e64b18fc6aab5a012d SHA1 dbe98e2b92d1beef970226d5d014947ad3f9c553 SHA256 5ceafd294ebeff4bc2356d2db6abd6b74093fc53987842ddba9bc70eb45c613d
@@ -55,6 +58,7 @@ DIST tvbrowser-2.5.3-src.zip 9290454 RMD160 9138e33dd1fbe887353a8ac5eecd7e9cb7b1
 DIST tvbrowser-2.6.2-src.zip 9759998 RMD160 8ce02b6d8152213beec39f7f256abc7ea0a738ca SHA1 267df37e6caeec67129d1cb6a62df65c8f100dc3 SHA256 17cf38061c01ad1343578a7991e6dad19f7528927fbed2c8ee954b26d80e41e8
 DIST tvbrowser-2.6.3-src.zip 9760433 RMD160 4233c8f4bbaaf1a48dc991ec15fa611f906fe43a SHA1 ed71c74a8311e1d134329a4a495e11ebfd47ec72 SHA256 79f4b4b2ef1b60077bdc29f61e5adc1ef3ba19a924eedf89f40e574261a4b53c
 DIST tvbrowser-2.7.1-src.zip 9549988 RMD160 e02a639a36262a1535cb277212c39fe8240c542c SHA1 1bcf128d0c2891e05adf9b2a9b8e918bbae95032 SHA256 cc735c4663bb9ac40588c225aac90430969a0f2439b1e25581ece8101d490628
+DIST tvbrowser-2.7.4-src.zip 9594660 RMD160 5c2cd3599317896eea563b4103313b104e4618c4 SHA1 02af126677938485338a5ba1e268b2869c6a9368 SHA256 b10849f10e5771bc8eeb24ba4b2e71eefcf6d1339701247211c4e7a70aac3f6d
 DIST underlingthemepack.zip 59786 RMD160 7cbc1da5cf5e37c9fe535d6cb369ea3036c79c5e SHA1 cf3aaa4a27bf1eb2ea35d0d7fd62716b3e408f0d SHA256 67dfd8757162dce375e02c250403a7184b64fbd1c1eb754a11373467ff96eb44
 EBUILD tvbrowser-2.2.1.ebuild 2925 RMD160 7335673b8776c2da16f43a6cb63d3205a791c6be SHA1 75048a7b42047ab7a95de89ea39dc836f050008f SHA256 39da410283914d49d3c81088e9a38e28e73c04850cd66844c76bfc33c1da8bb7
 EBUILD tvbrowser-2.5-r1.ebuild 3460 RMD160 ab9495a8d17f68b59ef0e787acd651ce68d6e6ae SHA1 d6e440b581356ecd5a9080b61c523fbfa588bee0 SHA256 781b1ab3907174c4d312b3a0ef2b05c38640572b19b9578b0ba81cceccf97e8c
@@ -64,5 +68,13 @@ EBUILD tvbrowser-2.5.ebuild 3268 RMD160 c405a535f0ac5a36a14b9db6d721429fd933ba77
 EBUILD tvbrowser-2.6.2.ebuild 7692 RMD160 ec1953fc5a11a99fbcaeec9d1e18c807f853b0af SHA1 e48da681834262e60e1d619c0e28615d2bc47091 SHA256 ab7b4293a38426f43eca39ad3ac113b7f1f3277a135fea7ce824170adff8ace9
 EBUILD tvbrowser-2.6.3.ebuild 7935 RMD160 a0a8bd775a89c6e769ad13bd0480303212571bce SHA1 577a8e3168cd36507318a61b808e326511405d23 SHA256 f4547efb5baaeac6f1c60a24a29e912b1357015db457fde0a691b205c13e0848
 EBUILD tvbrowser-2.7.1.ebuild 7575 RMD160 2e591307031a95f97b938ea597333259253a27fe SHA1 46f414a0d60a541edcd12f836a058e45bd8ab95f SHA256 042cb070eec04e83c5ad524121ca47fd49d8ccd272ffcbbb574728ed373da490
-MISC ChangeLog 5543 RMD160 19a61afe7fb3c6c5b67d8297bc091ae412fb3705 SHA1 5b33e8c24b3978f0d5f75c1b753c3d2f5e25d82e SHA256 586d4440e9d7ad78c294ad307999cee18fb612614164b7e087c0fb508cfae6c3
+EBUILD tvbrowser-2.7.4.ebuild 7434 RMD160 9177abf3437e3c1ffdf1d24e50e53e091c0f48db SHA1 66fd8c88c9df0796cab901b68c49fb984f42fad9 SHA256 9d75147c62c33c5575d8f20d12e46aebc3ea7eaa60f905531a63a5d2dfad1159
+MISC ChangeLog 5687 RMD160 91ace11430204ec0673cd79fece18264af092a89 SHA1 a8ff04049450075c2a22b9348118c3387cfe98e9 SHA256 2a34243f0b4cab516697be2379ec2c44f10b8848cff8e1a560eee1a889a339b0
 MISC metadata.xml 530 RMD160 602951d7f99bc5be075a75b1f0fe8a255de35ed8 SHA1 6fc25d8cc5219c50959944e76acbfa075e2c060a SHA256 f3d75f1371da40fdc8c0ec99e4daa441320eef2ef12e2dc111c468a52ab45906
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksBI9IACgkQt2vP6XvVdOdhrACgpOlSB0S35cZsFAvw5xSlFHPb
+M7UAoNdwCxqYr3bA51wq4Lj2NHTy1IT0
+=cnDO
+-----END PGP SIGNATURE-----
diff --git a/media-tv/tvbrowser/tvbrowser-2.7.4.ebuild b/media-tv/tvbrowser/tvbrowser-2.7.4.ebuild
new file mode 100644
index 000000000000..f45e3dd1054a
--- /dev/null
+++ b/media-tv/tvbrowser/tvbrowser-2.7.4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.7.4.ebuild,v 1.1 2009/11/16 10:05:00 zzam Exp $
+
+JAVA_PKG_IUSE="doc source"
+#WANT_ANT_TASKS="ant-junit"
+
+EAPI="1"
+
+inherit eutils java-pkg-2 java-ant-2 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://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/midnightthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueBrownthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueBluethemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueGreenthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/blueTurquesathemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/gorillathemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/BeOSthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/crystal2themepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSDeepthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/chaNinja-Bluethemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/amarachthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/quickSilverRthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/gfxOasisthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/underlingthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/coronaHthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/cougarthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/royalInspiratthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/tigerthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/mmMagra-Xthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/iBarthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/solunaRthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/fatalEthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/blueMetalthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/b0sumithemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/b0sumiErgothempack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/oliveGreenLunaXPthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/silverLunaXPthemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/architectBluethemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/architectOlivethemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/hmmXPBluethemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/hmmXPMonoBluethemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/tigerGraphitethemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSBluethemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSOlivethemepack.zip
+http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusLunaSilverthemepack.zip
+http://www.tvbrowser.org/downloads/CrystalClear.zip
+http://www.tvbrowser.org/downloads/noia.zip
+http://www.tvbrowser.org/downloads/nuvola.zip
+http://www.tvbrowser.org/downloads/tulliana.zip
+)"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+COMMON_DEP="x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	>=dev-java/jgoodies-looks-2.0
+	>=dev-java/stax-1.2.0
+	dev-java/bsh
+	dev-java/l2fprod-common
+	>=dev-java/jakarta-oro-2.0
+	dev-java/skinlf
+	>=dev-java/commons-codec-1.3
+	>=dev-java/commons-net-1.4.1
+	>=dev-java/commons-lang-2.4
+	dev-java/lucene:2.3"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+LICENSE="GPL-2"
+
+IUSE="themes"
+
+src_unpack() {
+	unpack ${P}-src.zip
+	cd "${S}"
+
+	# now that's a rather nasty trick that removes exactly the lines that unjar
+	# dependencies and include them to tvbrowser's jars
+	# when bumping, check that it doesn't affect lines it shouldn't!
+	sed "/unpacked.dir/d" -i build.xml || die
+
+	# disable running of junit tests, because tvbrowserdataservice.file.ChannelListTest fails always
+	sed -i "${S}"/build.xml -e"s:, test: :"
+
+	cd "${S}"/lib || die
+	rm -v commons-net*.jar commons-lang-*.jar looks*.jar \
+		bsh*.jar l2fprod-common-tasks.jar jakarta-oro*.jar skinlf.jar \
+		commons-codec*.jar lucene-core-*.jar stax-*.jar || die
+
+	# missing dependencies commons-compress, TVAnytimeAPI, jRegistryKey, gdata-calendar,
+	# gdata-client, jcom, xtvd-lib, jgoodies-forms-1.2.0, opencsv and stax-api
+	# use local jar files for these, and also those in deployment
+	# some are win32/mac only, so we will let tvbrowser build against them (no need to patch stuff out of sources)
+	# but won't install the bundled jars, because their codepath won't be executed on linux anyway
+	java-pkg_jar-from commons-lang-2.1,commons-net,commons-codec,lucene-2.3,jgoodies-looks-2.0,bsh,l2fprod-common,skinlf,stax
+
+	# Fails to create javadocs without this
+	mkdir "${S}/public" || die
+}
+
+src_compile() {
+	eant runtime-linux $(use_doc public-doc)
+}
+
+src_install() {
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc doc
+	cd runtime/${PN}_linux || die
+
+	java-pkg_dojar ${PN}.jar
+	java-pkg_dojar "${S}"/lib/{TVAnytimeAPI.jar,commons-compress-20050911.jar,gdata-calendar-1.0.jar,gdata-client-1.0.jar,gdata-core-1.0.jar,xtvd-lib-2.0.jar,forms-1.2.0.jar,opencsv-1.8.jar}
+
+	local todir="${JAVA_PKG_SHAREPATH}"
+
+	cp -a imgs "${D}/${todir}" || die
+	cp -a icons "${D}/${todir}" || die
+	cp -a plugins "${D}/${todir}" || die
+	cp linux.properties "${D}/${todir}" || die
+
+	insinto "${todir}/themepacks"
+	doins themepacks/themepack.zip || die
+
+	if use themes; then
+		cd "${DISTDIR}"
+		doins midnightthemepack.zip \
+			roueBrownthemepack.zip \
+			roueBluethemepack.zip \
+			roueGreenthemepack.zip \
+			blueTurquesathemepack.zip \
+			gorillathemepack.zip \
+			BeOSthemepack.zip \
+			crystal2themepack.zip \
+			opusOSDeepthemepack.zip \
+			chaNinja-Bluethemepack.zip \
+			amarachthemepack.zip \
+			quickSilverRthemepack.zip \
+			gfxOasisthemepack.zip \
+			underlingthemepack.zip \
+			coronaHthemepack.zip \
+			cougarthemepack.zip \
+			royalInspiratthemepack.zip \
+			tigerthemepack.zip \
+			mmMagra-Xthemepack.zip \
+			iBarthemepack.zip \
+			solunaRthemepack.zip \
+			fatalEthemepack.zip \
+			blueMetalthemepack.zip \
+			b0sumithemepack.zip \
+			b0sumiErgothempack.zip \
+			oliveGreenLunaXPthemepack.zip \
+			silverLunaXPthemepack.zip \
+			architectBluethemepack.zip \
+			architectOlivethemepack.zip \
+			hmmXPBluethemepack.zip \
+			hmmXPMonoBluethemepack.zip \
+			tigerGraphitethemepack.zip \
+			opusOSBluethemepack.zip \
+			opusOSOlivethemepack.zip \
+			opusLunaSilverthemepack.zip || die
+		insinto "${todir}/icons"
+		doins CrystalClear.zip noia.zip nuvola.zip tulliana.zip || die
+	fi
+
+	java-pkg_dolauncher "tvbrowser" \
+		--main tvbrowser.TVBrowser \
+		--pwd ${todir} \
+		--java_args " -Dpropertiesfile=${todir}/linux.properties"
+
+	make_desktop_entry ${PN} "TV Browser" /usr/share/tvbrowser/imgs/tvbrowser128.png
+}