[patch] Bring all of the minecraft ebuilds in java overlay up to date

0001-Update-all-the-Minecraft-things-as-of-2014-02-09.patch (text/plain), 5.68 KB, created by Mike Nerone on 2014-02-09 13:40:48 UTC

From 17e7b9b9e59caadd9491b6cb9a148236a0563af9 Mon Sep 17 00:00:00 2001
From: layman <layman@localhost>
Date: Sun, 9 Feb 2014 07:14:19 -0600
Subject: [PATCH] Update all the Minecraft things...

Tweaks for servers:

A. 1.7 changed location of log lock file.
B. That file now remains when stopped, so ewaitfile doesn't work for
waiting for the PID. Replaced with a fuser-check loop.
C. minecraft-common version changed to 1.7 to reflect the restructuring
that happened in the 1.7 series (e.g. the above) with which it is
compatible. Because of such changes, individual server versions depend
on having the corresponding minecraft-common; this versioning scheme
provides a convenient way to ensure that via ebuild dependencies.
---
 .../{minecraft-1.2.1-r4.ebuild => minecraft-1.3.9.ebuild}     |  0
 .../bukkit/{bukkit-1679.ebuild => bukkit-1869.ebuild}         |  2 +-
 .../{craftbukkit-2624.ebuild => craftbukkit-2974.ebuild}      |  6 +++---
 games-server/minecraft-common/files/init.sh                   | 11 +++++++++--
 ...aft-common-20130203.ebuild => minecraft-common-1.7.ebuild} |  0
 ...raft-server-1.4.7.ebuild => minecraft-server-1.7.4.ebuild} |  4 ++--
 6 files changed, 15 insertions(+), 8 deletions(-)
 rename games-action/minecraft/{minecraft-1.2.1-r4.ebuild => minecraft-1.3.9.ebuild} (100%)
 rename games-server/bukkit/{bukkit-1679.ebuild => bukkit-1869.ebuild} (98%)
 rename games-server/craftbukkit/{craftbukkit-2624.ebuild => craftbukkit-2974.ebuild} (97%)
 rename games-server/minecraft-common/{minecraft-common-20130203.ebuild => minecraft-common-1.7.ebuild} (100%)
 rename games-server/minecraft-server/{minecraft-server-1.4.7.ebuild => minecraft-server-1.7.4.ebuild} (94%)

diff --git a/games-action/minecraft/minecraft-1.2.1-r4.ebuild b/games-action/minecraft/minecraft-1.3.9.ebuild
similarity index 100%
rename from games-action/minecraft/minecraft-1.2.1-r4.ebuild
rename to games-action/minecraft/minecraft-1.3.9.ebuild
diff --git a/games-server/bukkit/bukkit-1679.ebuild b/games-server/bukkit/bukkit-1869.ebuild
similarity index 98%
rename from games-server/bukkit/bukkit-1679.ebuild
rename to games-server/bukkit/bukkit-1869.ebuild
index 54adfb1..c9a1c6e 100644
--- a/games-server/bukkit/bukkit-1679.ebuild
+++ b/games-server/bukkit/bukkit-1869.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=4
-MY_PV="1.4.7-R1.0"
+MY_PV="1.7.2-R0.2"
 JAVA_PKG_IUSE="doc source"
 
 inherit games vcs-snapshot java-pkg-2 java-pkg-simple
diff --git a/games-server/craftbukkit/craftbukkit-2624.ebuild b/games-server/craftbukkit/craftbukkit-2974.ebuild
similarity index 97%
rename from games-server/craftbukkit/craftbukkit-2624.ebuild
rename to games-server/craftbukkit/craftbukkit-2974.ebuild
index 1919102..32ac132 100644
--- a/games-server/craftbukkit/craftbukkit-2624.ebuild
+++ b/games-server/craftbukkit/craftbukkit-2974.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=4
-MY_PV="1.4.7-R1.0"
+MY_PV="1.7.2-R0.2"
 MC_PV="${MY_PV%-*}"
 MC_PN="minecraft-server-unobfuscated"
 MC_JAR="${MC_PN}-${MC_PV}.jar"
