Version bump. Bug #300585

Package-Manager: portage-2.1.10.49/cvs/Linux i686

4 files changed, 145 insertions, 3 deletions

diff --git a/games-strategy/freecol/ChangeLog b/games-strategy/freecol/ChangeLog
index ccf3431b96db..36fe68a053a7 100644
--- a/games-strategy/freecol/ChangeLog
+++ b/games-strategy/freecol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/freecol
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.37 2009/10/25 12:20:32 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.38 2012/03/03 20:42:07 tupone Exp $
+
+*freecol-0.10.5 (03 Mar 2012)
+
+  03 Mar 2012; Tupone Alfredo <tupone@gentoo.org> +freecol-0.10.5.ebuild,
+  +files/freecol-0.10.5-gentoo.patch:
+  Version bump. Bug #300585 by Thomas Kahle
 
   25 Oct 2009; Markus Meier <maekke@gentoo.org> freecol-0.8.4.ebuild:
   amd64/x86 stable, bug #288643
diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index e69d75589a7d..a3d59199ba05 100644
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1,4 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX freecol-0.10.5-gentoo.patch 1679 RMD160 0e005aeb8244a952ad1f7950da0fc872c804ceef SHA1 9b3b9f47ee21a5fc8e82b8708c5c01127add97e4 SHA256 ffba7bb84abe6015bf4b8ef4e26b7fbdcb25966c75f06d2b2208c266645aafb5
+DIST freecol-0.10.5-src.zip 43940502 RMD160 3abcce59962a4215c40d700c332004b6b9b3d651 SHA1 c2e59bdf1108e84a51174ad06a8ebc69cf9f45e6 SHA256 8971fbba22ee556e28ccb0f10a48faeb8a33f37c46b15c8ca01cae4d8899076f
 DIST freecol-0.8.4-src.tar.gz 32836449 RMD160 d4f489852089c34245f312649668fd1413e06e54 SHA1 152164aa4901ab822e8949a68a140d1dd1537224 SHA256 d53de3da5d3cb3d5b1035033395e6fb1c6f54b7a4bd88c91bc52b7a3d18ca671
+EBUILD freecol-0.10.5.ebuild 2051 RMD160 cb4ea293c65454570b62e9d6a580cfff9f5bae08 SHA1 f6636e747d6cb56dcd236444d746eb3b0608950c SHA256 79b95c6731b6fa29cc5634ba9364865d8409bbcb5161be20fbcd9b9a863c767a
 EBUILD freecol-0.8.4.ebuild 1450 RMD160 eac69948d6044d153891832176bcd92adeb68acf SHA1 e4997a439403a4b711de655735f5d065b4957833 SHA256 e197bbff252439136eeded20d1f815d1060971a9fa3bc203d2178043b5f9310a
-MISC ChangeLog 5778 RMD160 40ac1467e4abf7b4792712f6420fa5cb09677e3a SHA1 ada243fe64a90404a9bdab1e8666dbe189a02093 SHA256 ee78fb692f0b7cbad30bd3c154a559b77b709144d6920e5cb1692825a7c4639b
+MISC ChangeLog 5966 RMD160 3747fabdc7d21eaf89c332fef1ec6b33c8619afa SHA1 f616adea03be639761357cc77b199de6ab8f52cd SHA256 3f471d983d0cb589ed702c387d0196b21393038aa1c3a4a2ff77ba495cff5954
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk9SgiYACgkQIY77eQFFFC2DhACfXy8Eq1fRTSCs+DSWfoWLi42y
+HfcAnAr1TEKBTCFktuIpLdxexoxOxk2b
+=LtXI
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/freecol/files/freecol-0.10.5-gentoo.patch b/games-strategy/freecol/files/freecol-0.10.5-gentoo.patch
new file mode 100644
index 000000000000..e0a7487ab025
--- /dev/null
+++ b/games-strategy/freecol/files/freecol-0.10.5-gentoo.patch
@@ -0,0 +1,30 @@
+--- build.xml.old	2012-03-03 20:28:27.470899027 +0100
++++ build.xml	2012-03-03 20:29:27.702662193 +0100
+@@ -41,15 +41,13 @@
+         <!-- Woodstox XML processor -->
+         <pathelement location="${basedir}/${woodstox.jar}"/>
+         <!-- MigLayout manager -->
+-        <pathelement location="${basedir}/${miglayout.jar}"/>
++        <pathelement location="${miglayout.jar}"/>
+         <!-- Command line processor -->
+-        <pathelement location="${basedir}/${cli.jar}"/>
++        <pathelement location="${cli.jar}"/>
+         <!-- Cortado Video Applet -->
+-        <pathelement location="${basedir}/${cortado.jar}"/>
++        <pathelement location="${cortado.jar}"/>
+     </path>
+     <path id="soundlibs.classpath">
+-      <pathelement location="${basedir}/jars/jogg-0.0.7.jar"/>
+-      <pathelement location="${basedir}/jars/jorbis-0.0.15.jar"/>
+       <pathelement location="${basedir}/jars/tritonus_share.jar"/>
+       <pathelement location="${basedir}/jars/vorbisspi1.0.3.jar"/>
+     </path>
+@@ -151,7 +149,7 @@
+       <manifest file="${basedir}/src/MANIFEST.MF">
+         <attribute name="Created-By" value="FreeCol Team"/>
+         <attribute name="Main-Class" value="net.sf.freecol.FreeCol"/>
+-        <attribute name="Class-Path" value="${stax.jar} ${woodstox.jar} jars/jogg-0.0.7.jar jars/jorbis-0.0.15.jar jars/tritonus_share.jar jars/vorbisspi1.0.3.jar ${miglayout.jar} ${cli.jar} ${cortado.jar}"/>
++        <attribute name="Class-Path" value="${stax.jar} ${woodstox.jar} jars/tritonus_share.jar jars/vorbisspi1.0.3.jar ${miglayout.jar} ${cli.jar} ${cortado.jar}"/>
+         <attribute name="Revision" value="${svn.Revision}"/>
+       </manifest>
+     </target>
diff --git a/games-strategy/freecol/freecol-0.10.5.ebuild b/games-strategy/freecol/freecol-0.10.5.ebuild
new file mode 100644
index 000000000000..b1ce95d3d2f4
--- /dev/null
+++ b/games-strategy/freecol/freecol-0.10.5.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.10.5.ebuild,v 1.1 2012/03/03 20:42:07 tupone Exp $
+
+EAPI=2
+
+inherit base eutils java-pkg-2 java-ant-2 games
+
+DESCRIPTION="An open source clone of the game Colonization"
+HOMEPAGE="http://www.freecol.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="dev-java/jsr173
+	dev-java/wstx:3.2
+	dev-java/commons-cli:1
+	dev-java/cortado
+	dev-java/miglayout"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}"/${PN}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+java_prepare() {
+	cd jars
+	rm jsr173_1.0_api.jar
+	rm wstx-lgpl-4.0pr1.jar
+	rm commons-cli-1.1.jar
+	rm miglayout-3.7.3.1-swing.jar
+	rm cortado-0.6.0.jar
+	rm jogg-0.0.7.jar
+	rm jorbis-0.0.15.jar
+}
+
+src_prepare() {
+	base_src_prepare
+	java-pkg-2_src_prepare
+}
+
+src_configure() {
+	java-ant-2_src_configure
+}
+
+src_compile() {
+	EANT_BUILD_TARGET=package
+	EANT_EXTRA_ARGS="
+		-Dstax.jar=$(java-pkg_getjars jsr173)
+		-Dwoodstox.jar=$(java-pkg_getjars wstx-3.2)
+		-Dcli.jar=$(java-pkg_getjars commons-cli-1)
+		-Dmiglayout.jar=$(java-pkg_getjars miglayout)
+		-Dcortado.jar=$(java-pkg_getjars cortado)
+	"
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_jarinto "${GAMES_DATADIR}"/${PN}/jars
+	java-pkg_dojar jars/vorbisspi1.0.3.jar
+	java-pkg_dojar jars/tritonus_share.jar
+	java-pkg_jarinto "${GAMES_DATADIR}"/${PN}
+	java-pkg_dojar FreeCol.jar
+	java-pkg_dolauncher ${PN} \
+		-into "${GAMES_PREFIX}" \
+		--pwd "${GAMES_DATADIR}"/${PN} \
+		--jar FreeCol.jar \
+		--java_args -Xmx512M
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r data schema splash.jpg || die "doins failed"
+	doicon ${PN}.xpm
+	make_desktop_entry ${PN} FreeCol
+	dodoc README || die "dodoc failed"
+	prepgamesdirs
+}
+
+pkg_setup() {
+	games_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	java-pkg-2_pkg_preinst
+}