1 |
commit: 06e26e62e4848d313feee40ff5359575916fac25 |
2 |
Author: James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk> |
3 |
AuthorDate: Mon Sep 2 21:41:25 2013 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk> |
5 |
CommitDate: Mon Sep 2 21:41:25 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=06e26e62 |
7 |
|
8 |
Updated Python wrapper that works with older versions of the game. Uses bundled asm until we have 4.1 in the tree. |
9 |
|
10 |
Package-Manager: portage-2.2.1 |
11 |
Manifest-Sign-Key: 058FE989 |
12 |
|
13 |
--- |
14 |
games-action/minecraft/ChangeLog | 7 +++++ |
15 |
games-action/minecraft/Manifest | 20 ++++++------ |
16 |
games-action/minecraft/files/minecraft-gentoo | 36 +++++++++++++++------- |
17 |
...raft-1.2.1.ebuild => minecraft-1.2.1-r1.ebuild} | 0 |
18 |
4 files changed, 42 insertions(+), 21 deletions(-) |
19 |
|
20 |
diff --git a/games-action/minecraft/ChangeLog b/games-action/minecraft/ChangeLog |
21 |
index 4ee8d97..786248b 100644 |
22 |
--- a/games-action/minecraft/ChangeLog |
23 |
+++ b/games-action/minecraft/ChangeLog |
24 |
@@ -2,6 +2,13 @@ |
25 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
26 |
# $Header: $ |
27 |
|
28 |
+*minecraft-1.2.1-r1 (02 Sep 2013) |
29 |
+ |
30 |
+ 02 Sep 2013; James Le Cuirot <chewi@××××××××××××××.uk> |
31 |
+ +minecraft-1.2.1-r1.ebuild, -minecraft-1.2.1.ebuild, files/minecraft-gentoo: |
32 |
+ Updated Python wrapper that works with older versions of the game. Uses |
33 |
+ bundled asm until we have 4.1 in the tree. |
34 |
+ |
35 |
02 Sep 2013; James Le Cuirot <chewi@××××××××××××××.uk> minecraft-1.2.1.ebuild: |
36 |
Fix dependency typo. |
37 |
|
38 |
|
39 |
diff --git a/games-action/minecraft/Manifest b/games-action/minecraft/Manifest |
40 |
index f374d66..e06eecb 100644 |
41 |
--- a/games-action/minecraft/Manifest |
42 |
+++ b/games-action/minecraft/Manifest |
43 |
@@ -1,20 +1,20 @@ |
44 |
-----BEGIN PGP SIGNED MESSAGE----- |
45 |
Hash: SHA256 |
46 |
|
47 |
-AUX minecraft-gentoo 4239 SHA256 736aa5758c18d9bfb7354c5a7ec432b3dfd92a23b94f661c58d2fa60863b8eff SHA512 592d88c31d024e76cb5606f7ecb3bd616d44f5eb045cd4f31ec698ade0e12008a96f43d33bb5235301cd0524e942f8789948ba031266065ec5505cedbb4f413b WHIRLPOOL 1175f3d0608166ddbbe4024c17f8e813b4d558e27d9dfe6244c74b15c56878652e18cb50fa71937ba1e1881da8536d10c97293c2026b6afa5f33eda51fcbfbaf |
48 |
+AUX minecraft-gentoo 4711 SHA256 224fa4d4632d70bd44edf58f82807773767dbdad6efd73419107f471cd246221 SHA512 8b2dbafc7e4b772480b65e0181fbb57c2668117fd0572a273512c384f258ddb4ea58ba2c33d49670f135ce2fa415e57f594d4f1977f4b5c1edf28593897893cd WHIRLPOOL 5d5f20ec1b97772f0cd72bc99978fb63e470a8ec33b9c4ad858737818f74966bdba9732889a4227929b40c55406f8ba20bf2e5d95f9f9caf451dfa8661fdfc41 |
49 |
AUX minecraft.png 20345 SHA256 5ee86aeb4185637ea901f80e698e64d07dd138448fc4ff00d96d5992792a806b SHA512 ce91da9e858dd4ab63cd5643304d59ad7169788638cd8a59edce14f62cf1723896e9e8280cc0645930f2b1ba2e1202b4755280c2d546abba263a83d32e3770e0 WHIRLPOOL b33a8599e7ebffdb7a92d4edb59a20492658c34f76a301b723dcdaba16e120c3c04800b174be3f652687cb349742e5cacbff3cbe30672e8da1dc5a10b23534d3 |
50 |
DIST minecraft-1.2.1.jar 280212 SHA256 e8d90b2637b141b556670d8460d317aadb6e4f2e644e519995c428800b25f212 SHA512 64201f5d9522c43bded397e39b29eedeed5af224a064e13eede6f5d276d7b61702c5daae998c1fff8b34c6660f8f56a40bf0f43f4024119023c77672d6319659 WHIRLPOOL 3ecf370c4c99b6ae7b33efba5ca831c360b8c72ece5f059bbeb7c5e8e7686d6562338904522e907b5b1acaca17fe99b97e985ea770f8f4f20d6040d817e4f312 |
51 |
-EBUILD minecraft-1.2.1.ebuild 2750 SHA256 dea3465d28ec7e1b96deb20ccfdc4f4c1b1a326d956849c701d172a83a340c95 SHA512 fc9fd076e54714664dadc36a8c1da59b4171a4c18d7ff294e8f8cd84743008492b168dc802e7662eacb0addd1ba9d1e6c289938af8574d7e1bc905562df2dea2 WHIRLPOOL 4a0b7993b7e2629cf56320924702d1e9ae44d3bcc6037bf273de55dcac53a50e2afacbcb659e2a621e197e0d476fa899951220e0febf34b910b3b5e60c6ac38f |
52 |
-MISC ChangeLog 5341 SHA256 f857e0c8d1c933639e2fa8a333d9a563f45820e21e5b7c40c7fb8935c3998dca SHA512 696f6d9e8c28d2b13ab063344223427f49e3c59d7f0e3963ade2e3fb283c189684b586ebc38b337849b3b8d6a96035d46ea99b8146e989d21e8875f6ade8605b WHIRLPOOL d2988c79e2ead9d4b50926a5954e0f53973a812ddf4674765277fa7135b550a58184d44ef5901010da53fb74ac90d495b2ad12ecfd00e458916c23af4f9a04e0 |
53 |
+EBUILD minecraft-1.2.1-r1.ebuild 2750 SHA256 dea3465d28ec7e1b96deb20ccfdc4f4c1b1a326d956849c701d172a83a340c95 SHA512 fc9fd076e54714664dadc36a8c1da59b4171a4c18d7ff294e8f8cd84743008492b168dc802e7662eacb0addd1ba9d1e6c289938af8574d7e1bc905562df2dea2 WHIRLPOOL 4a0b7993b7e2629cf56320924702d1e9ae44d3bcc6037bf273de55dcac53a50e2afacbcb659e2a621e197e0d476fa899951220e0febf34b910b3b5e60c6ac38f |
54 |
+MISC ChangeLog 5632 SHA256 733b7433b9b954a724028a18da4f438bf37525870b4f79d98b636e0c2ea8bf32 SHA512 5ba5860fa99f7a7c8523898afed2b2d36af466022745729cdef7696b16da3b05733a3bf53d56ab93e7746646eedfaa6e03f6ffda1439f43cb6ebc4f360db7278 WHIRLPOOL 6c61018b44149a13b7c2dc996c0bdd725c7cef975c4d94ac46fc74a86013195693bb180d1fe517e0dec08be0263be0b1ab2e041cc20104274ea553ddc99b202e |
55 |
MISC metadata.xml 525 SHA256 e9e868a41f0ca909166b4977b6188316196ef4016f0035f2ec18b3a2696ec918 SHA512 7e854e616459ccb206389144b5caf7f613632ee27fa718664e649c956d71a5652eff6aa88f1d85a5c16c76e83349b4ebeacacddb44c37320196252b869ff7d62 WHIRLPOOL 3a00529b7b3dad61a7158e86a4de5e154420772eeedf55c0fccc39da6b1b35317e75a2b0d0856d907896e60dfd134f200d8cff2d896c45701a1852cf29d2cc88 |
56 |
-----BEGIN PGP SIGNATURE----- |
57 |
Version: GnuPG v2.0.20 (GNU/Linux) |
58 |
|
59 |
-iQEcBAEBCAAGBQJSJPDEAAoJEGcL3XYFj+mJ0XYH/iPX1VDjNB+fjZBmcGohhXaq |
60 |
-k2ONJAqtfxDAS5saR5sYQOvt3dV6+BmHBuTOdI00WllUjLVfbvJuHw8BJ35xaglg |
61 |
-bUwn9gq9qVUl6yac0+2nlE/o8dXTVNRb5u02WDgEhcyF7h3H1BfbBiKwK9Ty3jR6 |
62 |
-s/baEMM6sgknCd2Tgli39ICHxavZ5Yyw6iNWKlwA7WeMJNQ+mub8LHc4ywBCXpWr |
63 |
-KeMAmDAH5JilSAmP49B8a1Mxfs2ctUL29N8ENzVHVzJjs7qt0qYCNQkfnaCuJX6q |
64 |
-/e5v7B0Pof2sCACgjnW3hn8RHa+2odgz5wHVf+aNWCADmDIA8Nbj+56Dde1J4qQ= |
65 |
-=ZNDa |
66 |
+iQEcBAEBCAAGBQJSJQYFAAoJEGcL3XYFj+mJVKIH/3CuK8Z48v6ckBu6DOxYAmV5 |
67 |
+reDE45wJoBZbJWijjJLtQmvjko+mEOs3Wwn9XnjTSBreEpB2x1A0RXgAElJHxEU6 |
68 |
+m+XA3liu5ix6e1UjHTBiBApWHLd7p37eEiZhacfbSjK6tseyUW8ZDKuJ0Th516Vu |
69 |
+dVoUoQtCyPVAtcjrfp7JqXUGBcqWi/VKX/LJ/yu8ouXfSszd56wePLVxrX3jC2vQ |
70 |
+i/0Zm4QRmL1Qou44OcJ2YvVyAtMCKjXsKaIiHzcPNodreAj6w/yhzAAUBN0EqpXt |
71 |
+JdGOPhn6MbyUloE1DOpcwygUkoVL7vmUczT4WvSTFhqCygGsVu+Ml8TyEyAfFsQ= |
72 |
+=uIli |
73 |
-----END PGP SIGNATURE----- |
74 |
|
75 |
diff --git a/games-action/minecraft/files/minecraft-gentoo b/games-action/minecraft/files/minecraft-gentoo |
76 |
index fb99e28..47a05f3 100755 |
77 |
--- a/games-action/minecraft/files/minecraft-gentoo |
78 |
+++ b/games-action/minecraft/files/minecraft-gentoo |
79 |
@@ -14,14 +14,18 @@ try: |
80 |
except ImportError: |
81 |
ifilter = filter # Python 3 |
82 |
|
83 |
-klass = "net.minecraft.client.main.Main" |
84 |
description = "Launch Minecraft using Gentoo's packaged libraries." |
85 |
-usage = sys.argv[0] + " [java options] " + klass + " [minecraft options]" |
86 |
+usage = sys.argv[0] + " [java options] net.minecraft.client.main.Main [minecraft options]" |
87 |
|
88 |
try: |
89 |
+ klass = "net.minecraft.client.main.Main" |
90 |
split = sys.argv.index(klass) |
91 |
except ValueError: |
92 |
- split = None |
93 |
+ try: |
94 |
+ klass = "net.minecraft.launchwrapper.Launch" |
95 |
+ split = sys.argv.index(klass) |
96 |
+ except ValueError: |
97 |
+ split = None |
98 |
|
99 |
parser = argparse.ArgumentParser(description=description, usage=usage) |
100 |
group = parser.add_argument_group("Java options") |
101 |
@@ -32,7 +36,7 @@ java_args = parser.parse_known_args(sys.argv[1:split]) |
102 |
parser = argparse.ArgumentParser(description=description, usage=usage) |
103 |
group = parser.add_argument_group("Minecraft options") |
104 |
group.add_argument("--gameDir", dest="--gameDir", required=True) |
105 |
-group.add_argument("--version", dest="--version", required=True) |
106 |
+group.add_argument("--version", dest="--version") |
107 |
minecraft_args = parser.parse_known_args(sys.argv[split+1:] if split else []) |
108 |
|
109 |
def get_jar(pkg_name, jar): |
110 |
@@ -56,6 +60,9 @@ def transform(path): |
111 |
if path.startswith(libDir): |
112 |
tail = path[len(libDir):] |
113 |
|
114 |
+ match = re.match("org/ow2/asm/asm-all/([^/]+)/", tail) |
115 |
+ if match: return (get_jar("asm-4.1", "asm.jar") or path) + ":" + (get_jar("asm-4.1", "asm-tree.jar") or path) |
116 |
+ |
117 |
match = re.match("org/bouncycastle/bcprov-jdk15on/([^/]+)/", tail) |
118 |
if match: return get_jar("bcprov", "bcprov.jar") or path |
119 |
|
120 |
@@ -92,21 +99,28 @@ def transform(path): |
121 |
return path |
122 |
|
123 |
nativeDirs = set() |
124 |
-libDir = getattr(minecraft_args[0], "--gameDir") + "/libraries/" |
125 |
+parsed_java_args = vars(java_args[0]) |
126 |
+parsed_minecraft_args = vars(minecraft_args[0]) |
127 |
+ |
128 |
+libDir = parsed_minecraft_args["--gameDir"] + "/libraries/" |
129 |
manager = EnvironmentManager(os.getenv("ROOT", ""), os.getenv("EPREFIX", "@GENTOO_PORTAGE_EPREFIX@")) |
130 |
|
131 |
-origNativeDir = getattr(java_args[0], "origNativeDir") |
132 |
-delattr(java_args[0], "origNativeDir") |
133 |
+origNativeDir = parsed_java_args["origNativeDir"] |
134 |
+del parsed_java_args["origNativeDir"] |
135 |
+ |
136 |
+classpath = parsed_java_args["-classpath"].split(":") |
137 |
+parsed_java_args["-classpath"] = ":".join(map(transform, classpath)) |
138 |
|
139 |
-classpath = getattr(java_args[0], "-classpath").split(":") |
140 |
-setattr(java_args[0], "-classpath", ":".join(map(transform, classpath))) |
141 |
+for k in list(parsed_minecraft_args.keys()): |
142 |
+ if parsed_minecraft_args[k] == None: |
143 |
+ del parsed_minecraft_args[k] |
144 |
|
145 |
args = [ "java" ] |
146 |
args.append("-Djava.library.path=" + ":".join(nativeDirs) + ":" + origNativeDir) |
147 |
-args.extend(list(chain.from_iterable(vars(java_args[0]).items()))) |
148 |
+args.extend(list(chain.from_iterable(parsed_java_args.items()))) |
149 |
args.extend(java_args[1]) |
150 |
args.append(klass) |
151 |
-args.extend(list(chain.from_iterable(vars(minecraft_args[0]).items()))) |
152 |
+args.extend(list(chain.from_iterable(parsed_minecraft_args.items()))) |
153 |
args.extend(minecraft_args[1]) |
154 |
|
155 |
sys.stderr.write(" ".join(args) + "\n") |
156 |
|
157 |
diff --git a/games-action/minecraft/minecraft-1.2.1.ebuild b/games-action/minecraft/minecraft-1.2.1-r1.ebuild |
158 |
similarity index 100% |
159 |
rename from games-action/minecraft/minecraft-1.2.1.ebuild |
160 |
rename to games-action/minecraft/minecraft-1.2.1-r1.ebuild |