games-strategy/freecol: Fix commons-cli issue, simplify build, EAPI 7

Thanks to Debian for the commons-cli patch.

Closes: https://bugs.gentoo.org/654564
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

2 files changed, 36 insertions, 23 deletions

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 <apo@debian.org>
+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 @@
- 
-     <path id="libraries.classpath">
-         <!-- MigLayout manager -->
--        <pathelement location="${basedir}/${miglayout-swing.jar}"/>
--        <pathelement location="${basedir}/${miglayout-core.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}"/>
-         <!-- JOgg/JOrbis libraries -->
-         <pathelement location="${basedir}/jars/jogg-0.0.17.jar"/>
-         <pathelement location="${basedir}/jars/jorbis-0.0.17.jar"/>
-@@ -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 @@
  
      <target name="manifest" depends="git-revision"
              description="Creates the Manifest file.">
 -        <manifestclasspath property="jar.classpath"
-+        <manifestclasspath maxParentLevels="50" property="jar.classpath"
-                            jarfile="Freecol.jar">
-             <classpath refid="libraries.classpath" />
-         </manifestclasspath>
+-                           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}"/>