diff options
author | Petteri Räty <betelgeuse@gentoo.org> | 2007-05-25 21:05:12 +0000 |
---|---|---|
committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-05-25 21:05:12 +0000 |
commit | 48f2cac2ce861cec84d7fb827980f7962f2082a6 (patch) | |
tree | 4fd8d137711132c37eed64a7d3f7d1519249a3b2 /games-strategy/freecol/freecol-0.6.1.ebuild | |
parent | added new version to match gnat-2007 (diff) | |
download | gentoo-2-48f2cac2ce861cec84d7fb827980f7962f2082a6.tar.gz gentoo-2-48f2cac2ce861cec84d7fb827980f7962f2082a6.tar.bz2 gentoo-2-48f2cac2ce861cec84d7fb827980f7962f2082a6.zip |
Add a pkg_setup that calls both games_pkg_setup and java-pkg-2_pkg_setup. Ensure that no bundled jars are used and add src_test.
(Portage version: 2.1.2.7)
Diffstat (limited to 'games-strategy/freecol/freecol-0.6.1.ebuild')
-rw-r--r-- | games-strategy/freecol/freecol-0.6.1.ebuild | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/games-strategy/freecol/freecol-0.6.1.ebuild b/games-strategy/freecol/freecol-0.6.1.ebuild index 14acad3206f5..100a9d621425 100644 --- a/games-strategy/freecol/freecol-0.6.1.ebuild +++ b/games-strategy/freecol/freecol-0.6.1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.6.1.ebuild,v 1.1 2007/04/30 16:18:25 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.6.1.ebuild,v 1.2 2007/05/25 21:05:12 betelgeuse Exp $ + +WANT_ANT_TASKS="ant-nodeps" inherit eutils java-pkg-2 java-ant-2 games @@ -11,23 +13,33 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="test" RDEPEND="dev-java/higlayout" DEPEND="${RDEPEND} - >=virtual/jdk-1.6 - dev-java/ant" + test? ( + dev-java/ant-junit + dev-java/ant-trax + ) + >=virtual/jdk-1.6" RDEPEND="${RDEPEND} >=virtual/jre-1.6" S=${WORKDIR}/${PN} +pkg_setup() { + games_pkg_setup + java-pkg-2_pkg_setup +} + src_unpack() { unpack ${A} cd "${S}" - rm -rf FreeCol.jar src/classes jars/* + rm -v FreeCol.jar jars/* */*/*.jar || die epatch "${FILESDIR}"/${P}-home.patch + # http://sourceforge.net/tracker/index.php?func=detail&aid=1725840&group_id=43225&atid=435580 + epatch "${FILESDIR}"/${PN}-0.6.1-installer-taskdefs.patch sed -i "/Class-Path/s:jars/.*$:$(java-pkg_getjars higlayout):" \ src/MANIFEST.MF \ @@ -37,10 +49,16 @@ src_unpack() { java-pkg_jar-from higlayout } +# default would be from games src_compile() { eant } +src_test() { + java-pkg_jar-from --into test/lib junit + ANT_TASKS="ant-junit ant-trax ant-nodeps" eant testall +} + src_install () { insinto "${GAMES_DATADIR}"/${PN} doins -r data || die "doins failed" @@ -53,8 +71,8 @@ src_install () { --pwd "${GAMES_DATADIR}"/${PN} \ --java_args -Xmx512M - dodoc README - doicon ${PN}.xpm - make_desktop_entry ${PN} FreeCol ${PN}.xpm + dodoc README || die + doicon ${PN}.xpm || die + make_desktop_entry ${PN} FreeCol ${PN}.xpm || die prepgamesdirs } |