* [gentoo-commits] proj/java:master commit in: games-action/minecraft/, games-action/minecraft/files/
@ 2013-09-01 16:08 James Le Cuirot
0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2013-09-01 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 949d9fdad8b9bd3f624c578e9450b87d38ae23e5
Author: James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk>
AuthorDate: Sun Sep 1 16:03:59 2013 +0000
Commit: James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk>
CommitDate: Sun Sep 1 16:03:59 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=949d9fda
Version bump. Major changes! New versioning scheme now that upstream has started properly versioning the launcher. Many new dependencies. Old method for forcing use of Gentoo's packages no longer works. New Python script written, which can be executed by the launcher to modify the game's classpath and library path on launch.
Package-Manager: portage-2.1.13.7
Manifest-Sign-Key: 058FE989
---
games-action/minecraft/ChangeLog | 13 ++-
games-action/minecraft/Manifest | 22 +++-
games-action/minecraft/files/minecraft-gentoo | 113 +++++++++++++++++++++
games-action/minecraft/files/native-symlinks.sh | 23 -----
games-action/minecraft/minecraft-1.2.1.ebuild | 100 ++++++++++++++++++
.../minecraft/minecraft-20120805-r1.ebuild | 81 ---------------
6 files changed, 243 insertions(+), 109 deletions(-)
diff --git a/games-action/minecraft/ChangeLog b/games-action/minecraft/ChangeLog
index b49e5c2..3afedde 100644
--- a/games-action/minecraft/ChangeLog
+++ b/games-action/minecraft/ChangeLog
@@ -1,7 +1,18 @@
# ChangeLog for games-action/minecraft
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*minecraft-1.2.1 (01 Sep 2013)
+
+ 01 Sep 2013; James Le Cuirot <chewi@aura-online.co.uk>
+ +files/minecraft-gentoo, +minecraft-1.2.1.ebuild, -files/native-symlinks.sh,
+ -minecraft-20120805-r1.ebuild:
+ Version bump. Major changes! New versioning scheme now that upstream has
+ started properly versioning the launcher. Many new dependencies. Old method
+ for forcing use of Gentoo's packages no longer works. New Python script
+ written, which can be executed by the launcher to modify the game's classpath
+ and library path on launch.
+
*minecraft-20120805-r1 (2 Dec 2012)
2 Dec 2012; James Le Cuirot <chewi@aura-online.co.uk>
diff --git a/games-action/minecraft/Manifest b/games-action/minecraft/Manifest
index 0b47ab0..01b3916 100644
--- a/games-action/minecraft/Manifest
+++ b/games-action/minecraft/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX minecraft-gentoo 4239 SHA256 736aa5758c18d9bfb7354c5a7ec432b3dfd92a23b94f661c58d2fa60863b8eff SHA512 592d88c31d024e76cb5606f7ecb3bd616d44f5eb045cd4f31ec698ade0e12008a96f43d33bb5235301cd0524e942f8789948ba031266065ec5505cedbb4f413b WHIRLPOOL 1175f3d0608166ddbbe4024c17f8e813b4d558e27d9dfe6244c74b15c56878652e18cb50fa71937ba1e1881da8536d10c97293c2026b6afa5f33eda51fcbfbaf
AUX minecraft.png 20345 SHA256 5ee86aeb4185637ea901f80e698e64d07dd138448fc4ff00d96d5992792a806b SHA512 ce91da9e858dd4ab63cd5643304d59ad7169788638cd8a59edce14f62cf1723896e9e8280cc0645930f2b1ba2e1202b4755280c2d546abba263a83d32e3770e0 WHIRLPOOL b33a8599e7ebffdb7a92d4edb59a20492658c34f76a301b723dcdaba16e120c3c04800b174be3f652687cb349742e5cacbff3cbe30672e8da1dc5a10b23534d3
-AUX native-symlinks.sh 881 SHA256 f2e342dc8b9bdb10b75a51c6c415780ad301f7cf441a6d9d5971e014970418e7 SHA512 0b102fad15806e56e3f29248578135fc44b7e485781d29f93d0a7a2f7fadd0e7e0f1f14b252d12c13b34a1ed9c4b448778b394d9173c54318462a54acf3cb22d WHIRLPOOL c37286c0d400bb316370adacba6ebd3dbf76968f850907e964f0576c11d63c96162c41e719970a4ded9ef3bae31d4454ab8864634bfb96cdc72c76fa0efc8d5e
-DIST minecraft-20120805.jar 81938 SHA256 92db974aa759a3f17f3cd61550fa5010e335c57dd813dad9e39b9cc013420a49 SHA512 0b377036bd4b0049a8718016e82ddbcc3e35aebedb5cb8fb5b8f797960b6d46eff918046efdde0aa56374034c12410ec00b77b8ef81d3c5f342dc92fd58c187d WHIRLPOOL e6e7e78e21217681a74d718fe1917b75a4fcbd6c8279c29a3b4f475f5ce85ccf767d79bf8a709fcc07699bd9f547ec94ae2dbda92f4b61fa5613cca8403b60bc
-EBUILD minecraft-20120805-r1.ebuild 2447 SHA256 61464972f14c4d1e6bf3bcd6cdf486f271d6300540ba942e7cd7c8a565ef9c30 SHA512 5732cbce2ba94b2728fc4213634b61da61795d0ad88f8ec400b8ce33253897d67c9ef0bcc2376339e1d34c8e99558cf09a0dd2800c4c64ac073aa4342a3df357 WHIRLPOOL 8e896c60d2ba9365fe10a9377991cc0f3d3027a10125d7cea097effb7c637894964ca7c1fad634bb80849619366aaa42954071936dd2534273d7462386e51644
-MISC ChangeLog 4697 SHA256 f3846527d1e585c01325657dcd4f6a2ba50d25ca3f14a8aab949e8cfcc44552a SHA512 4da35301323107d8978633caa8a1ea3d91e8df5fe468dc58dbe6c1aa989e9d1ea9975811ff1200f25d485f6a3fab46ed4120e1fa5654f4dcc9074670a57841f4 WHIRLPOOL 980c8ac844e61593d8f30df2e20e8d57fb78d4a95766e7bca515233eeb399bde8ba61b3025eb3f0d72c3df87b1ba40ac8882c049ff769aff28b5b25d1f9877f7
+DIST minecraft-1.2.1.jar 280212 SHA256 e8d90b2637b141b556670d8460d317aadb6e4f2e644e519995c428800b25f212 SHA512 64201f5d9522c43bded397e39b29eedeed5af224a064e13eede6f5d276d7b61702c5daae998c1fff8b34c6660f8f56a40bf0f43f4024119023c77672d6319659 WHIRLPOOL 3ecf370c4c99b6ae7b33efba5ca831c360b8c72ece5f059bbeb7c5e8e7686d6562338904522e907b5b1acaca17fe99b97e985ea770f8f4f20d6040d817e4f312
+EBUILD minecraft-1.2.1.ebuild 2749 SHA256 7a8bc977d3c586d8cf61552afdb16c322d13ced59abfcbe91346031b05bbd6ae SHA512 5f0491a58f0bd0dce5f2f29da5aacceb8561d49ed8f47489d436e504b49cf34f5f7fede49467157fc60b02de36d0eccf771858a520d2fcf95d9e79bb0afae059 WHIRLPOOL 77ae7bf6dddab7af7cf8ca93a7538bd85f128979d1a2bdb7d6d63768498f9bf621517c4fa3efdf17e6b0490003d4b546d4b738ab564f6feedd6895070add3040
+MISC ChangeLog 5236 SHA256 81dbeec3ff9bc343402e6b9497e93ae72f56963e4d2ac98897630bf8070ed08d SHA512 c029e50d3c34892e3a8ed76ccaec697b826c76eb69e6ccc0332a1501673fd1d449d72ba477217dd2f32bd35bade8f20232f31c289e791eed503d808d563710b2 WHIRLPOOL 33c77f7ffa5e89ee495ca5adae84ea6f6be94abdae70b534ef7fea53540991969a27ab426f9183f4c294137bba7ec42259f7e1d49f519171dd77c5f77446ae29
MISC metadata.xml 525 SHA256 e9e868a41f0ca909166b4977b6188316196ef4016f0035f2ec18b3a2696ec918 SHA512 7e854e616459ccb206389144b5caf7f613632ee27fa718664e649c956d71a5652eff6aa88f1d85a5c16c76e83349b4ebeacacddb44c37320196252b869ff7d62 WHIRLPOOL 3a00529b7b3dad61a7158e86a4de5e154420772eeedf55c0fccc39da6b1b35317e75a2b0d0856d907896e60dfd134f200d8cff2d896c45701a1852cf29d2cc88
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSI2VvAAoJEGcL3XYFj+mJo9wH/i29TQPJj5L697k63I1wzZc9
+8IXHBfAMxQeaNyLeRrUGmL7gGAfoyZadIOTYnc01yG6Kz+L0m59kyV8s/v28nSIk
+J7zd33j54gYeibPykTmBwoaOM4yKcqxWHOeKaTTkBVW0GolRkNZzokXx+KgKpSHy
+cx9BVoPUQQpeNayyA3+mXjL7apgfvyKBIrm6estLjyoxMaxdepmosju6MJSYNRBE
+jWxBObK+KoHCJER7mkIdPT7tWZ6cIDL1hWINaCjTziftw0ihKCloPesfQ+yaZsT6
+AV5USvouzsoNtjBGQBRPwVgKOtq3eFdo5kyOOE++jR6jbGF6HX1UJ+SXhQAHbs0=
+=uTMZ
+-----END PGP SIGNATURE-----
diff --git a/games-action/minecraft/files/minecraft-gentoo b/games-action/minecraft/files/minecraft-gentoo
new file mode 100755
index 0000000..fb99e28
--- /dev/null
+++ b/games-action/minecraft/files/minecraft-gentoo
@@ -0,0 +1,113 @@
+#!/usr/bin/env python
+
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+import argparse, os, re, sys
+from java_config_2.EnvironmentManager import EnvironmentManager
+from java_config_2.Errors import UnexistingPackageError
+from itertools import chain
+
+try:
+ from itertools import ifilter # Python 2
+except ImportError:
+ ifilter = filter # Python 3
+
+klass = "net.minecraft.client.main.Main"
+description = "Launch Minecraft using Gentoo's packaged libraries."
+usage = sys.argv[0] + " [java options] " + klass + " [minecraft options]"
+
+try:
+ split = sys.argv.index(klass)
+except ValueError:
+ split = None
+
+parser = argparse.ArgumentParser(description=description, usage=usage)
+group = parser.add_argument_group("Java options")
+group.add_argument("-classpath", "-cp", dest="-classpath", required=True)
+group.add_argument("-Djava.library.path", dest="origNativeDir", required=True)
+java_args = parser.parse_known_args(sys.argv[1:split])
+
+parser = argparse.ArgumentParser(description=description, usage=usage)
+group = parser.add_argument_group("Minecraft options")
+group.add_argument("--gameDir", dest="--gameDir", required=True)
+group.add_argument("--version", dest="--version", required=True)
+minecraft_args = parser.parse_known_args(sys.argv[split+1:] if split else [])
+
+def get_jar(pkg_name, jar):
+ global nativeDirs
+
+ try:
+ pkg = manager.get_package(pkg_name)
+ except UnexistingPackageError:
+ return None
+
+ jars = pkg.classpath().split(":")
+ jar = next(ifilter(lambda x: x.endswith("/" + jar), jars), None)
+
+ if jar:
+ dirs = pkg.query("LIBRARY_PATH")
+ if dirs: nativeDirs |= set(dirs.split(":"))
+
+ return jar
+
+def transform(path):
+ if path.startswith(libDir):
+ tail = path[len(libDir):]
+
+ match = re.match("org/bouncycastle/bcprov-jdk15on/([^/]+)/", tail)
+ if match: return get_jar("bcprov", "bcprov.jar") or path
+
+ match = re.match("commons-io/commons-io/([^/]+)/", tail)
+ if match: return get_jar("commons-io-1", "commons-io.jar") or path
+
+ match = re.match("org/apache/commons/commons-lang3/([^/]+)/", tail)
+ if match: return get_jar("commons-lang-3.1", "commons-lang.jar") or path
+
+ match = re.match("com/google/code/gson/gson/([^/]+)/", tail)
+ if match: return get_jar("gson-2.2.2", "gson.jar") or path
+
+ match = re.match("com/google/guava/guava/([^/]+)/", tail)
+ if match: return get_jar("guava-14", "guava.jar") or path
+
+ match = re.match("net/java/jinput/jinput/([^/]+)/", tail)
+ if match: return get_jar("jinput", "jinput.jar") or path
+
+ match = re.match("net/sf/jopt-simple/jopt-simple/([^/]+)/", tail)
+ if match: return get_jar("jopt-simple", "jopt-simple.jar") or path
+
+ match = re.match("net/java/jutils/jutils/([^/]+)/", tail)
+ if match: return get_jar("jutils", "jutils.jar") or path
+
+ match = re.match("org/lwjgl/lwjgl/lwjgl(|_util)/([^/]+)/", tail)
+ if match: return get_jar("lwjgl-2.9", "lwjgl" + match.group(1) + ".jar") or path
+
+ match = re.match("com/paulscode/(codecwav|librarylwjglopenal|libraryjavasound|soundsystem)/([^/]+)/", tail)
+ if match: return get_jar("paulscode-" + match.group(1), "paulscode-" + match.group(1) + ".jar") or path
+
+ match = re.match("com/paulscode/codecjorbis/([^/]+)/", tail)
+ if match: return (get_jar("paulscode-codecjorbis", "paulscode-codecjorbis.jar") or path) + ":" + (get_jar("jorbis", "jorbis.jar") or path)
+
+ return path
+
+nativeDirs = set()
+libDir = getattr(minecraft_args[0], "--gameDir") + "/libraries/"
+manager = EnvironmentManager(os.getenv("ROOT", ""), os.getenv("EPREFIX", "@GENTOO_PORTAGE_EPREFIX@"))
+
+origNativeDir = getattr(java_args[0], "origNativeDir")
+delattr(java_args[0], "origNativeDir")
+
+classpath = getattr(java_args[0], "-classpath").split(":")
+setattr(java_args[0], "-classpath", ":".join(map(transform, classpath)))
+
+args = [ "java" ]
+args.append("-Djava.library.path=" + ":".join(nativeDirs) + ":" + origNativeDir)
+args.extend(list(chain.from_iterable(vars(java_args[0]).items())))
+args.extend(java_args[1])
+args.append(klass)
+args.extend(list(chain.from_iterable(vars(minecraft_args[0]).items())))
+args.extend(minecraft_args[1])
+
+sys.stderr.write(" ".join(args) + "\n")
+os.execlp("java", *args)
diff --git a/games-action/minecraft/files/native-symlinks.sh b/games-action/minecraft/files/native-symlinks.sh
deleted file mode 100644
index 770d212..0000000
--- a/games-action/minecraft/files/native-symlinks.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# We have patched Minecraft to not download or install its JAR
-# libraries but doing the same for the native libraries doesn't seem
-# so easy. Instead we create symlinks and make the natives directory
-# read-only, which seems to fool it sufficiently.
-
-NATIVES="${HOME}/.minecraft/bin/natives"
-mkdir -p "${NATIVES}"
-chmod +w "${NATIVES}"
-
-ln -snf /usr/lib/libopenal.so "${NATIVES}"/libopenal.so
-ln -snf $(ls -U /usr/lib/jinput/libjinput-linux{64,}.so 2> /dev/null | head -n1) "${NATIVES}"/libjinput-linux.so
-ln -snf $(ls -U /usr/lib/lwjgl-2.8/liblwjgl{64,}.so 2> /dev/null | head -n1) "${NATIVES}"/liblwjgl.so
-
-ln -snf libopenal.so "${NATIVES}"/libopenal64.so
-ln -snf libjinput-linux.so "${NATIVES}"/libjinput-linux64.so
-ln -snf liblwjgl.so "${NATIVES}"/liblwjgl64.so
-
-chmod a-w "${NATIVES}"
-
-# Create a dummy lwjgl.jar to fool MCPatcher.
-touch "${HOME}/.minecraft/bin/lwjgl.jar"
-
diff --git a/games-action/minecraft/minecraft-1.2.1.ebuild b/games-action/minecraft/minecraft-1.2.1.ebuild
new file mode 100644
index 0000000..68674fb
--- /dev/null
+++ b/games-action/minecraft/minecraft-1.2.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_1,3_2,3_3} )
+
+inherit eutils python-r1 games java-pkg-2
+
+DESCRIPTION="A game about placing blocks while running from skeletons. Or something like that..."
+HOMEPAGE="http://www.minecraft.net"
+SRC_URI="https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar -> $P.jar"
+LICENSE="Minecraft"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND="app-arch/zip
+ >=virtual/jdk-1.6"
+
+RDEPEND="|| (
+ >=dev-java/icetea-6[X]
+ >=dev-java/icedtea-bin-6[X]
+ >=dev-java/oracle-jre-bin-1.6[X]
+ >=dev-java/oracle-jdk-bin-1.6[X]
+ >=dev-java/sun-jre-bin-1.6[X]
+ >=dev-java/sun-jdk-1.6[X] )
+
+ dev-java/gson:2.2.2
+ dev-java/java-config:2
+ >=dev-java/jopt-simple-4.5:0
+
+ dev-java/bcprov:0
+ dev-java/commons-io:1
+ dev-java/commons-lang:3.1
+ dev-java/guava:14
+ >=dev-java/jinput-1_pre20100416:0
+ dev-java/jutils:0
+ dev-java/lwjgl:2.9
+ dev-java/paulscode-codecjorbis:0
+ dev-java/paulscode-codecwav:0
+ dev-java/paulscode-librarylwjglopenal:0
+ dev-java/paulscode-libraryjavasound:0
+ dev-java/paulscode-soundsystem:0"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ games_pkg_setup
+}
+
+src_unpack() {
+ zip -d "${DISTDIR}/${A}" -O "${PN}.jar" com/\* joptsimple/\* || die
+}
+
+src_prepare() {
+ sed "s:@GENTOO_PORTAGE_EPREFIX@:${EPREFIX}:g" "${FILESDIR}/${PN}-gentoo" > "${PN}-gentoo" || die
+}
+
+src_install() {
+ # These dependencies are used by the launcher. The others are used
+ # by the game itself and are sourced using the wrapper below.
+ java-pkg_register-dependency gson-2.2.2
+ java-pkg_register-dependency jopt-simple
+
+ python_scriptinto "${GAMES_PREFIX}/bin"
+ python_foreach_impl python_doscript "${PN}-gentoo"
+
+ java-pkg_dojar "${PN}.jar"
+ java-pkg_dolauncher "${PN}" -into "${GAMES_PREFIX}" --main net.minecraft.bootstrap.Bootstrap
+
+ doicon "${FILESDIR}/${PN}.png"
+ make_desktop_entry "${PN}" "Minecraft"
+
+ prepgamesdirs
+}
+
+pkg_postinst() {
+ ewarn "The Minecraft launcher uses Gentoo's own packages but the game itself"
+ ewarn "uses upstream libraries by default. Using Gentoo's packages for the game"
+ ewarn "is recommended. Just follow these steps..."
+ ewarn ""
+ ewarn " # Start the launcher"
+ ewarn " # Log in"
+ ewarn " # Click Edit Profile"
+ ewarn " # Tick the Executable check box"
+ ewarn " # Replace the text box content with minecraft-gentoo"
+ ewarn " # Click Save Profile"
+ ewarn " # Play!"
+ ewarn ""
+ ewarn "You can revert to upstream libraries by unticking the check box. When"
+ ewarn "reporting bugs to Gentoo, please state whether you are using upstream"
+ ewarn "libraries or not. Always use upstream libraries when reporting bugs"
+ ewarn "upstream."
+ echo
+
+ games_pkg_postinst
+}
diff --git a/games-action/minecraft/minecraft-20120805-r1.ebuild b/games-action/minecraft/minecraft-20120805-r1.ebuild
deleted file mode 100644
index 154c006..0000000
--- a/games-action/minecraft/minecraft-20120805-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit eutils games java-pkg-2
-
-DESCRIPTION="A game about placing blocks while running from skeletons. Or something like that..."
-HOMEPAGE="http://www.minecraft.net"
-SRC_URI="http://www.minecraft.net/download/minecraft.jar -> $P.jar"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipv6"
-RESTRICT="mirror"
-
-# lwjgl 2.4 is used by upstream but we're using 2.6+ because of reports
-# that it fixes a bug where keyboard controls get stuck. You can
-# determine what version upstream uses by looking for the version number
-# near the top of...
-#
-# javap -classpath lwjgl.jar -c org.lwjgl.Sys
-
-DEPEND=">=virtual/jdk-1.5" # Only need this for jar.
-
-RDEPEND=">=dev-java/jinput-1_pre20100416
- >=dev-java/lwjgl-2.8.3:2.8
- || ( >=dev-java/icedtea-bin-6[X]
- >=dev-java/icedtea-6
- >=dev-java/oracle-jre-bin-1.6[X]
- >=dev-java/oracle-jdk-bin-1.6[X]
- >=dev-java/sun-jre-bin-1.6[X]
- >=dev-java/sun-jdk-1.6[X] )"
-
-S="${WORKDIR}"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- games_pkg_setup
-}
-
-src_prepare() {
- # Don't download or install JAR libraries. Hacky but works.
- sed -i "s/lwjgl\.jar, jinput\.jar, lwjgl_util\.jar,/ /g" \
- net/minecraft/GameUpdater.class || die
-
- # Recreate JAR.
- jar cfe "${PN}.jar" net.minecraft.MinecraftLauncher LZMA/ net/ || die
-}
-
-src_install() {
- java-pkg_register-dependency jinput
- java-pkg_register-dependency lwjgl-2.8 lwjgl.jar
- java-pkg_register-dependency lwjgl-2.8 lwjgl_util.jar
- java-pkg_dojar "${PN}.jar"
-
- local ARGS
- use ipv6 || ARGS="-Djava.net.preferIPv4Stack=true"
-
- # Launching with -jar seems to create classpath problems.
- java-pkg_dolauncher "${PN}" -into "${GAMES_PREFIX}" \
- -pre "${FILESDIR}/native-symlinks.sh" \
- --java_args "-Xmx1024M -Xms512M ${ARGS}" \
- --main net.minecraft.MinecraftLauncher
-
- doicon "${FILESDIR}/${PN}.png" || die
- make_desktop_entry "${PN}" "Minecraft"
-
- prepgamesdirs
-}
-
-pkg_postinst() {
- ewarn "We have patched Minecraft to use libraries built from source for your"
- ewarn "own system. If you encounter problems, PLEASE also try the official"
- ewarn "version before reporting them upstream. Make sure that you delete"
- ewarn "~/.minecraft/bin/version and ~/.minecraft/bin/natives before using the"
- ewarn "official version so that the libraries can be downloaded by the game."
- echo
-
- games_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/java:master commit in: games-action/minecraft/, games-action/minecraft/files/
@ 2013-09-02 21:43 James Le Cuirot
0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2013-09-02 21:43 UTC (permalink / raw
To: gentoo-commits
commit: 06e26e62e4848d313feee40ff5359575916fac25
Author: James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk>
AuthorDate: Mon Sep 2 21:41:25 2013 +0000
Commit: James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk>
CommitDate: Mon Sep 2 21:41:25 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=06e26e62
Updated Python wrapper that works with older versions of the game. Uses bundled asm until we have 4.1 in the tree.
Package-Manager: portage-2.2.1
Manifest-Sign-Key: 058FE989
---
games-action/minecraft/ChangeLog | 7 +++++
games-action/minecraft/Manifest | 20 ++++++------
games-action/minecraft/files/minecraft-gentoo | 36 +++++++++++++++-------
...raft-1.2.1.ebuild => minecraft-1.2.1-r1.ebuild} | 0
4 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/games-action/minecraft/ChangeLog b/games-action/minecraft/ChangeLog
index 4ee8d97..786248b 100644
--- a/games-action/minecraft/ChangeLog
+++ b/games-action/minecraft/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*minecraft-1.2.1-r1 (02 Sep 2013)
+
+ 02 Sep 2013; James Le Cuirot <chewi@aura-online.co.uk>
+ +minecraft-1.2.1-r1.ebuild, -minecraft-1.2.1.ebuild, files/minecraft-gentoo:
+ Updated Python wrapper that works with older versions of the game. Uses
+ bundled asm until we have 4.1 in the tree.
+
02 Sep 2013; James Le Cuirot <chewi@aura-online.co.uk> minecraft-1.2.1.ebuild:
Fix dependency typo.
diff --git a/games-action/minecraft/Manifest b/games-action/minecraft/Manifest
index f374d66..e06eecb 100644
--- a/games-action/minecraft/Manifest
+++ b/games-action/minecraft/Manifest
@@ -1,20 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX minecraft-gentoo 4239 SHA256 736aa5758c18d9bfb7354c5a7ec432b3dfd92a23b94f661c58d2fa60863b8eff SHA512 592d88c31d024e76cb5606f7ecb3bd616d44f5eb045cd4f31ec698ade0e12008a96f43d33bb5235301cd0524e942f8789948ba031266065ec5505cedbb4f413b WHIRLPOOL 1175f3d0608166ddbbe4024c17f8e813b4d558e27d9dfe6244c74b15c56878652e18cb50fa71937ba1e1881da8536d10c97293c2026b6afa5f33eda51fcbfbaf
+AUX minecraft-gentoo 4711 SHA256 224fa4d4632d70bd44edf58f82807773767dbdad6efd73419107f471cd246221 SHA512 8b2dbafc7e4b772480b65e0181fbb57c2668117fd0572a273512c384f258ddb4ea58ba2c33d49670f135ce2fa415e57f594d4f1977f4b5c1edf28593897893cd WHIRLPOOL 5d5f20ec1b97772f0cd72bc99978fb63e470a8ec33b9c4ad858737818f74966bdba9732889a4227929b40c55406f8ba20bf2e5d95f9f9caf451dfa8661fdfc41
AUX minecraft.png 20345 SHA256 5ee86aeb4185637ea901f80e698e64d07dd138448fc4ff00d96d5992792a806b SHA512 ce91da9e858dd4ab63cd5643304d59ad7169788638cd8a59edce14f62cf1723896e9e8280cc0645930f2b1ba2e1202b4755280c2d546abba263a83d32e3770e0 WHIRLPOOL b33a8599e7ebffdb7a92d4edb59a20492658c34f76a301b723dcdaba16e120c3c04800b174be3f652687cb349742e5cacbff3cbe30672e8da1dc5a10b23534d3
DIST minecraft-1.2.1.jar 280212 SHA256 e8d90b2637b141b556670d8460d317aadb6e4f2e644e519995c428800b25f212 SHA512 64201f5d9522c43bded397e39b29eedeed5af224a064e13eede6f5d276d7b61702c5daae998c1fff8b34c6660f8f56a40bf0f43f4024119023c77672d6319659 WHIRLPOOL 3ecf370c4c99b6ae7b33efba5ca831c360b8c72ece5f059bbeb7c5e8e7686d6562338904522e907b5b1acaca17fe99b97e985ea770f8f4f20d6040d817e4f312
-EBUILD minecraft-1.2.1.ebuild 2750 SHA256 dea3465d28ec7e1b96deb20ccfdc4f4c1b1a326d956849c701d172a83a340c95 SHA512 fc9fd076e54714664dadc36a8c1da59b4171a4c18d7ff294e8f8cd84743008492b168dc802e7662eacb0addd1ba9d1e6c289938af8574d7e1bc905562df2dea2 WHIRLPOOL 4a0b7993b7e2629cf56320924702d1e9ae44d3bcc6037bf273de55dcac53a50e2afacbcb659e2a621e197e0d476fa899951220e0febf34b910b3b5e60c6ac38f
-MISC ChangeLog 5341 SHA256 f857e0c8d1c933639e2fa8a333d9a563f45820e21e5b7c40c7fb8935c3998dca SHA512 696f6d9e8c28d2b13ab063344223427f49e3c59d7f0e3963ade2e3fb283c189684b586ebc38b337849b3b8d6a96035d46ea99b8146e989d21e8875f6ade8605b WHIRLPOOL d2988c79e2ead9d4b50926a5954e0f53973a812ddf4674765277fa7135b550a58184d44ef5901010da53fb74ac90d495b2ad12ecfd00e458916c23af4f9a04e0
+EBUILD minecraft-1.2.1-r1.ebuild 2750 SHA256 dea3465d28ec7e1b96deb20ccfdc4f4c1b1a326d956849c701d172a83a340c95 SHA512 fc9fd076e54714664dadc36a8c1da59b4171a4c18d7ff294e8f8cd84743008492b168dc802e7662eacb0addd1ba9d1e6c289938af8574d7e1bc905562df2dea2 WHIRLPOOL 4a0b7993b7e2629cf56320924702d1e9ae44d3bcc6037bf273de55dcac53a50e2afacbcb659e2a621e197e0d476fa899951220e0febf34b910b3b5e60c6ac38f
+MISC ChangeLog 5632 SHA256 733b7433b9b954a724028a18da4f438bf37525870b4f79d98b636e0c2ea8bf32 SHA512 5ba5860fa99f7a7c8523898afed2b2d36af466022745729cdef7696b16da3b05733a3bf53d56ab93e7746646eedfaa6e03f6ffda1439f43cb6ebc4f360db7278 WHIRLPOOL 6c61018b44149a13b7c2dc996c0bdd725c7cef975c4d94ac46fc74a86013195693bb180d1fe517e0dec08be0263be0b1ab2e041cc20104274ea553ddc99b202e
MISC metadata.xml 525 SHA256 e9e868a41f0ca909166b4977b6188316196ef4016f0035f2ec18b3a2696ec918 SHA512 7e854e616459ccb206389144b5caf7f613632ee27fa718664e649c956d71a5652eff6aa88f1d85a5c16c76e83349b4ebeacacddb44c37320196252b869ff7d62 WHIRLPOOL 3a00529b7b3dad61a7158e86a4de5e154420772eeedf55c0fccc39da6b1b35317e75a2b0d0856d907896e60dfd134f200d8cff2d896c45701a1852cf29d2cc88
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQEcBAEBCAAGBQJSJPDEAAoJEGcL3XYFj+mJ0XYH/iPX1VDjNB+fjZBmcGohhXaq
-k2ONJAqtfxDAS5saR5sYQOvt3dV6+BmHBuTOdI00WllUjLVfbvJuHw8BJ35xaglg
-bUwn9gq9qVUl6yac0+2nlE/o8dXTVNRb5u02WDgEhcyF7h3H1BfbBiKwK9Ty3jR6
-s/baEMM6sgknCd2Tgli39ICHxavZ5Yyw6iNWKlwA7WeMJNQ+mub8LHc4ywBCXpWr
-KeMAmDAH5JilSAmP49B8a1Mxfs2ctUL29N8ENzVHVzJjs7qt0qYCNQkfnaCuJX6q
-/e5v7B0Pof2sCACgjnW3hn8RHa+2odgz5wHVf+aNWCADmDIA8Nbj+56Dde1J4qQ=
-=ZNDa
+iQEcBAEBCAAGBQJSJQYFAAoJEGcL3XYFj+mJVKIH/3CuK8Z48v6ckBu6DOxYAmV5
+reDE45wJoBZbJWijjJLtQmvjko+mEOs3Wwn9XnjTSBreEpB2x1A0RXgAElJHxEU6
+m+XA3liu5ix6e1UjHTBiBApWHLd7p37eEiZhacfbSjK6tseyUW8ZDKuJ0Th516Vu
+dVoUoQtCyPVAtcjrfp7JqXUGBcqWi/VKX/LJ/yu8ouXfSszd56wePLVxrX3jC2vQ
+i/0Zm4QRmL1Qou44OcJ2YvVyAtMCKjXsKaIiHzcPNodreAj6w/yhzAAUBN0EqpXt
+JdGOPhn6MbyUloE1DOpcwygUkoVL7vmUczT4WvSTFhqCygGsVu+Ml8TyEyAfFsQ=
+=uIli
-----END PGP SIGNATURE-----
diff --git a/games-action/minecraft/files/minecraft-gentoo b/games-action/minecraft/files/minecraft-gentoo
index fb99e28..47a05f3 100755
--- a/games-action/minecraft/files/minecraft-gentoo
+++ b/games-action/minecraft/files/minecraft-gentoo
@@ -14,14 +14,18 @@ try:
except ImportError:
ifilter = filter # Python 3
-klass = "net.minecraft.client.main.Main"
description = "Launch Minecraft using Gentoo's packaged libraries."
-usage = sys.argv[0] + " [java options] " + klass + " [minecraft options]"
+usage = sys.argv[0] + " [java options] net.minecraft.client.main.Main [minecraft options]"
try:
+ klass = "net.minecraft.client.main.Main"
split = sys.argv.index(klass)
except ValueError:
- split = None
+ try:
+ klass = "net.minecraft.launchwrapper.Launch"
+ split = sys.argv.index(klass)
+ except ValueError:
+ split = None
parser = argparse.ArgumentParser(description=description, usage=usage)
group = parser.add_argument_group("Java options")
@@ -32,7 +36,7 @@ java_args = parser.parse_known_args(sys.argv[1:split])
parser = argparse.ArgumentParser(description=description, usage=usage)
group = parser.add_argument_group("Minecraft options")
group.add_argument("--gameDir", dest="--gameDir", required=True)
-group.add_argument("--version", dest="--version", required=True)
+group.add_argument("--version", dest="--version")
minecraft_args = parser.parse_known_args(sys.argv[split+1:] if split else [])
def get_jar(pkg_name, jar):
@@ -56,6 +60,9 @@ def transform(path):
if path.startswith(libDir):
tail = path[len(libDir):]
+ match = re.match("org/ow2/asm/asm-all/([^/]+)/", tail)
+ if match: return (get_jar("asm-4.1", "asm.jar") or path) + ":" + (get_jar("asm-4.1", "asm-tree.jar") or path)
+
match = re.match("org/bouncycastle/bcprov-jdk15on/([^/]+)/", tail)
if match: return get_jar("bcprov", "bcprov.jar") or path
@@ -92,21 +99,28 @@ def transform(path):
return path
nativeDirs = set()
-libDir = getattr(minecraft_args[0], "--gameDir") + "/libraries/"
+parsed_java_args = vars(java_args[0])
+parsed_minecraft_args = vars(minecraft_args[0])
+
+libDir = parsed_minecraft_args["--gameDir"] + "/libraries/"
manager = EnvironmentManager(os.getenv("ROOT", ""), os.getenv("EPREFIX", "@GENTOO_PORTAGE_EPREFIX@"))
-origNativeDir = getattr(java_args[0], "origNativeDir")
-delattr(java_args[0], "origNativeDir")
+origNativeDir = parsed_java_args["origNativeDir"]
+del parsed_java_args["origNativeDir"]
+
+classpath = parsed_java_args["-classpath"].split(":")
+parsed_java_args["-classpath"] = ":".join(map(transform, classpath))
-classpath = getattr(java_args[0], "-classpath").split(":")
-setattr(java_args[0], "-classpath", ":".join(map(transform, classpath)))
+for k in list(parsed_minecraft_args.keys()):
+ if parsed_minecraft_args[k] == None:
+ del parsed_minecraft_args[k]
args = [ "java" ]
args.append("-Djava.library.path=" + ":".join(nativeDirs) + ":" + origNativeDir)
-args.extend(list(chain.from_iterable(vars(java_args[0]).items())))
+args.extend(list(chain.from_iterable(parsed_java_args.items())))
args.extend(java_args[1])
args.append(klass)
-args.extend(list(chain.from_iterable(vars(minecraft_args[0]).items())))
+args.extend(list(chain.from_iterable(parsed_minecraft_args.items())))
args.extend(minecraft_args[1])
sys.stderr.write(" ".join(args) + "\n")
diff --git a/games-action/minecraft/minecraft-1.2.1.ebuild b/games-action/minecraft/minecraft-1.2.1-r1.ebuild
similarity index 100%
rename from games-action/minecraft/minecraft-1.2.1.ebuild
rename to games-action/minecraft/minecraft-1.2.1-r1.ebuild
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/java:master commit in: games-action/minecraft/, games-action/minecraft/files/
@ 2013-09-04 21:31 James Le Cuirot
0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2013-09-04 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 0a7f09b43a4b00f075bb78ca09e7a3447cdba771
Author: James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk>
AuthorDate: Wed Sep 4 21:30:07 2013 +0000
Commit: James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk>
CommitDate: Wed Sep 4 21:30:07 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=0a7f09b4
Fix Python wrapper for older java-config versions.
Package-Manager: portage-2.2.1
Manifest-Sign-Key: 058FE989
---
games-action/minecraft/ChangeLog | 7 +++++++
games-action/minecraft/Manifest | 20 ++++++++++----------
games-action/minecraft/files/minecraft-gentoo | 12 ++++++++++--
...aft-1.2.1-r1.ebuild => minecraft-1.2.1-r2.ebuild} | 0
4 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/games-action/minecraft/ChangeLog b/games-action/minecraft/ChangeLog
index d4a8675..856a4c4 100644
--- a/games-action/minecraft/ChangeLog
+++ b/games-action/minecraft/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*minecraft-1.2.1-r2 (04 Sep 2013)
+
+ 04 Sep 2013; James Le Cuirot <chewi@aura-online.co.uk>
+ +minecraft-1.2.1-r2.ebuild, -minecraft-1.2.1-r1.ebuild,
+ files/minecraft-gentoo:
+ Fix Python wrapper for older java-config versions.
+
03 Sep 2013; James Le Cuirot <chewi@aura-online.co.uk>
minecraft-1.2.1-r1.ebuild:
Fix unpacking when FEATURES="userpriv" is present.
diff --git a/games-action/minecraft/Manifest b/games-action/minecraft/Manifest
index bda82a9..0993b5e 100644
--- a/games-action/minecraft/Manifest
+++ b/games-action/minecraft/Manifest
@@ -1,20 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX minecraft-gentoo 4711 SHA256 224fa4d4632d70bd44edf58f82807773767dbdad6efd73419107f471cd246221 SHA512 8b2dbafc7e4b772480b65e0181fbb57c2668117fd0572a273512c384f258ddb4ea58ba2c33d49670f135ce2fa415e57f594d4f1977f4b5c1edf28593897893cd WHIRLPOOL 5d5f20ec1b97772f0cd72bc99978fb63e470a8ec33b9c4ad858737818f74966bdba9732889a4227929b40c55406f8ba20bf2e5d95f9f9caf451dfa8661fdfc41
+AUX minecraft-gentoo 4889 SHA256 664348a55d1634e51723cc49e1a916dfa40e99de4ab89603156d6348ab0a0f25 SHA512 6550fbbbbce19afd188c82d438d1592f24d5ac6d2a4e73603c6569bda802a1d104a674292af5732eea2d7d8c8cbc75d14103e676e084b3e50ced6c549d7907f4 WHIRLPOOL f8527907755ff1885ec47cdb3a80662f2bdb13e89df281504d87a3bffd84991953ecba9a963e97a1ccd52b0ec44898c46fb7119ce12b442350ddf8b7cec909ee
AUX minecraft.png 20345 SHA256 5ee86aeb4185637ea901f80e698e64d07dd138448fc4ff00d96d5992792a806b SHA512 ce91da9e858dd4ab63cd5643304d59ad7169788638cd8a59edce14f62cf1723896e9e8280cc0645930f2b1ba2e1202b4755280c2d546abba263a83d32e3770e0 WHIRLPOOL b33a8599e7ebffdb7a92d4edb59a20492658c34f76a301b723dcdaba16e120c3c04800b174be3f652687cb349742e5cacbff3cbe30672e8da1dc5a10b23534d3
DIST minecraft-1.2.1.jar 280212 SHA256 e8d90b2637b141b556670d8460d317aadb6e4f2e644e519995c428800b25f212 SHA512 64201f5d9522c43bded397e39b29eedeed5af224a064e13eede6f5d276d7b61702c5daae998c1fff8b34c6660f8f56a40bf0f43f4024119023c77672d6319659 WHIRLPOOL 3ecf370c4c99b6ae7b33efba5ca831c360b8c72ece5f059bbeb7c5e8e7686d6562338904522e907b5b1acaca17fe99b97e985ea770f8f4f20d6040d817e4f312
-EBUILD minecraft-1.2.1-r1.ebuild 2769 SHA256 1fa1658ae95ceb8588fc5aa58e07d81d61857f43bfed17763db44fa6786467dc SHA512 73347fcca86000b8f15621914e7fa29a4df77dfe9058644dc332ea6605997ed0df61501a3e6ebfade49424db28b8cd8b2072fda9e685535dd46df15813d1b1b7 WHIRLPOOL d5c3dbd2875b38da96a76b8fca3928d22a4bb9e6de174ed7c3d8b1adabfbc21ebe796b8fe861a47cc637f0f0a25e14bd66366503c59aca8b7eaa766536984c6a
-MISC ChangeLog 5772 SHA256 b705d16f5c42f8624658cbf85891154d00eb784cbe5f70a2c0413d93ebaf8f2a SHA512 9f0d79df4294c342d7547756e42d20a449382e03595f5462f835fde203c8da2eac4e85c03d22fb5fc718bad800a70359c45ae360ea21f1915c21604b2f1a5678 WHIRLPOOL 5c1349dee010eb7f5123697ef8135c0c177512d52ffe88f361c1a153f8c082482428f2df693b0dc11212ccb724cc59820790c94d3152099c5d79eeb2d41c5f28
+EBUILD minecraft-1.2.1-r2.ebuild 2769 SHA256 1fa1658ae95ceb8588fc5aa58e07d81d61857f43bfed17763db44fa6786467dc SHA512 73347fcca86000b8f15621914e7fa29a4df77dfe9058644dc332ea6605997ed0df61501a3e6ebfade49424db28b8cd8b2072fda9e685535dd46df15813d1b1b7 WHIRLPOOL d5c3dbd2875b38da96a76b8fca3928d22a4bb9e6de174ed7c3d8b1adabfbc21ebe796b8fe861a47cc637f0f0a25e14bd66366503c59aca8b7eaa766536984c6a
+MISC ChangeLog 6002 SHA256 053dc206dcbe75383c83223bdea3a716fed7c3d897f364ddb4f1b1dd5ee40d13 SHA512 20c8a30534865940c6c00c693d8c46f5b1dfe917087ea11ebc8839d753a92b086a16ec4dd876bc63d3919b49aceac8cae5c687e55e3dc05bfc4e043059d351d6 WHIRLPOOL ce4a161786edf8810e4b2b32fffd5325aff4f22cce38a9a9447b915ffc12fd2b6cd85f468445a4570c7e155cff205562bafd44786ab306170ef0d1de23143fc0
MISC metadata.xml 525 SHA256 e9e868a41f0ca909166b4977b6188316196ef4016f0035f2ec18b3a2696ec918 SHA512 7e854e616459ccb206389144b5caf7f613632ee27fa718664e649c956d71a5652eff6aa88f1d85a5c16c76e83349b4ebeacacddb44c37320196252b869ff7d62 WHIRLPOOL 3a00529b7b3dad61a7158e86a4de5e154420772eeedf55c0fccc39da6b1b35317e75a2b0d0856d907896e60dfd134f200d8cff2d896c45701a1852cf29d2cc88
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQEcBAEBCAAGBQJSJYe+AAoJEGcL3XYFj+mJ5jUH/2g/pOeZrc8cLg7yzmeRb5TT
-p43Rbnl6yfYJGLw0VmKTflh34pujX1yO3p7Su/uVY8jW1md6Ph5pacerU/aAi0Fg
-QT2Sesutqu3E3yANPHVTjeIhCOU96mGXkENP9POuQFihZVS2/DZ92BU8gRF193qf
-KcQ83J/DF79fcoiOWzovQ4G/c8kbylzhYrhAYqQ7/pD1LVZV42y2fBOiFZK0E3Z/
-DNHUV0gdzFa83dz9zQNaVEoMBuW/EO4qRoJVIrZ7SHRdCo1627p8wWSO0pFDNly2
-U5iZcaOaCQGkXNQr0wE0oM7K1Y1CvXnNxiPFBAvMq9NLQWMrlB94UkmxGHnMrIQ=
-=yluY
+iQEcBAEBCAAGBQJSJ6ZfAAoJEGcL3XYFj+mJqAQIAKJa5X2exMrfE8zhjA1pAMOe
+9oZtPuK/Y19kUsU8Kjzr1h9GPHtJjjbcIKvAW4dI3mWFUaVa6WHWuuF66e/ZGvY8
+UVZvbKBkgncO6to1soWqein9e/FNQcY8VB8CjdkxOOCr4gTYyua/hnXFumQYzpgU
+ha8+HAaiYb6abBLFD7Zn3VXQ4Ci0bfh/okl8oh56hDF+Y4Bg37SeD2SvCv8DcgOS
+L9eGca+SuBn00BkkKex5uQPmoJgDBj0jUQ9y8664Hy8cO7adFGABUpVfi56wBnTR
+n1ktCZkNwaHi3CPHezBODxBm6mSE6PKkddXutgFyS0GnBt6G59AKld+2LHk1OxM=
+=vn9q
-----END PGP SIGNATURE-----
diff --git a/games-action/minecraft/files/minecraft-gentoo b/games-action/minecraft/files/minecraft-gentoo
index 47a05f3..08face3 100755
--- a/games-action/minecraft/files/minecraft-gentoo
+++ b/games-action/minecraft/files/minecraft-gentoo
@@ -4,7 +4,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-import argparse, os, re, sys
+import argparse, inspect, os, re, sys
from java_config_2.EnvironmentManager import EnvironmentManager
from java_config_2.Errors import UnexistingPackageError
from itertools import chain
@@ -102,8 +102,14 @@ nativeDirs = set()
parsed_java_args = vars(java_args[0])
parsed_minecraft_args = vars(minecraft_args[0])
+if inspect.getargspec(EnvironmentManager.__init__).args == 1:
+ # java-config < 2.2
+ manager = EnvironmentManager()
+else:
+ # java-config >= 2.2
+ manager = EnvironmentManager(os.getenv("ROOT", ""), os.getenv("EPREFIX", "@GENTOO_PORTAGE_EPREFIX@"))
+
libDir = parsed_minecraft_args["--gameDir"] + "/libraries/"
-manager = EnvironmentManager(os.getenv("ROOT", ""), os.getenv("EPREFIX", "@GENTOO_PORTAGE_EPREFIX@"))
origNativeDir = parsed_java_args["origNativeDir"]
del parsed_java_args["origNativeDir"]
@@ -124,4 +130,6 @@ args.extend(list(chain.from_iterable(parsed_minecraft_args.items())))
args.extend(minecraft_args[1])
sys.stderr.write(" ".join(args) + "\n")
+sys.stderr.flush()
+
os.execlp("java", *args)
diff --git a/games-action/minecraft/minecraft-1.2.1-r1.ebuild b/games-action/minecraft/minecraft-1.2.1-r2.ebuild
similarity index 100%
rename from games-action/minecraft/minecraft-1.2.1-r1.ebuild
rename to games-action/minecraft/minecraft-1.2.1-r2.ebuild
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/java:master commit in: games-action/minecraft/, games-action/minecraft/files/
@ 2013-09-09 21:37 James Le Cuirot
0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2013-09-09 21:37 UTC (permalink / raw
To: gentoo-commits
commit: e90bafecb54c694b0364ba2bf43f8f89006f1156
Author: James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk>
AuthorDate: Mon Sep 9 21:36:50 2013 +0000
Commit: James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk>
CommitDate: Mon Sep 9 21:36:50 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=e90bafec
My recent Python wrapper fix had a mistake.
Package-Manager: portage-2.2.1
Manifest-Sign-Key: 058FE989
---
games-action/minecraft/ChangeLog | 7 +++++++
games-action/minecraft/Manifest | 20 ++++++++++----------
games-action/minecraft/files/minecraft-gentoo | 2 +-
...aft-1.2.1-r3.ebuild => minecraft-1.2.1-r4.ebuild} | 0
4 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/games-action/minecraft/ChangeLog b/games-action/minecraft/ChangeLog
index ec49935..4fa3f40 100644
--- a/games-action/minecraft/ChangeLog
+++ b/games-action/minecraft/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*minecraft-1.2.1-r4 (09 Sep 2013)
+
+ 09 Sep 2013; James Le Cuirot <chewi@aura-online.co.uk>
+ +minecraft-1.2.1-r4.ebuild, -minecraft-1.2.1-r3.ebuild,
+ files/minecraft-gentoo:
+ My recent Python wrapper fix had a mistake.
+
*minecraft-1.2.1-r3 (05 Sep 2013)
05 Sep 2013; James Le Cuirot <chewi@aura-online.co.uk>
diff --git a/games-action/minecraft/Manifest b/games-action/minecraft/Manifest
index e9a95a0..efcf3e6 100644
--- a/games-action/minecraft/Manifest
+++ b/games-action/minecraft/Manifest
@@ -1,20 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX minecraft-gentoo 4889 SHA256 664348a55d1634e51723cc49e1a916dfa40e99de4ab89603156d6348ab0a0f25 SHA512 6550fbbbbce19afd188c82d438d1592f24d5ac6d2a4e73603c6569bda802a1d104a674292af5732eea2d7d8c8cbc75d14103e676e084b3e50ced6c549d7907f4 WHIRLPOOL f8527907755ff1885ec47cdb3a80662f2bdb13e89df281504d87a3bffd84991953ecba9a963e97a1ccd52b0ec44898c46fb7119ce12b442350ddf8b7cec909ee
+AUX minecraft-gentoo 4894 SHA256 938d6cf28bb9ff529db5225bda7edba1ef1f975a11b80b2f64f4721ceef5ecb4 SHA512 821c6301636256c354b36965cdbb7ae5f2948ca37325c22cefb81766c95ce8f674de15c94267451b6deaa8af409641b77067a6e347009a3535254d89836c327f WHIRLPOOL 75d4f1d355bdbcee217ce30b8e1cc5b22e68613e35f307a758d55ebd5ce89167163c4fb40cae20b3bb671f963fec56ea101fb2a041a3d8cbc60bc3de384cb130
AUX minecraft.png 20345 SHA256 5ee86aeb4185637ea901f80e698e64d07dd138448fc4ff00d96d5992792a806b SHA512 ce91da9e858dd4ab63cd5643304d59ad7169788638cd8a59edce14f62cf1723896e9e8280cc0645930f2b1ba2e1202b4755280c2d546abba263a83d32e3770e0 WHIRLPOOL b33a8599e7ebffdb7a92d4edb59a20492658c34f76a301b723dcdaba16e120c3c04800b174be3f652687cb349742e5cacbff3cbe30672e8da1dc5a10b23534d3
DIST minecraft-1.2.1.jar 280212 SHA256 e8d90b2637b141b556670d8460d317aadb6e4f2e644e519995c428800b25f212 SHA512 64201f5d9522c43bded397e39b29eedeed5af224a064e13eede6f5d276d7b61702c5daae998c1fff8b34c6660f8f56a40bf0f43f4024119023c77672d6319659 WHIRLPOOL 3ecf370c4c99b6ae7b33efba5ca831c360b8c72ece5f059bbeb7c5e8e7686d6562338904522e907b5b1acaca17fe99b97e985ea770f8f4f20d6040d817e4f312
-EBUILD minecraft-1.2.1-r3.ebuild 2782 SHA256 4a5500aec99b006c3194a8a4ec60220fbeaa6d0e6e89d9bbec175876b847f11c SHA512 6bc2940dae5f4967545fb116dfd3a7e36295e3b8cc7ca4a9fa0956ac8f46d7a9b26e301ea8d38a9de6811bf57d04d57e12dd17a4d9b13c00622919c1ea74e778 WHIRLPOOL 0e5d51fb971a8c723eda8f9f5cb798e34ed02c4f74bd9f7009d7cb38f000742718482c839a880f81ed612d4289931d780123b924a365ebb8351e95337c6654a7
-MISC ChangeLog 6210 SHA256 c14108dc767bca5505ec3a8798b0229dcfa07b67c7f348164346fb33277153e3 SHA512 cc20926133ddf6c7d08dffb1193a77faa56c8af29293a796288ba2c06cf5b70c6e147175723a9f98f03096dad55411fbd5f30aa21cda047605f8b1bfd025dac5 WHIRLPOOL 719693e7d208f5e21334b9db7d039fe4a3a9f262cbceba7e8c00976d6eda5defe0abed1238cbe5c17b074ca533caee085c52bc6ecfea56d73f6d04c8d73ee986
+EBUILD minecraft-1.2.1-r4.ebuild 2782 SHA256 4a5500aec99b006c3194a8a4ec60220fbeaa6d0e6e89d9bbec175876b847f11c SHA512 6bc2940dae5f4967545fb116dfd3a7e36295e3b8cc7ca4a9fa0956ac8f46d7a9b26e301ea8d38a9de6811bf57d04d57e12dd17a4d9b13c00622919c1ea74e778 WHIRLPOOL 0e5d51fb971a8c723eda8f9f5cb798e34ed02c4f74bd9f7009d7cb38f000742718482c839a880f81ed612d4289931d780123b924a365ebb8351e95337c6654a7
+MISC ChangeLog 6433 SHA256 5a7b642a2701a4d9f42887a406bfaf6b847e0a15bc943b736a070cf23d3175fe SHA512 30cae5fd13c2395fd8f60170dac6a4f3b6bdbeca230dafa0f7f0246d9cfbad368406ebfc1f1e7b319ea3ea0bcf9fb1ce35b135033b4116df3e78d526c23e149a WHIRLPOOL dd4bd006cb685683fe12bbb1d7bcdbfa2a7a45f603c64e014fc239638e4a61c27e6b9b9bd35ad2207f939fe1f400e0c60a24f6eb9aaa00737be4969b9a02bd94
MISC metadata.xml 525 SHA256 e9e868a41f0ca909166b4977b6188316196ef4016f0035f2ec18b3a2696ec918 SHA512 7e854e616459ccb206389144b5caf7f613632ee27fa718664e649c956d71a5652eff6aa88f1d85a5c16c76e83349b4ebeacacddb44c37320196252b869ff7d62 WHIRLPOOL 3a00529b7b3dad61a7158e86a4de5e154420772eeedf55c0fccc39da6b1b35317e75a2b0d0856d907896e60dfd134f200d8cff2d896c45701a1852cf29d2cc88
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQEcBAEBCAAGBQJSKQAxAAoJEGcL3XYFj+mJ9/MIALSD7Qj4uiOjv/fEa1lAuih0
-RYYTMbTT4kLdLM+mq8gDNX5TdJ6fNKEEX9SyBYsAAZrueSnrWfiu84xJcKUjR1Rp
-lSUur3nBwhuHY31JHtSb0ZMdvDXs8ZHc9spOpGoRgfc6qy0E4kgTi5BahGrKtWHo
-li48+wz0I8/sdhksfhdzMl8WJ1d7xHmUFC/zsw5u1UaZU1A6RdGa21tAra4scYBu
-Awt/pc2J2tCPOAtz5yobVzqRMVJlmUSUmlRjdQ3dPHFYSpimWx42rdiNqWKY8Jr2
-RVAYMvMEb7fnkZ1mDIx/5czwSLJKmVSJL5CVD7j4CWZko3cfJrx6+8Z/ShjQgFg=
-=Bye+
+iQEcBAEBCAAGBQJSLj9yAAoJEGcL3XYFj+mJ0zIH/3weHvHp7/m5PGfCZraxCbJo
+GB0V0T0jAZMEi83HRFNmlyFaFVz7oyOmxEVKMf9RHXWmfYomLV6Vy+xHItl35Jjm
+lgy1vqXEo3ruSP/kF8gWqFX/tcZw59Cbt6pijeKdb3hUYh7KYhxrVrQR/GFqzsPQ
+KTpuFGcmOx/+T2WmF60S9VAMrO0BA3ux1uGQAdowGVyqVEc6NdPYdmrmcTueBLUD
+faOE0lFrhapDCQ5uFr0mEc7wCbeBjXuGXnV5ajbWyGchK22KaomeG5WRJPxY3hBM
+bIUGSIovpcwujQsEB/KaPbM0bL5ucIYca9bKsqHT6YttdadgL4H6E6BLnyZDFiQ=
+=CT47
-----END PGP SIGNATURE-----
diff --git a/games-action/minecraft/files/minecraft-gentoo b/games-action/minecraft/files/minecraft-gentoo
index 08face3..8363898 100755
--- a/games-action/minecraft/files/minecraft-gentoo
+++ b/games-action/minecraft/files/minecraft-gentoo
@@ -102,7 +102,7 @@ nativeDirs = set()
parsed_java_args = vars(java_args[0])
parsed_minecraft_args = vars(minecraft_args[0])
-if inspect.getargspec(EnvironmentManager.__init__).args == 1:
+if len(inspect.getargspec(EnvironmentManager.__init__).args) == 1:
# java-config < 2.2
manager = EnvironmentManager()
else:
diff --git a/games-action/minecraft/minecraft-1.2.1-r3.ebuild b/games-action/minecraft/minecraft-1.2.1-r4.ebuild
similarity index 100%
rename from games-action/minecraft/minecraft-1.2.1-r3.ebuild
rename to games-action/minecraft/minecraft-1.2.1-r4.ebuild
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-09-09 21:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-04 21:31 [gentoo-commits] proj/java:master commit in: games-action/minecraft/, games-action/minecraft/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2013-09-09 21:37 James Le Cuirot
2013-09-02 21:43 James Le Cuirot
2013-09-01 16:08 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox