From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Ruu0u-0006uu-72 for garchives@archives.gentoo.org; Tue, 07 Feb 2012 22:59:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D25FE05C1; Tue, 7 Feb 2012 22:59:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3B8B5E05C1 for ; Tue, 7 Feb 2012 22:59:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B4821B4011 for ; Tue, 7 Feb 2012 22:59:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EBF9B80044 for ; Tue, 7 Feb 2012 22:59:40 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <96e74e1574af3b54f5454174ec39e0125011cf70.johu@gentoo> Subject: [gentoo-commits] dev/johu:master commit in: media-tv/tvbrowser/ X-VCS-Repository: dev/johu X-VCS-Files: media-tv/tvbrowser/tvbrowser-3.1.ebuild X-VCS-Directories: media-tv/tvbrowser/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 96e74e1574af3b54f5454174ec39e0125011cf70 Date: Tue, 7 Feb 2012 22:59:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4239e134-f4bc-4bcb-b9ef-e9e00508b1ff X-Archives-Hash: 044eed5703cf159b4f7d5a4d01efdef8 commit: 96e74e1574af3b54f5454174ec39e0125011cf70 Author: Johannes Huber gentoo org> AuthorDate: Tue Feb 7 23:03:28 2012 +0000 Commit: Johannes Huber gentoo org> CommitDate: Tue Feb 7 23:03:28 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/johu.git;a=3Dc= ommit;h=3D96e74e15 [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: $=20 =20 -JAVA_PKG_IUSE=3D"doc source" +JAVA_PKG_IUSE=3D"doc source test" =20 EAPI=3D4 =20 @@ -10,10 +10,7 @@ inherit eutils java-pkg-2 java-ant-2 flag-o-matic =20 DESCRIPTION=3D"Themeable and easy to use TV Guide - written in Java" HOMEPAGE=3D"http://www.tvbrowser.org/" - -MY_P=3D${PN}_${PV} - -SRC_URI=3D"mirror://sourceforge/${PN}/${MY_P}_src.zip +SRC_URI=3D"mirror://sourceforge/${PN}/${P/-/_}_src.zip =20 themes? ( http://javootoo.l2fprod.com/plaf/skinlf/themepacks/BeOSthemepack.zip @@ -74,66 +71,59 @@ LICENSE=3D"GPL-3" =20 IUSE=3D"themes" =20 -COMMON_DEP=3D"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=3D"dev-java/bsh >=3Ddev-java/commons-codec-1.4 >=3Ddev-java/commons-lang-2.4 >=3Ddev-java/commons-net-1.4.1 >=3Ddev-java/jakarta-oro-2.0.8 - dev-java/l2fprod-common - dev-java/log4j >=3Ddev-java/jgoodies-forms-1.3.0 >=3Ddev-java/jgoodies-looks-2.3.1 + dev-java/l2fprod-common + dev-java/log4j dev-java/skinlf - >=3Ddev-java/stax-1.2.0" -# test? ( dev-java/junit ) -DEPEND=3D">=3Dvirtual/jdk-1.6 + >=3Ddev-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=3D"${COMMON_DEP} app-arch/unzip - ${COMMON_DEP}" -RDEPEND=3D">=3Dvirtual/jre-1.6 - ${COMMON_DEP}" + >=3Dvirtual/jdk-1.6 + test? ( dev-java/junit:0 ) +" +RDEPEND=3D"${COMMON_DEP} + >=3Dvirtual/jre-1.6 +" =20 -S=3D"${WORKDIR}/${MY_P/_/-}" +# javac errors about missing junit, lets investigate this later +RESTRICT=3D"test" =20 src_prepare() { - # now that's a rather nasty trick that removes exactly the lines that u= njar - # 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 =20 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 =20 - # 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,jgoodi= es-forms,l2fprod-common,log4j,jgoodies-looks-2.0,skinlf,stax =20 - # Fails to create javadocs without this - mkdir "${S}/public" || die + mkdir "${S}/public" || die "failed javadoc dir" } =20 src_compile() { ${ANT_OPTS} eant runtime-linux $(use_doc public-doc) } =20 -#src_test() { -# eant test -#} +src_test() { + java-pkg-2_src_test +} =20 src_install() { use source && java-pkg_dosrc src