@@ -28,7 +28,7 @@ CDEPEND="dev-java/commons-lang:2.1
 	dev-java/jline:2
 	dev-java/jopt-simple:0
 	>=dev-java/snakeyaml-1.9:0
-	~games-server/bukkit-1679:0"
+	~games-server/bukkit-1869:0"
 
 DEPEND="${CDEPEND}
 	>=virtual/jdk-1.6"
@@ -37,7 +37,7 @@ DEPEND="${CDEPEND}
 
 RDEPEND="${CDEPEND}
 	>=virtual/jre-1.6
-	games-server/minecraft-common"
+	~games-server/minecraft-common-1.7"
 
 S="${WORKDIR}/${P}"
 
diff --git a/games-server/minecraft-common/files/init.sh b/games-server/minecraft-common/files/init.sh
index 4eac995..c0cf128 100644
--- a/games-server/minecraft-common/files/init.sh
+++ b/games-server/minecraft-common/files/init.sh
@@ -8,7 +8,7 @@ extra_started_commands="console"
 MULTIVERSE="${SVCNAME#*.}"
 [[ "${SVCNAME}" == "${MULTIVERSE}" ]] && MULTIVERSE="main"
 
-LOCK="/var/lib/minecraft/${MULTIVERSE}/server.log.lck"
+LOCK="/var/lib/minecraft/${MULTIVERSE}/logs/latest.log"
 PID="/var/run/minecraft/${MULTIVERSE}.pid"
 SOCKET="/tmp/tmux-minecraft-${MULTIVERSE}"
 
@@ -35,7 +35,14 @@ start() {
 	local CMD="umask 027 && '${EXE}' '${MULTIVERSE}'"
 	su -c "/usr/bin/tmux -S '${SOCKET}' new-session -n 'minecraft-${MULTIVERSE}' -d \"${CMD}\"" "@GAMES_USER_DED@"
 
-	if ewaitfile 15 "${LOCK}" && local FUSER=$(fuser "${LOCK}" 2> /dev/null); then
+	local FUSER
+	local SECONDS=15
+	while ! FUSER=$(fuser "${LOCK}" 2> /dev/null) && [ $SECONDS -ne 0 ]; do
+		SECONDS=$(($SECONDS - 1))
+		sleep 1
+	done
+
+	if [ -n "${FUSER}" ]; then
 		echo "${FUSER}" > "${PID}"
 		eend 0
 	else
diff --git a/games-server/minecraft-common/minecraft-common-20130203.ebuild b/games-server/minecraft-common/minecraft-common-1.7.ebuild
similarity index 100%
rename from games-server/minecraft-common/minecraft-common-20130203.ebuild
rename to games-server/minecraft-common/minecraft-common-1.7.ebuild
diff --git a/games-server/minecraft-server/minecraft-server-1.4.7.ebuild b/games-server/minecraft-server/minecraft-server-1.7.4.ebuild
similarity index 94%
rename from games-server/minecraft-server/minecraft-server-1.4.7.ebuild
rename to games-server/minecraft-server/minecraft-server-1.7.4.ebuild
index eb8ca5e..40a66a2 100644
--- a/games-server/minecraft-server/minecraft-server-1.4.7.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.7.4.ebuild
@@ -7,7 +7,7 @@ inherit games java-pkg-2
 
 DESCRIPTION="Official dedicated server for Minecraft"
 HOMEPAGE="http://www.minecraft.net"
-SRC_URI="http://assets.minecraft.net/${PV//./_}/minecraft_server.jar -> ${P}.jar"
+SRC_URI="https://s3.amazonaws.com/Minecraft.Download/versions/${PV}/minecraft_server.${PV}.jar -> ${P}.jar"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -16,7 +16,7 @@ RESTRICT="mirror"
 
 DEPEND=""
 RDEPEND=">=virtual/jre-1.6
-	games-server/minecraft-common"
+	~games-server/minecraft-common-1.7"
 
 S="${WORKDIR}"
 
-- 
1.8.3.2