old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 5 insertions, 123 deletions

diff --git a/games-strategy/freecol/ChangeLog b/games-strategy/freecol/ChangeLog
index c29d139f9517..a84c264b2422 100644
--- a/games-strategy/freecol/ChangeLog
+++ b/games-strategy/freecol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freecol
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.45 2015/02/25 15:52:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.46 2015/03/26 17:51:29 mr_bones_ Exp $
+
+  26 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/freecol-0.10.5-gentoo.patch, -freecol-0.10.5.ebuild:
+  old
 
   25 Feb 2015; Agostino Sarubbo <ago@gentoo.org> freecol-0.10.7.ebuild:
   Stable for x86, wrt bug #540126
diff --git a/games-strategy/freecol/files/freecol-0.10.5-gentoo.patch b/games-strategy/freecol/files/freecol-0.10.5-gentoo.patch
deleted file mode 100644
index e0a7487ab025..000000000000
--- a/games-strategy/freecol/files/freecol-0.10.5-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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
deleted file mode 100644
index f78359a63695..000000000000
--- a/games-strategy/freecol/freecol-0.10.5.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.4 2012/06/01 06:44:20 jdhore 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
-	doicon ${PN}.xpm
-	make_desktop_entry ${PN} FreeCol
-	dodoc README || die
-	prepgamesdirs
-}
-
-pkg_setup() {
-	games_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	java-pkg-2_pkg_preinst
-}