[gentoo-commits] dev/johu:master commit in: media-tv/tvbrowser/

[Johannes Huber]

commit:     96e74e1574af3b54f5454174ec39e0125011cf70
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  7 23:03:28 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 23:03:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=96e74e15

[media-tv/tvbrowser] Cleanup.

(Portage version: 2.2.0_alpha85/git/Linux i686, unsigned Manifest commit)

---
 media-tv/tvbrowser/tvbrowser-3.1.ebuild |   68 +++++++++++++------------------
 1 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/media-tv/tvbrowser/tvbrowser-3.1.ebuild b/media-tv/tvbrowser/tvbrowser-3.1.ebuild
index 48f723b..6b81006 100644
--- a/media-tv/tvbrowser/tvbrowser-3.1.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $ 
 
-JAVA_PKG_IUSE="doc source"
+JAVA_PKG_IUSE="doc source test"
 
 EAPI=4
 
@@ -10,10 +10,7 @@ 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/"
-
-MY_P=${PN}_${PV}
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.zip
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.zip
 
 themes? (
 	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/BeOSthemepack.zip
@@ -74,66 +71,59 @@ LICENSE="GPL-3"
 
 IUSE="themes"
 
-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/bsh
+COMMON_DEP="dev-java/bsh
 	>=dev-java/commons-codec-1.4
 	>=dev-java/commons-lang-2.4
 	>=dev-java/commons-net-1.4.1
 	>=dev-java/jakarta-oro-2.0.8
-	dev-java/l2fprod-common
-	dev-java/log4j
 	>=dev-java/jgoodies-forms-1.3.0
 	>=dev-java/jgoodies-looks-2.3.1
+	dev-java/l2fprod-common
+	dev-java/log4j
 	dev-java/skinlf
-	>=dev-java/stax-1.2.0"
-#	test? ( dev-java/junit )
-DEPEND=">=virtual/jdk-1.6
+	>=dev-java/stax-1.2.0
+	dev-java/xalan
+	x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+"
+DEPEND="${COMMON_DEP}
 	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
+	>=virtual/jdk-1.6
+	test? ( dev-java/junit:0 )
+"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6
+"
 
-S="${WORKDIR}/${MY_P/_/-}"
+# javac errors about missing junit, lets investigate this later
+RESTRICT="test"
 
 src_prepare() {
-	# 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
 
 	cd "${S}"/lib || die
-	# TODO maybe also remove jgoodies-common, someone just need to test it
 	rm -v bsh-*.jar commons-codec-*.jar commons-lang-*.jar commons-net*.jar \
 		l2fprod-common-tasks-7.3.jar skinlf-6.7.jar stax*.jar \
 		jgoodies-form*.jar jgoodies-looks*.jar || die
 
-	# TODO update this comment, it's not up to date
-	# missing dependencies htmlparser jRegistryKey opencsv texhyphj
-	# 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 bsh,commons-codec,commons-lang-2.1,commons-net,jgoodies-forms,l2fprod-common,log4j,jgoodies-looks-2.0,skinlf,stax
 
-	# Fails to create javadocs without this
-	mkdir "${S}/public" || die
+	mkdir "${S}/public" || die "failed javadoc dir"
 }
 
 src_compile() {
 	${ANT_OPTS} eant runtime-linux $(use_doc public-doc)
 }
 
-#src_test() {
-#	eant test
-#}
+src_test() {
+	java-pkg-2_src_test
+}
 
 src_install() {
 	use source && java-pkg_dosrc src