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.

Package-Manager: portage-2.1.2.7

4 files changed, 142 insertions, 17 deletions

diff --git a/games-strategy/freecol/ChangeLog b/games-strategy/freecol/ChangeLog
index 49955c44d132..27d652c05cba 100644
--- a/games-strategy/freecol/ChangeLog
+++ b/games-strategy/freecol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/freecol
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.17 2007/05/04 13:46:35 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.18 2007/05/25 21:05:12 betelgeuse Exp $
+
+  25 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/freecol-0.6.1-installer-taskdefs.patch, freecol-0.6.1.ebuild:
+  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.
 
   04 May 2007; Steve Dibb <beandog@gentoo.org> freecol-0.5.3.ebuild:
   amd64 stable, bug 174770
diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index c4baf2a26145..b8844fd3f3e8 100644
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX freecol-0.5.3-build.patch 568 RMD160 98ac7013b4a9196a18858c1cc6373433b8383c02 SHA1 90e913edad128858b320bacb948584bb43d8031a SHA256 fca9bbe8f16c10593ddeaf7f32398fbd976a3c76b32c12589af8c062640397d4
 MD5 f017b07254962d322d7d771321bfe044 files/freecol-0.5.3-build.patch 568
 RMD160 98ac7013b4a9196a18858c1cc6373433b8383c02 files/freecol-0.5.3-build.patch 568
@@ -10,6 +13,10 @@ AUX freecol-0.6.1-home.patch 931 RMD160 6d9b11226f93de1abf2f080acf1afe6ec3ce9f2f
 MD5 5c8b81773ca70b44630b8f954a5a0856 files/freecol-0.6.1-home.patch 931
 RMD160 6d9b11226f93de1abf2f080acf1afe6ec3ce9f2f files/freecol-0.6.1-home.patch 931
 SHA256 6dd34ac819d1c3fc5b560c39cc431aa88f92874eed0023aa4a4b8a70e60fb13c files/freecol-0.6.1-home.patch 931
+AUX freecol-0.6.1-installer-taskdefs.patch 3931 RMD160 bf64985ded9ee0c52b8d6ebdbfcffa62907834c7 SHA1 c0d51e1d85c1d1eacc722ca87cccd4d407d0fd35 SHA256 c2018492eae071ecd833ff2fe8d74741e89794922bc675425e82c8bd8243685e
+MD5 af3738f8cbb7fd23c397ae7311ecc9e5 files/freecol-0.6.1-installer-taskdefs.patch 3931
+RMD160 bf64985ded9ee0c52b8d6ebdbfcffa62907834c7 files/freecol-0.6.1-installer-taskdefs.patch 3931
+SHA256 c2018492eae071ecd833ff2fe8d74741e89794922bc675425e82c8bd8243685e files/freecol-0.6.1-installer-taskdefs.patch 3931
 DIST freecol-0.5.3-src.tar.gz 8239659 RMD160 ea9e48e7f3300359a4c235c99fb0a5235730943f SHA1 6af26395726c3a1f4d3c7675cbeb47427566ac22 SHA256 8532173044ec371bfc88376cbab2b9d5c638a216a065bb0f6351ee5b539ac0ac
 DIST freecol-0.6.0-src.tar.gz 21073021 RMD160 cd9553d56bff1568a61107df0510cf5afb63ab83 SHA1 937737366b10dabd9e0273f20fbc8aba81e1c8b6 SHA256 b4797b4accb82e289bc542669a77a8b33360e6eb8c6f390b756f572fc5d286b0
 DIST freecol-0.6.1-src.tar.gz 18696686 RMD160 270b763c290d2915f25da6182fa73655dcff7757 SHA1 1de7575e8e73b179f75e6cb06582ef3012b72785 SHA256 7b4c1162316f5824ab0d599f404e09ef4b7cdee5df4b0ef4b91fcee919bcf41b
@@ -21,14 +28,14 @@ EBUILD freecol-0.6.0.ebuild 1280 RMD160 bb22e79c54bd778d4843d26bac84b09142232078
 MD5 59d272c8a4f77db46a365a9a1a045775 freecol-0.6.0.ebuild 1280
 RMD160 bb22e79c54bd778d4843d26bac84b09142232078 freecol-0.6.0.ebuild 1280
 SHA256 157613d04f9c4428b07ebc4ef7345310251b12b5f594de94eea303cce4ef06d9 freecol-0.6.0.ebuild 1280
