summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <nyhm@gentoo.org>2006-10-10 22:57:53 +0000
committerTristan Heaven <nyhm@gentoo.org>2006-10-10 22:57:53 +0000
commit0d720de5c866e0f3781d48f05ac5a2576159d513 (patch)
tree75236a7ad79bb1b1ae460144ef996575987f87a3 /games-strategy/freecol
parentStable for HPPA (bug #136987). (diff)
downloadgentoo-2-0d720de5c866e0f3781d48f05ac5a2576159d513.tar.gz
gentoo-2-0d720de5c866e0f3781d48f05ac5a2576159d513.tar.bz2
gentoo-2-0d720de5c866e0f3781d48f05ac5a2576159d513.zip
Use java-pkg-2 eclass
(Portage version: 2.1.2_pre2-r7)
Diffstat (limited to 'games-strategy/freecol')
-rw-r--r--games-strategy/freecol/ChangeLog5
-rw-r--r--games-strategy/freecol/freecol-0.5.1.ebuild27
2 files changed, 14 insertions, 18 deletions
diff --git a/games-strategy/freecol/ChangeLog b/games-strategy/freecol/ChangeLog
index 2b206bd260fe..ec02fa03954d 100644
--- a/games-strategy/freecol/ChangeLog
+++ b/games-strategy/freecol/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-strategy/freecol
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.5 2006/10/08 01:34:31 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.6 2006/10/10 22:57:53 nyhm Exp $
+
+ 10 Oct 2006; Tristan Heaven <nyhm@gentoo.org> freecol-0.5.1.ebuild:
+ Use java-pkg-2 eclass
*freecol-0.5.1 (08 Oct 2006)
diff --git a/games-strategy/freecol/freecol-0.5.1.ebuild b/games-strategy/freecol/freecol-0.5.1.ebuild
index fe368d68372f..726f2a074678 100644
--- a/games-strategy/freecol/freecol-0.5.1.ebuild
+++ b/games-strategy/freecol/freecol-0.5.1.ebuild
@@ -1,40 +1,34 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.5.1.ebuild,v 1.1 2006/10/08 01:34:31 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.5.1.ebuild,v 1.2 2006/10/10 22:57:53 nyhm Exp $
-inherit eutils games
+inherit eutils java-ant-2 java-pkg-2 games
DESCRIPTION="An open source clone of the game Colonization"
HOMEPAGE="http://www.freecol.org/"
SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-KEYWORDS="~ppc ~x86"
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
IUSE=""
RDEPEND=">=virtual/jre-1.4"
DEPEND=">=virtual/jdk-1.4
- >=dev-java/ant-core-1.4.1"
+ dev-java/ant"
S=${WORKDIR}/${PN}
pkg_setup() {
games_pkg_setup
- if [ -z "${JAVA_HOME}" ]; then
- einfo
- einfo "\${JAVA_HOME} not set!"
- einfo "Please use java-config to configure your JVM and try again."
- einfo
- die "\${JAVA_HOME} not set."
- fi
+ java-pkg-2_pkg_setup
}
src_unpack() {
unpack ${A}
cd "${S}"
- rm FreeCol.jar
+ rm -f FreeCol.jar
sed -i \
-e '/saveDirectory/s/freecol/.freecol/' \
@@ -45,19 +39,18 @@ src_unpack() {
}
src_compile() {
- ant || die "ant failed"
+ eant || die
}
src_install () {
insinto "${GAMES_DATADIR}/${PN}"
doins -r FreeCol.jar data/ jars/ || die "doins failed"
- games_make_wrapper ${PN} \
- "java -Xmx256M -jar FreeCol.jar $1 $2 $3 $4 $5 $6 $7 $8 $9" \
+ games_make_wrapper ${PN} "java -Xmx256M -jar FreeCol.jar" \
"${GAMES_DATADIR}"/${PN}
dodoc README
doicon ${PN}.xpm
- make_desktop_entry ${PN} "FreeCol" ${PN}.xpm
+ make_desktop_entry ${PN} FreeCol ${PN}.xpm
prepgamesdirs
}