From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B26AA1381F3 for ; Wed, 4 Sep 2013 21:31:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72F81E0CBF; Wed, 4 Sep 2013 21:31:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E341FE0CBF for ; Wed, 4 Sep 2013 21:31:23 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 80D5B33DA9B for ; Wed, 4 Sep 2013 21:31:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 34048E468F for ; Wed, 4 Sep 2013 21:31:21 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1378330207.0a7f09b43a4b00f075bb78ca09e7a3447cdba771.chewi@gentoo> Subject: [gentoo-commits] proj/java:master commit in: games-action/minecraft/, games-action/minecraft/files/ X-VCS-Repository: proj/java X-VCS-Files: games-action/minecraft/ChangeLog games-action/minecraft/Manifest games-action/minecraft/files/minecraft-gentoo games-action/minecraft/minecraft-1.2.1-r1.ebuild games-action/minecraft/minecraft-1.2.1-r2.ebuild X-VCS-Directories: games-action/minecraft/ games-action/minecraft/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 0a7f09b43a4b00f075bb78ca09e7a3447cdba771 X-VCS-Branch: master Date: Wed, 4 Sep 2013 21:31:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0a9dd23e-fd58-46ff-a1d8-5db6e0bdc762 X-Archives-Hash: dde9609f9fee3d4bf7150d47d237387e commit: 0a7f09b43a4b00f075bb78ca09e7a3447cdba771 Author: James Le Cuirot aura-online co uk> AuthorDate: Wed Sep 4 21:30:07 2013 +0000 Commit: James Le Cuirot aura-online co 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 + +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 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