From 523aa7ae0e37293c0074ecb00f759f4fe396d5c8 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 1 Mar 2012 21:03:57 +0000 Subject: [games-action/minecraft] Version bump. svn path=/java-overlay/; revision=8993 --- games-action/minecraft/ChangeLog | 6 ++ games-action/minecraft/Manifest | 6 +- .../minecraft/minecraft-20110223-r7.ebuild | 79 ---------------------- games-action/minecraft/minecraft-20120301.ebuild | 79 ++++++++++++++++++++++ 4 files changed, 88 insertions(+), 82 deletions(-) delete mode 100644 games-action/minecraft/minecraft-20110223-r7.ebuild create mode 100644 games-action/minecraft/minecraft-20120301.ebuild (limited to 'games-action') diff --git a/games-action/minecraft/ChangeLog b/games-action/minecraft/ChangeLog index efaf0e14..2263e68b 100644 --- a/games-action/minecraft/ChangeLog +++ b/games-action/minecraft/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*minecraft-20120301 (1 Mar 2012) + + 1 Mar 2012; James Le Cuirot + -minecraft-20110223-r7.ebuild, +minecraft-20120301.ebuild: + Version bump for new launcher. + *minecraft-20110223-r7 (17 Feb 2012) 17 Feb 2012; James Le Cuirot diff --git a/games-action/minecraft/Manifest b/games-action/minecraft/Manifest index 8821eaec..99dc3683 100644 --- a/games-action/minecraft/Manifest +++ b/games-action/minecraft/Manifest @@ -1,6 +1,6 @@ AUX minecraft.png 20345 RMD160 f35196576246eff41f0e1383829a954cb835a5f6 SHA1 e01d89bab2f28f7b2436b1d379bad311d214deb9 SHA256 5ee86aeb4185637ea901f80e698e64d07dd138448fc4ff00d96d5992792a806b AUX native-symlinks.sh 807 RMD160 dcc62ab23ae58e5dbec83f2948d823ffc72d9433 SHA1 9466a43d9587a559df3db81d97aa4f8e05ac035f SHA256 2d03ffe2e2ba5bcfc766a1e436cfd9ca97651428e226db4e647647b1d66009fc -DIST minecraft-20110223.jar 89406 RMD160 ffa47adc3b4f322c8eba2aad178664ceebbb2d22 SHA1 80055b408e0cbe42ca2fe29667c5616153cff634 SHA256 d275a1895b5d18e5a913d637d941cc1df83097add76103c2e02e4e513ceb982a -EBUILD minecraft-20110223-r7.ebuild 2349 RMD160 516074800d748d68a3d229cef27e731e527b14c7 SHA1 2c7ccbc9278a443da90fb1ae2a747eb8ae589d71 SHA256 2f76350359c040d7e28f89fd4a3b006636d514ede362b3254f4854ec201cbfbe -MISC ChangeLog 4043 RMD160 279962d6cfb42cd42a7ee6f2c57ed8b1879c4624 SHA1 4ce452879f0261910f285389bc213aa86d3d8a6c SHA256 bcb04b58574750ca7078a018e58557da3b93fc9d4b67be77cd9f2e397d882761 +DIST minecraft-20120301.jar 97825 RMD160 d2381d17ac4816ece19b6fd7eacc6e180fe37733 SHA1 125a4d338f5cab3370a706aec26fcbd4910a7909 SHA256 685cb9772588568295b27b7288c9630bb75fa1a46b9a3d9b21a7f291fce3e37a +EBUILD minecraft-20120301.ebuild 2352 RMD160 020ff8b14297e6c1ede2f40f47f1de082e3efe6d SHA1 1509d4f0aa4c520f791ef3f72b32825b6554c301 SHA256 69e077c6f539dc64b765e5bbdf290f8a995bc402c6cc935221aeffe8dae79cc2 +MISC ChangeLog 4228 RMD160 19528edf29173ae4353db519f929305b2ae12f16 SHA1 04bf638302536675f359faa33d2db0e11f1fb58b SHA256 e7ff0253068c8dd467f10cedc70cbf2d2efda0ec61d39aa36bcdbf39b0822022 MISC metadata.xml 525 RMD160 499e41f9c749ddc7d030d0ef07be4b75586a8628 SHA1 f60ada485166ca0f1aacecac04cc5aadcd298de0 SHA256 e9e868a41f0ca909166b4977b6188316196ef4016f0035f2ec18b3a2696ec918 diff --git a/games-action/minecraft/minecraft-20110223-r7.ebuild b/games-action/minecraft/minecraft-20110223-r7.ebuild deleted file mode 100644 index 31c0577c..00000000 --- a/games-action/minecraft/minecraft-20110223-r7.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2011 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,lwjgl-2.8 - 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 -} diff --git a/games-action/minecraft/minecraft-20120301.ebuild b/games-action/minecraft/minecraft-20120301.ebuild new file mode 100644 index 00000000..3189fca8 --- /dev/null +++ b/games-action/minecraft/minecraft-20120301.ebuild @@ -0,0 +1,79 @@ +# 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,lwjgl-2.8 + 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 +} -- cgit v1.2.3-65-gdbad