* [gentoo-commits] gentoo-x86 commit in media-tv/tvbrowser: tvbrowser-3.2.1-r1.ebuild ChangeLog
@ 2013-08-13 20:58 Tom Wijsman (tomwij)
0 siblings, 0 replies; only message in thread
From: Tom Wijsman (tomwij) @ 2013-08-13 20:58 UTC (permalink / raw
To: gentoo-commits
tomwij 13/08/13 20:58:08
Modified: ChangeLog
Added: tvbrowser-3.2.1-r1.ebuild
Log:
Revision bump. EAPI 5. Use virtualx for tests. Slotted all dependencies; added swt and test? ( dev-java/ant-junit:0 ) dependency, the latter fixes tests together with setting the test classpath. Renamed src_prepare to java_prepare such that the preparation from the Java eclasses runs. Dropped dependency on class files from build.xml as well as parts that are unnecessary for Linux packaging, including fetching of dependencies. Made use of EANT_GENTOO_CLASSPATH and EANT_TEST_GENTOO_CLASSPATH and build.xml rewriting to simplify java_prepare. Replaced src_compile by EANT_BUILD_TARGET and EANT_DOC_TARGET. Reordered and shortened src_install, moved categories from sed to make_desktop_entry call. Sorted variables. Removed redundancy. Fixing up of dependencies fixes bug #480652 filed by Heiko Baums and Nils Kneuper. Removal of dependency fetching from build.xml fixes bug #451788 filed by Diego Elio Pettenò (flameeyes). Next steps should be unbundling as well as bumping more dependencies (
filed bug #480922 for this purpose), perhaps best done as part of the next version bump.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.37 media-tv/tvbrowser/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/tvbrowser/ChangeLog?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/tvbrowser/ChangeLog?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/tvbrowser/ChangeLog?r1=1.36&r2=1.37
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog 12 Nov 2012 21:38:13 -0000 1.36
+++ ChangeLog 13 Aug 2013 20:58:08 -0000 1.37
@@ -1,6 +1,26 @@
# ChangeLog for media-tv/tvbrowser
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.36 2012/11/12 21:38:13 johu Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.37 2013/08/13 20:58:08 tomwij Exp $
+
+*tvbrowser-3.2.1-r1 (13 Aug 2013)
+
+ 13 Aug 2013; Tom Wijsman <TomWij@gentoo.org> +files/tvbrowser-3.2.1-build.xml,
+ +tvbrowser-3.2.1-r1.ebuild, metadata.xml:
+ Revision bump. EAPI 5. Use virtualx for tests. Slotted all dependencies; added
+ swt and test? ( dev-java/ant-junit:0 ) dependency, the latter fixes tests
+ together with setting the test classpath. Renamed src_prepare to java_prepare
+ such that the preparation from the Java eclasses runs. Dropped dependency on
+ class files from build.xml as well as parts that are unnecessary for Linux
+ packaging, including fetching of dependencies. Made use of
+ EANT_GENTOO_CLASSPATH and EANT_TEST_GENTOO_CLASSPATH and build.xml rewriting
+ to simplify java_prepare. Replaced src_compile by EANT_BUILD_TARGET and
+ EANT_DOC_TARGET. Reordered and shortened src_install, moved categories from
+ sed to make_desktop_entry call. Sorted variables. Removed redundancy. Fixing
+ up of dependencies fixes bug #480652 filed by Heiko Baums and Nils Kneuper.
+ Removal of dependency fetching from build.xml fixes bug #451788 filed by Diego
+ Elio Pettenò (flameeyes). Next steps should be unbundling as well as bumping
+ more dependencies (filed bug #480922 for this purpose), perhaps best done as
+ part of the next version bump.
*tvbrowser-3.2.1 (12 Nov 2012)
1.1 media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: tvbrowser-3.2.1-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild,v 1.1 2013/08/13 20:58:08 tomwij Exp $
EAPI="5"
JAVA_PKG_IUSE="doc source test"
inherit eutils java-pkg-2 java-ant-2 flag-o-matic virtualx
tp_base="http://javootoo.l2fprod.com/plaf/skinlf/themepacks"
tvp_base="http://tvbrowser.org/downloads"
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? (
${tp_base}/BeOSthemepack.zip
${tp_base}/amarachthemepack.zip
${tp_base}/aquathemepack.zip
${tp_base}/architectBluethemepack.zip
${tp_base}/architectOlivethemepack.zip
${tp_base}/b0sumiErgothempack.zip
${tp_base}/b0sumithemepack.zip
${tp_base}/bbjthemepack.zip
${tp_base}/beigeazulthemepack.zip
${tp_base}/beosthemepack.zip
${tp_base}/blueMetalthemepack.zip
${tp_base}/blueTurquesathemepack.zip
${tp_base}/cellshadedthemepack.zip
${tp_base}/chaNinja-Bluethemepack.zip
${tp_base}/coronaHthemepack.zip
${tp_base}/cougarthemepack.zip
${tp_base}/crystal2themepack.zip
${tp_base}/fatalEthemepack.zip
${tp_base}/gfxOasisthemepack.zip
${tp_base}/gorillathemepack.zip
${tp_base}/hmmXPBluethemepack.zip
${tp_base}/hmmXPMonoBluethemepack.zip
${tp_base}/iBarthemepack.zip
${tp_base}/macosthemepack.zip
${tp_base}/midnightthemepack.zip
${tp_base}/mmMagra-Xthemepack.zip
${tp_base}/modernthemepack.zip
${tp_base}/oliveGreenLunaXPthemepack.zip
${tp_base}/opusLunaSilverthemepack.zip
${tp_base}/opusOSBluethemepack.zip
${tp_base}/opusOSDeepthemepack.zip
${tp_base}/opusOSOlivethemepack.zip
${tp_base}/quickSilverRthemepack.zip
${tp_base}/roueBluethemepack.zip
${tp_base}/roueBrownthemepack.zip
${tp_base}/roueGreenthemepack.zip
${tp_base}/royalInspiratthemepack.zip
${tp_base}/silverLunaXPthemepack.zip
${tp_base}/solunaRthemepack.zip
${tp_base}/tigerGraphitethemepack.zip
${tp_base}/tigerthemepack.zip
${tp_base}/toxicthemepack.zip
${tp_base}/underlingthemepack.zip
${tp_base}/whistlerthemepack.zip
${tp_base}/xplunathemepack.zip
${tvp_base}/noia.zip
${tvp_base}/nuvola.zip
${tvp_base}/tulliana.zip
${tvp_base}/tango_without_heart.zip
)"
SLOT="0"
KEYWORDS="~amd64 ~x86"
LICENSE="GPL-3"
IUSE="themes"
COMMON_DEP="dev-java/bsh:0
dev-java/commons-codec:0
dev-java/commons-lang:2.1
dev-java/commons-net:0
dev-java/jakarta-oro:2.0
dev-java/jgoodies-forms:0
dev-java/jgoodies-looks:2.0
dev-java/l2fprod-common:0
dev-java/log4j:0
dev-java/skinlf:0
dev-java/stax:0
dev-java/swt:4.2
dev-java/xalan:0
x11-libs/libXt:0
x11-libs/libSM:0
x11-libs/libICE:0
x11-libs/libXext:0
x11-libs/libXtst:0
x11-libs/libX11:0
x11-libs/libXau:0
x11-libs/libXdmcp:0
"
DEPEND="${COMMON_DEP}
app-arch/unzip:0
>=virtual/jdk-1.6
test? ( dev-java/junit:0 dev-java/ant-junit:0 )
"
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.6
"
java_prepare() {
cp "${FILESDIR}"/${P}-build.xml build.xml || die "Failed to replace build.xml."
local error="Failed to unbundle or remove libraries or classes."
pushd lib > /dev/null
rm -v bsh-*.jar commons*.jar jgoodies*.jar l2fprod-common-tasks*.jar \
skinlf*.jar stax*.jar || die ${error}
popd > /dev/null
find deployment -name '*.jar' -exec rm -v {} \; || die ${error}
find . -name '*.class' -exec rm -v {} \; || die ${error}
}
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="bsh,commons-codec,commons-lang-2.1,jgoodies-forms,jgoodies-looks-2.0,l2fprod-common,skinlf"
EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},ant-junit,junit"
EANT_BUILD_TARGET="runtime-linux"
EANT_DOC_TARGET="public-doc"
src_test() {
VIRTUALX_COMMAND="java-pkg-2_src_test" virtualmake
}
src_install() {
pushd runtime/${PN}_linux > /dev/null
java-pkg_dojar ${PN}.jar
local todir="${JAVA_PKG_SHAREPATH}"
cp -a {imgs,icons,plugins} "${D}/${todir}" || die "Failed to copy directories."
cp linux.properties "${D}/${todir}" || die "Failed to copy linux.properties."
insinto "${todir}/themepacks"
doins themepacks/themepack.zip
if use themes ; then
pushd "${DISTDIR}" > /dev/null
doins *pack.zip
insinto "${todir}/icons"
doins noia.zip nuvola.zip tulliana.zip tango_without_heart.zip
popd > /dev/null
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 "AudioVideo;TV;Video"
popd > /dev/null
java-pkg_dojar lib/{htmlparser-1.6.jar,jRegistryKey-1.4.5.jar,opencsv-2.3.jar}
java-pkg_dojar lib/{quaqua-7.3.4.jar,substance-6.1.jar,texhyphj-1.1.jar,trident-1.3.jar}
use source && java-pkg_dosrc src
use doc && java-pkg_dojavadoc doc
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-08-13 20:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-13 20:58 [gentoo-commits] gentoo-x86 commit in media-tv/tvbrowser: tvbrowser-3.2.1-r1.ebuild ChangeLog Tom Wijsman (tomwij)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox