@@ -, +, @@ 
---
 .../{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%)
--- a/games-server/bukkit/bukkit-1679.ebuild	
+++ a/games-server/bukkit/bukkit-1679.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
--- a/games-server/craftbukkit/craftbukkit-2624.ebuild	
+++ a/games-server/craftbukkit/craftbukkit-2624.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}"
 
--- a/games-server/minecraft-common/files/init.sh	
+++ a/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
--- a/games-server/minecraft-server/minecraft-server-1.4.7.ebuild	
+++ a/games-server/minecraft-server/minecraft-server-1.4.7.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}"
 
--