From dfaa2b8d4d8e21323813fb5bda50e60c1cccabb3 Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Tue, 10 Oct 2006 22:57:53 +0000 Subject: [PATCH] Use java-pkg-2 eclass Package-Manager: portage-2.1.2_pre2-r7 --- games-strategy/freecol/ChangeLog | 5 +++- games-strategy/freecol/Manifest | 26 ++++++-------------- games-strategy/freecol/freecol-0.5.1.ebuild | 27 ++++++++------------- 3 files changed, 22 insertions(+), 36 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 freecol-0.5.1.ebuild: + Use java-pkg-2 eclass *freecol-0.5.1 (08 Oct 2006) diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest index f9fb93c38012..89448952287f 100644 --- a/games-strategy/freecol/Manifest +++ b/games-strategy/freecol/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX freecol-0.5.1-build.patch 568 RMD160 98ac7013b4a9196a18858c1cc6373433b8383c02 SHA1 90e913edad128858b320bacb948584bb43d8031a SHA256 fca9bbe8f16c10593ddeaf7f32398fbd976a3c76b32c12589af8c062640397d4 MD5 f017b07254962d322d7d771321bfe044 files/freecol-0.5.1-build.patch 568 RMD160 98ac7013b4a9196a18858c1cc6373433b8383c02 files/freecol-0.5.1-build.patch 568 @@ -16,14 +13,14 @@ EBUILD freecol-0.4.0.ebuild 1293 RMD160 2c6d541519229b2980c750ed791067005b671192 MD5 4f281e8beb6382fc7010603decabb01f freecol-0.4.0.ebuild 1293 RMD160 2c6d541519229b2980c750ed791067005b671192 freecol-0.4.0.ebuild 1293 SHA256 ebff3fa357b81ddfd61a671c9fdf519c1bcc97728f2f49b00e959ac4866683ef freecol-0.4.0.ebuild 1293 -EBUILD freecol-0.5.1.ebuild 1354 RMD160 ab7381c1a4cb70d8d3cd26016f447705a830e605 SHA1 f140391039e088a0b1c82f76c5f4260db2fa19a7 SHA256 7d80398a5bf09064a19950867e3c0a31a7279dc6d740f4383beb85ea07969478 -MD5 cf15ba898778d99ba1030e65d5fd656b freecol-0.5.1.ebuild 1354 -RMD160 ab7381c1a4cb70d8d3cd26016f447705a830e605 freecol-0.5.1.ebuild 1354 -SHA256 7d80398a5bf09064a19950867e3c0a31a7279dc6d740f4383beb85ea07969478 freecol-0.5.1.ebuild 1354 -MISC ChangeLog 958 RMD160 7165eace3581505d927abfd570bafda008037d9e SHA1 84b309184e6e4438ac8857576020e0f869f3225a SHA256 5ea7321461bdd5d884e19db3d0b4937540b03e299536c765fc9705985ee60cf0 -MD5 69996ff087b3fe4cf797b0808f2d442e ChangeLog 958 -RMD160 7165eace3581505d927abfd570bafda008037d9e ChangeLog 958 -SHA256 5ea7321461bdd5d884e19db3d0b4937540b03e299536c765fc9705985ee60cf0 ChangeLog 958 +EBUILD freecol-0.5.1.ebuild 1155 RMD160 d13651039703dc13e56b1a3063b1190f74686933 SHA1 c9faf2d65ce22ee55928269c23b2eb9b471c73b3 SHA256 596d280635b49de2a2d56bccc2fdc57ca84028dcdaf90764ae2423634f7124c5 +MD5 348eed0c411d27db349c7bce6d3d145e freecol-0.5.1.ebuild 1155 +RMD160 d13651039703dc13e56b1a3063b1190f74686933 freecol-0.5.1.ebuild 1155 +SHA256 596d280635b49de2a2d56bccc2fdc57ca84028dcdaf90764ae2423634f7124c5 freecol-0.5.1.ebuild 1155 +MISC ChangeLog 1051 RMD160 b03794b10689a3dd8f1a2f2675499f13cfc1fe01 SHA1 4662544a1671ebb504ec0e64eed14b9985abf10b SHA256 2c26df6fa69e2e6c2ef63ef2513b0fd1f040eccd38201ea93b56cd08c2552212 +MD5 d40a9e5192b0a55550e16d31fc3c1c2d ChangeLog 1051 +RMD160 b03794b10689a3dd8f1a2f2675499f13cfc1fe01 ChangeLog 1051 +SHA256 2c26df6fa69e2e6c2ef63ef2513b0fd1f040eccd38201ea93b56cd08c2552212 ChangeLog 1051 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -37,10 +34,3 @@ SHA256 0d31b65199f2b8040c0eeef56e6d070fc0ed4e6dd0c60e42c4cdcff650d94109 files/di MD5 bb8e9fb5959e629fa279fcaac4bf1da0 files/digest-freecol-0.5.1 256 RMD160 bd876934b460901f7408095769eb83871d3938a2 files/digest-freecol-0.5.1 256 SHA256 bc45c7bdb76ae045a3e442332441192e3dc2a629991e2296007c95789c933ec5 files/digest-freecol-0.5.1 256 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFKFW3bfN2jvlVAhwRAhhhAKCaEqhmY5EGFyVBVkAI4hPVIW983ACgk98x -tFpiauQJWM47sR2sN+1VlbA= -=Gp0V ------END PGP SIGNATURE----- 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 } -- 2.26.2