-EBUILD freecol-0.6.1.ebuild 1280 RMD160 998190f0d76f33b1ded32f0b3daaa978855cd1e4 SHA1 dafece58a678cc2383f1f0e0671c671876774b76 SHA256 f482ec18f43392522a452cb74b3b9e2ae847660116a2214d40b46771bdd01f14
-MD5 dd732c1dbfe7592b7865de42e6bce27c freecol-0.6.1.ebuild 1280
-RMD160 998190f0d76f33b1ded32f0b3daaa978855cd1e4 freecol-0.6.1.ebuild 1280
-SHA256 f482ec18f43392522a452cb74b3b9e2ae847660116a2214d40b46771bdd01f14 freecol-0.6.1.ebuild 1280
-MISC ChangeLog 2648 RMD160 4c13c794ef74b8e36a6070dc9e3e03b5080d5e26 SHA1 f5d6e0c4ccdbe36b52a8a8d743b3310bc69cf498 SHA256 a2b2c1ce951e2d22b59754011cace4daa1e60c53f1b94db4aa718b7a727b3534
-MD5 330c662b23d5a77e69a1897e0aa2e4f7 ChangeLog 2648
-RMD160 4c13c794ef74b8e36a6070dc9e3e03b5080d5e26 ChangeLog 2648
-SHA256 a2b2c1ce951e2d22b59754011cace4daa1e60c53f1b94db4aa718b7a727b3534 ChangeLog 2648
+EBUILD freecol-0.6.1.ebuild 1736 RMD160 72be76f64bf138b88697a7b07f67317429978761 SHA1 5b4155dd5f8be40d5a707271ac92073d3d8e87e2 SHA256 e0276b4c99f4229fb7d8691698cdc741233b8b731328d15461299962fd18b9f2
+MD5 d929e9b0b08c501d321d724158412adc freecol-0.6.1.ebuild 1736
+RMD160 72be76f64bf138b88697a7b07f67317429978761 freecol-0.6.1.ebuild 1736
+SHA256 e0276b4c99f4229fb7d8691698cdc741233b8b731328d15461299962fd18b9f2 freecol-0.6.1.ebuild 1736
+MISC ChangeLog 2909 RMD160 3fe5861ddbc8061409bf42e4424ec75b00244c49 SHA1 046c39d96070a64cbf189b4759af88e2e02b841a SHA256 de14aa89cc0f3d39225c56626d637d3e3148f7b829a7851744291836709658ae
+MD5 df194d508aedafcc2534539404d28e00 ChangeLog 2909
+RMD160 3fe5861ddbc8061409bf42e4424ec75b00244c49 ChangeLog 2909
+SHA256 de14aa89cc0f3d39225c56626d637d3e3148f7b829a7851744291836709658ae ChangeLog 2909
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -42,3 +49,10 @@ SHA256 07c02315cac71585d23c32961794ed23840c8edb0b257a6cadc19a134f557d90 files/di
 MD5 477505e63347b27f956cfadf14126fe5 files/digest-freecol-0.6.1 259
 RMD160 663292ad065d1e1b753143e876e20308128d67e1 files/digest-freecol-0.6.1 259
 SHA256 689517d330b522fb53e5b49013c3f74c96aa59154e1349ee47bd800181c60b4e files/digest-freecol-0.6.1 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGV0+OcxLzpIGCsLQRAo7iAJ9VZ/F+0xzK/YeUaIYbDCZDDyQjbACgnYAq
