commit: f125fae9ac7ba2dee83199b987c5a7e512e3ae2c Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sat Mar 11 17:58:05 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 13 18:03:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f125fae9
games-strategy/freecol: drop 0.11.6-r1 Closes: https://bugs.gentoo.org/846692 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Sam James <sam <AT> gentoo.org> games-strategy/freecol/Manifest | 1 - games-strategy/freecol/files/commons-cli-1.3.patch | 22 -------- .../freecol/files/freecol-0.11.6-gentoo.patch | 18 ------- games-strategy/freecol/freecol-0.11.6-r1.ebuild | 63 ---------------------- 4 files changed, 104 deletions(-) diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest index e1c4293517ee..593d31100cdc 100644 --- a/games-strategy/freecol/Manifest +++ b/games-strategy/freecol/Manifest @@ -1,2 +1 @@ -DIST freecol-0.11.6-src.zip 45002451 BLAKE2B 1d0e56b43f63557e3a520d6d30b8831db6c0284ac6cfebf68f3a11264d8bcfc80b883c8d4fe82e4fbd992f02a82ffdf36ed102613010d28375b61cfa30874f68 SHA512 fbfec95ad7128477d631be92b750d639d42bde3e052c94265590933e841adf66e670d5e1b2f6e8ef05629afeafded60cbb495ef93272ebc14ce7fd2f2eaa53de DIST freecol-1.0.0-src.zip 159875314 BLAKE2B 6153be9553ded4c2a1f9635d67e48165d07b5d1634f26a44d2f01195e1610d6cb525ffa60368f3225cdf62ffd7751242942fd86b5735455e7396deca68d8350d SHA512 68b313b42fc38e6ea95a4a04ca5af534c4487709fb036018d6d09f6de3455325031ad1fd0ae4c6415cbbeebd3f181e598a2602ad7be6cca9150ad9523b8bb3c2 diff --git a/games-strategy/freecol/files/commons-cli-1.3.patch b/games-strategy/freecol/files/commons-cli-1.3.patch deleted file mode 100644 index 84fc6e5064c1..000000000000 --- a/games-strategy/freecol/files/commons-cli-1.3.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sun, 20 Dec 2015 18:49:11 +0100 -Subject: commons-cli 1.3 - -Forwarded: not-needed ---- - src/net/sf/freecol/FreeCol.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java -index d05ae3d..99b9cdc 100644 ---- a/src/net/sf/freecol/FreeCol.java -+++ b/src/net/sf/freecol/FreeCol.java -@@ -426,7 +426,7 @@ public final class FreeCol { - private static void handleArgs(String[] args) { - Options options = new Options(); - final String help = Messages.message("cli.help"); -- final File dummy = new File("dummy"); -+ final Class dummy = null; - final String argDirectory = Messages.message("cli.arg.directory"); - - // Help options. diff --git a/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch b/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch deleted file mode 100644 index 770279b69030..000000000000 --- a/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur a/build.xml b/build.xml ---- a/build.xml 2015-10-17 07:54:48.000000000 +0100 -+++ b/build.xml 2019-04-13 21:51:21.679100596 +0100 -@@ -162,14 +162,9 @@ - - <target name="manifest" depends="git-revision" - description="Creates the Manifest file."> -- <manifestclasspath property="jar.classpath" -- jarfile="Freecol.jar"> -- <classpath refid="libraries.classpath" /> -- </manifestclasspath> - <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="${jar.classpath}"/> - <attribute name="Product-Name" value="FreeCol"/> - <attribute name="Package-Title" value="FreeCol"/> - <attribute name="Package-Version" value="${FreeCol.Revision}"/> diff --git a/games-strategy/freecol/freecol-0.11.6-r1.ebuild b/games-strategy/freecol/freecol-0.11.6-r1.ebuild deleted file mode 100644 index fad44bf0d1eb..000000000000 --- a/games-strategy/freecol/freecol-0.11.6-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop java-pkg-2 java-ant-2 - -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" - -# Rightly or wrongly, jogg and jorbis are bundled within Cortado but we -# don't have packages for them anyway. - -CP_DEPEND=" - dev-java/commons-cli:1 - dev-java/cortado:0 - dev-java/miglayout:0 -" - -DEPEND=">=virtual/jdk-1.8 - app-arch/unzip - ${CP_DEPEND}" - -RDEPEND=">=virtual/jre-1.8 - ${CP_DEPEND}" - -S="${WORKDIR}/${PN}" - -PATCHES=( - "${FILESDIR}"/commons-cli-1.3.patch - "${FILESDIR}"/${P}-gentoo.patch -) - -JAVA_ANT_REWRITE_CLASSPATH=true -EANT_BUILD_TARGET=package - -src_prepare() { - default - rm -v jars/* || die - java-pkg-2_src_prepare -} - -src_install() { - local datadir=/usr/share/${PN} - - java-pkg_dojar FreeCol.jar - java-pkg_dolauncher ${PN} \ - --pwd ${datadir} \ - --main net.sf.freecol.FreeCol \ - --java_args -Xmx512M - - insinto ${datadir} - doins -r data schema - - doicon data/${PN}.png - make_desktop_entry ${PN} FreeCol - - dodoc README -}
