[gentoo-commits] proj/java:master commit in: games-puzzle/lemmini/files/, games-puzzle/lemmini/

[gentoo-commits] proj/java:master commit in: games-puzzle/lemmini/files/, games-puzzle/lemmini/

[James Le Cuirot]

commit:     edbf84334b55d2e0fd2654f03f8439476823ac6e
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 14:46:55 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 14:46:55 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=edbf8433

games-puzzle/lemmini: Version bump to 0.86

Not sure if we're still supposed to use games.eclass.

Package-Manager: portage-2.2.20.1

 games-puzzle/lemmini/Manifest                              |  2 +-
 games-puzzle/lemmini/files/userdir.patch                   | 14 ++++++++------
 .../lemmini/{lemmini-0.84.ebuild => lemmini-0.86.ebuild}   | 13 +++++++------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/games-puzzle/lemmini/Manifest b/games-puzzle/lemmini/Manifest
index abbbe1f..a54c7b1 100644
--- a/games-puzzle/lemmini/Manifest
+++ b/games-puzzle/lemmini/Manifest
@@ -1 +1 @@
-DIST lemmini-0.84.tar.xz 1233772 SHA256 391df756aedf64e13f6b85df3fcca9a00e4fb65293c64ae88d0c52023875871e
+DIST lemmini-0.86.tar.xz 1236736 SHA256 e5c9023c2339e9ec7f528ef2e037157ca702fda0a684b98703e92fc3b3a84499 SHA512 579007d7507d325de8084a4dc0f29eb790db735776bd77c654e0a838e327d39feff751481e9d383e1e8bdc54a098a12fa2e473775048c4dea8b9230504a7f14d WHIRLPOOL 19f5869cf08ade2ff4b4d3888c307f4c209858d004f612018307520373dd68a19982f9f93a7582d7da56d2d7ee2fd1efe4685ca419e995de1fb4a62949cd7078

diff --git a/games-puzzle/lemmini/files/userdir.patch b/games-puzzle/lemmini/files/userdir.patch
index e7e488f..418326a 100644
--- a/games-puzzle/lemmini/files/userdir.patch
+++ b/games-puzzle/lemmini/files/userdir.patch
@@ -1,5 +1,7 @@
---- src/Game/Core.java.orig	2012-01-25 10:57:31.158576723 +0000
-+++ src/Game/Core.java	2012-01-25 12:11:01.020264407 +0000
+Index: Game/Core.java
+===================================================================
+--- Game/Core.java	(revision 53)
++++ Game/Core.java	(working copy)
 @@ -4,6 +4,7 @@
  import java.awt.MediaTracker;
  import java.awt.Toolkit;
@@ -8,7 +10,7 @@
  import java.net.URL;
  import java.net.URLDecoder;
  import java.util.ArrayList;
-@@ -74,32 +75,9 @@
+@@ -79,32 +80,9 @@
  	 * @throws LemmException
  	 */
  	public static void init(final JFrame frame, final boolean isWebstartApp) throws LemmException  {
@@ -44,9 +46,9 @@
  		programPropsFileStr += INI_NAME;
  		// read main ini file
  		programProps = new Props();
-@@ -111,7 +89,7 @@
- 				throw new LemmException("User abort");
- 		}
+@@ -118,7 +96,7 @@
+ 
+ 		scale = Core.programProps.get("scale",1.0);
  
 -		resourcePath = programProps.get("resourcePath", "");
 +		resourcePath = programProps.get("resourcePath", userDirStr);

diff --git a/games-puzzle/lemmini/lemmini-0.84.ebuild b/games-puzzle/lemmini/lemmini-0.86.ebuild
similarity index 78%
rename from games-puzzle/lemmini/lemmini-0.84.ebuild
rename to games-puzzle/lemmini/lemmini-0.86.ebuild
index d0a3b5e..11a1b72 100644
--- a/games-puzzle/lemmini/lemmini-0.84.ebuild
+++ b/games-puzzle/lemmini/lemmini-0.86.ebuild
@@ -2,12 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
+
 inherit eutils games java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java port of Lemmings, requires Lemmings for Windows"
 HOMEPAGE="http://lemmini.de"
-SRC_URI="http://dev.gentooexperimental.org/~chewi/distfiles/${P}.tar.xz"
+SRC_URI="http://dev.gentoo.org/~chewi/distfiles/${P}.tar.xz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -16,10 +17,10 @@ IUSE=""
 CDEPEND="dev-java/jnlp-api:0"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
+	>=virtual/jdk-1.6"
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.6"
 
 JAVA_GENTOO_CLASSPATH="jnlp-api"
 JAVA_ENCODING="ISO-8859-1"
@@ -37,14 +38,14 @@ java_prepare() {
 
 src_compile() {
 	java-pkg-simple_src_compile
-	jar ufe "${PN}.jar" Lemmini -C bin_copy . || die
+	java-pkg_addres "${PN}.jar" .
 }
 
 src_install() {
 	java-pkg_dojar "${PN}.jar"
 	java-pkg_dolauncher "${PN}" -into "${GAMES_PREFIX}" --main Lemmini
 
-	newicon bin_copy/icon_32.png "${PN}.png" || die
+	newicon icon_32.png "${PN}.png"
 	make_desktop_entry "${PN}" "Lemmini"
 
 	prepgamesdirs