+QE2UgWncfP2Rwx2DCfxuclQ=
+=PEde
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/freecol/files/freecol-0.6.1-installer-taskdefs.patch b/games-strategy/freecol/files/freecol-0.6.1-installer-taskdefs.patch
new file mode 100644
index 000000000000..a872b846f28e
--- /dev/null
+++ b/games-strategy/freecol/files/freecol-0.6.1-installer-taskdefs.patch
@@ -0,0 +1,88 @@
+http://sourceforge.net/tracker/index.php?func=detail&aid=1725840&group_id=43225&atid=435580
+
+Index: build.xml
+===================================================================
+RCS file: /cvsroot/freecol/freecol/build.xml,v
+retrieving revision 1.46
+diff -u -r1.46 build.xml
+--- build.xml	21 May 2007 09:08:19 -0000	1.46
++++ build.xml	25 May 2007 20:48:17 -0000
+@@ -49,23 +49,12 @@
+     </condition>
+ 
+ 
+-    <!-- TASK DEFINITIONS -->
+-    <taskdef name="jsmoothgen"
+-            classname="net.charabia.jsmoothgen.ant.JSmoothGen"
+-            classpath="${freecol.build.dir}/jars/jsmoothgen-ant.jar"
+-    />
+-    <taskdef name="izpack"
+-            classname="com.izforge.izpack.ant.IzPackTask"
+-            classpath="${freecol.build.dir}/jars/standalone-compiler.jar"
+-    />
+-
+-    <!-- JarBundler is a feature-rich Ant task which will create a Mac OS X
+-         application bundle from a list of Jar files and a main class name.
+-         (GPL-Software) -> http://informagen.com/JarBundler/  -->
+-    <taskdef name="jarbundler" 
+-            classname="net.sourceforge.jarbundler.JarBundler" 
+-            classpath="${freecol.build.dir}/jars/jarbundler.jar"
+-    />
++    <target name="define-jsmoothgen">
++        <taskdef name="jsmoothgen"
++                classname="net.charabia.jsmoothgen.ant.JSmoothGen"
++                classpath="${freecol.build.dir}/jars/jsmoothgen-ant.jar"
++        />
++    </target>
+ 
+     <target name="init" unless="TSTAMP">
+         <tstamp/>
+@@ -223,7 +212,7 @@
+         </copy>
+     </target>
+ 
+-    <target name="prepareWinFiles" depends="initDist">
++    <target name="prepareWinFiles" depends="initDist,define-jsmoothgen">
+         <jsmoothgen project="${freecol.build.dir}/startup.jsmooth" skeletonroot="${freecol.build.dir}/skeletons"/>
+         <move todir="${freecol.release.dir}/win/${freecol.name}">
+             <fileset dir="${freecol.build.dir}" includes="freecol.exe"/>
+@@ -264,7 +253,12 @@
+     </target>
+ 
+     <target name="javaInstallerBundle" unless="skip.dist.installer" description="Builds a platform independent installer"
+-                depends="initDist,prepareWinFiles,prepareManual,prepareBaseFiles,prepareSourceFiles">
++			depends="initDist,prepareWinFiles,prepareManual,prepareBaseFiles,prepareSourceFiles">
++	    <taskdef name="izpack"
++                classname="com.izforge.izpack.ant.IzPackTask"
++                classpath="${freecol.build.dir}/jars/standalone-compiler.jar"
++        />
++
+         <izpack output="${freecol.release.dir}/${freecol.release.name}-installer.jar"
+                 installerType="standard" 
+                 basedir="${freecol.release.dir}/"
+@@ -332,7 +326,7 @@
+     </target>
+ 
+     <target name="winInstallerBundle" unless="skip.dist.installer" description="Builds a windows installer"
+-            depends="initDist,javaInstallerBundle">
++            depends="initDist,javaInstallerBundle,define-jsmoothgen">
+ 
+         <copy todir="${freecol.release.dir}">
+             <fileset dir="${freecol.build.dir}" includes="installer.jsmooth"/>
+@@ -349,7 +343,15 @@
+     </target>
+ 
+     <!-- Builds a doubleclickable application bundle running on Mac OS X -->
+-    <target name="macJavaBundle" unless="skip.dist.mac" depends="prepareManual,prepareBaseFiles">
++	<target name="macJavaBundle" unless="skip.dist.mac" depends="prepareManual,prepareBaseFiles">
++        <!-- JarBundler is a feature-rich Ant task which will create a Mac OS X
++             application bundle from a list of Jar files and a main class name.
++             (GPL-Software) -> http://informagen.com/JarBundler/  -->
++        <taskdef name="jarbundler" 
++                classname="net.sourceforge.jarbundler.JarBundler" 
++                classpath="${freecol.build.dir}/jars/jarbundler.jar"
++        />
++
+         <jarbundler dir="${freecol.release.dir}"
+                             name="FreeCol"
+                             mainclass="net.sf.freecol.FreeCol"
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
 }