From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- games-strategy/freecol/Manifest | 5 +- games-strategy/freecol/files/commons-cli-1.3.patch | 22 ++++++ .../freecol/files/freecol-0.11.6-gentoo.patch | 37 ++++------ games-strategy/freecol/freecol-0.11.6-r1.ebuild | 63 +++++++++++++++++ games-strategy/freecol/freecol-0.11.6.ebuild | 79 ---------------------- 5 files changed, 102 insertions(+), 104 deletions(-) create mode 100644 games-strategy/freecol/files/commons-cli-1.3.patch create mode 100644 games-strategy/freecol/freecol-0.11.6-r1.ebuild delete mode 100644 games-strategy/freecol/freecol-0.11.6.ebuild (limited to 'games-strategy/freecol') diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest index 9a9aef337104..17ecf8b61321 100644 --- a/games-strategy/freecol/Manifest +++ b/games-strategy/freecol/Manifest @@ -1,4 +1,5 @@ -AUX freecol-0.11.6-gentoo.patch 1251 BLAKE2B 7de241498bba19c665812236a7898cf8295ffa9be0123a56ff0b65c85e9173dbfb3e458c26c632538230035320d9b93f0ba57b4eb6e8cf606c82b20befcf11ac SHA512 c94fa10fb210547b67b38562faa2d1e39f17264cdfc8819c5b6b856ba068757d88e29ea43bec573400a81b081965f687aea93335b62969b15122d9373290f224 +AUX commons-cli-1.3.patch 791 BLAKE2B 3fde34112ae8fba464a1dc9d282fce6a7eddb37c802861588005c44e3b5f1cf22d9b2495553954ab47681fa016c1c7cb9ff5b0887e48e67381d1d73a7ec58ea6 SHA512 eb2e1eeb5fe02d8d8601b1577847195f2b5a83ba875d70010f33ef8fe1fe57706e01a84ee442cd43bcbb72dc22d79a8e6de832be0e23742dae23e8e38bf6aa48 +AUX freecol-0.11.6-gentoo.patch 923 BLAKE2B f1e8632a75a3a9e4c1b2433eefdf50dc6b437da7052b2531e1a8d67fac1887a4ebad888795a9e96567ce4e5faaf5a2bc643b93f72cf72165de1b4e4146aed4d2 SHA512 85a1a7f9ac9031e61e57bbe88a292716d0249109308a6da0ef60f2e0ea547674f0d379b1f516980bfde567e2d8a2c518eef873fe40159af772b950791bec7bdf DIST freecol-0.11.6-src.zip 45002451 BLAKE2B 1d0e56b43f63557e3a520d6d30b8831db6c0284ac6cfebf68f3a11264d8bcfc80b883c8d4fe82e4fbd992f02a82ffdf36ed102613010d28375b61cfa30874f68 SHA512 fbfec95ad7128477d631be92b750d639d42bde3e052c94265590933e841adf66e670d5e1b2f6e8ef05629afeafded60cbb495ef93272ebc14ce7fd2f2eaa53de -EBUILD freecol-0.11.6.ebuild 1669 BLAKE2B c1250ab2b190f052f838af33c5de61c1f3974e38c8cdd3c9a6b9237b71a60732a1734f1654d6659a25bac29bd54f930641659dfc9d87b8d5af4444a598a4dcb4 SHA512 f17d732be0523537ac0a467da97a54063b16804013525caa2893497c0b03cfebcd536fc6ddc99206962fac6d1f2066ac71146e1c75422036567e439bdad36b34 +EBUILD freecol-0.11.6-r1.ebuild 1180 BLAKE2B d7aef2d83596f0c8ff17a9804efc58c0c260777fe90bdf8f9cf32eb74923caa4869ec2532d567b0f224601fe3735e102dd8cc81f5f7e78b16743432040d37850 SHA512 d852bc225ec08cb7b86a2dfa57ce40fe4fa64a4ef4b7a7c62dab6b994dd28646662d46a98729de88886e460eb6528a5c5158830dbc09f2dc95875afbffa88784 MISC metadata.xml 330 BLAKE2B ae0631cafebbd8fdebafaf416d6a8c7ca0152f83915aecca6366b74026523914e60761219eab4034401673fce1e54ea3c548bcbae7a084f301aaf6922569e61b SHA512 a626ad559d71b69d9f074fc7a223d226c3e911f21adecfaea48425f81fd81accf443e7518f16bbbadb1b92854f7c99e3eafda22ba0aa787bae3d44b02f8d71ab diff --git a/games-strategy/freecol/files/commons-cli-1.3.patch b/games-strategy/freecol/files/commons-cli-1.3.patch new file mode 100644 index 000000000000..84fc6e5064c1 --- /dev/null +++ b/games-strategy/freecol/files/commons-cli-1.3.patch @@ -0,0 +1,22 @@ +From: Markus Koschany +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 index c087193eb8c5..770279b69030 100644 --- a/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch +++ b/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch @@ -1,27 +1,18 @@ ---- build.xml.orig 2015-12-09 21:10:08.272361404 -0500 -+++ build.xml 2015-12-09 21:11:26.189663216 -0500 -@@ -36,12 +36,11 @@ - - - -- -- -+ - -- -+ - -- -+ - - - -@@ -162,7 +161,7 @@ +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 @@ - - - +- jarfile="Freecol.jar"> +- +- + + + +- + + + diff --git a/games-strategy/freecol/freecol-0.11.6-r1.ebuild b/games-strategy/freecol/freecol-0.11.6-r1.ebuild new file mode 100644 index 000000000000..fad44bf0d1eb --- /dev/null +++ b/games-strategy/freecol/freecol-0.11.6-r1.ebuild @@ -0,0 +1,63 @@ +# 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 +} diff --git a/games-strategy/freecol/freecol-0.11.6.ebuild b/games-strategy/freecol/freecol-0.11.6.ebuild deleted file mode 100644 index 8d7df3ab2726..000000000000 --- a/games-strategy/freecol/freecol-0.11.6.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit 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.8 - app-arch/unzip - ${COMMON_DEP}" -RDEPEND=">=virtual/jre-1.8 - ${COMMON_DEP}" - -S=${WORKDIR}/${PN} - -java_prepare() { - # jorbis isn't in portage yet - rm jars/{commons-cli-1.1,cortado-0.6.0,miglayout-core-4.2,miglayout-swing-4.2}.jar || die - epatch "${FILESDIR}"/${P}-gentoo.patch -} - -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} - 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 - doicon data/${PN}.png - make_desktop_entry ${PN} FreeCol - dodoc README - prepgamesdirs -} - -pkg_setup() { - games_pkg_setup - java-pkg-2_pkg_setup -} - -pkg_preinst() { - games_pkg_preinst - java-pkg-2_pkg_preinst -} -- cgit v1.2.3