Attachment #369944 for bug #343197

Lines 3-9 Link Here

(-)a/games-server/bukkit/bukkit-1679.ebuild (-1 / +1 lines)
3	# $Header: $	3	# $Header: $
4		4
5	EAPI=4	5	EAPI=4
6	MY_PV="1.4.7-R1.0"	6	MY_PV="1.7.2-R0.2"
7	JAVA_PKG_IUSE="doc source"	7	JAVA_PKG_IUSE="doc source"
8		8
9	inherit games vcs-snapshot java-pkg-2 java-pkg-simple	9	inherit games vcs-snapshot java-pkg-2 java-pkg-simple




# $Header: $

EAPI=4
MY_PV="1.7.2-R0.2"
MC_PV="${MY_PV%-*}"
MC_PN="minecraft-server-unobfuscated"
MC_JAR="${MC_PN}-${MC_PV}.jar"

	dev-java/jline:2
	dev-java/jopt-simple:0
	>=dev-java/snakeyaml-1.9:0
	~games-server/bukkit-1869:0"

DEPEND="${CDEPEND}
	>=virtual/jdk-1.6"


RDEPEND="${CDEPEND}
	>=virtual/jre-1.6
	~games-server/minecraft-common-1.7"

S="${WORKDIR}/${P}"





MULTIVERSE="${SVCNAME#*.}"
[[ "${SVCNAME}" == "${MULTIVERSE}" ]] && MULTIVERSE="main"

LOCK="/var/lib/minecraft/${MULTIVERSE}/logs/latest.log"
PID="/var/run/minecraft/${MULTIVERSE}.pid"
SOCKET="/tmp/tmux-minecraft-${MULTIVERSE}"


	local CMD="umask 027 && '${EXE}' '${MULTIVERSE}'"
	su -c "/usr/bin/tmux -S '${SOCKET}' new-session -n 'minecraft-${MULTIVERSE}' -d \"${CMD}\"" "@GAMES_USER_DED@"

	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

Lines 7-13 inherit games java-pkg-2 Link Here

(-)a/games-server/minecraft-server/minecraft-server-1.4.7.ebuild (-3 / +2 lines)
7		7
8	DESCRIPTION="Official dedicated server for Minecraft"	8	DESCRIPTION="Official dedicated server for Minecraft"
9	HOMEPAGE="http://www.minecraft.net"	9	HOMEPAGE="http://www.minecraft.net"
10	SRC_URI="http://assets.minecraft.net/${PV//./_}/minecraft_server.jar -> ${P}.jar"	10	SRC_URI="https://s3.amazonaws.com/Minecraft.Download/versions/${PV}/minecraft_server.${PV}.jar -> ${P}.jar"
11	LICENSE="as-is"	11	LICENSE="as-is"
12	SLOT="0"	12	SLOT="0"
13	KEYWORDS="~amd64 ~x86"	13	KEYWORDS="~amd64 ~x86"
Lines 16-22 RESTRICT="mirror" Link Here
16		16
17	DEPEND=""	17	DEPEND=""
18	RDEPEND=">=virtual/jre-1.6	18	RDEPEND=">=virtual/jre-1.6
19	games-server/minecraft-common"	19	~games-server/minecraft-common-1.7"
20		20
21	S="${WORKDIR}"	21	S="${WORKDIR}"
22		22
23	-

Return to bug 343197

Lines 3-9 Link Here

(-)a/games-server/craftbukkit/craftbukkit-2624.ebuild (-3 / +3 lines)
3	# $Header: $	3	# $Header: $
4		4
5	EAPI=4	5	EAPI=4
6	MY_PV="1.4.7-R1.0"	6	MY_PV="1.7.2-R0.2"
7	MC_PV="${MY_PV%-*}"	7	MC_PV="${MY_PV%-*}"
8	MC_PN="minecraft-server-unobfuscated"	8	MC_PN="minecraft-server-unobfuscated"
9	MC_JAR="${MC_PN}-${MC_PV}.jar"	9	MC_JAR="${MC_PN}-${MC_PV}.jar"
Lines 28-34 CDEPEND="dev-java/commons-lang:2.1 Link Here
28	dev-java/jline:2	28	dev-java/jline:2
29	dev-java/jopt-simple:0	29	dev-java/jopt-simple:0
30	>=dev-java/snakeyaml-1.9:0	30	>=dev-java/snakeyaml-1.9:0
31	~games-server/bukkit-1679:0"	31	~games-server/bukkit-1869:0"
32		32
33	DEPEND="${CDEPEND}	33	DEPEND="${CDEPEND}
34	>=virtual/jdk-1.6"	34	>=virtual/jdk-1.6"
Lines 37-43 DEPEND="${CDEPEND} Link Here
37		37
38	RDEPEND="${CDEPEND}	38	RDEPEND="${CDEPEND}
39	>=virtual/jre-1.6	39	>=virtual/jre-1.6
40	games-server/minecraft-common"	40	~games-server/minecraft-common-1.7"
41		41
42	S="${WORKDIR}/${P}"	42	S="${WORKDIR}/${P}"
43		43

Lines 8-14 extra_started_commands="console" Link Here

(-)a/games-server/minecraft-common/files/init.sh (-2 / +9 lines)
8	MULTIVERSE="${SVCNAME#*.}"	8	MULTIVERSE="${SVCNAME#*.}"
9	[[ "${SVCNAME}" == "${MULTIVERSE}" ]] && MULTIVERSE="main"	9	[[ "${SVCNAME}" == "${MULTIVERSE}" ]] && MULTIVERSE="main"
10		10
11	LOCK="/var/lib/minecraft/${MULTIVERSE}/server.log.lck"	11	LOCK="/var/lib/minecraft/${MULTIVERSE}/logs/latest.log"
12	PID="/var/run/minecraft/${MULTIVERSE}.pid"	12	PID="/var/run/minecraft/${MULTIVERSE}.pid"
13	SOCKET="/tmp/tmux-minecraft-${MULTIVERSE}"	13	SOCKET="/tmp/tmux-minecraft-${MULTIVERSE}"
14		14
Lines 35-41 start() { Link Here
35	local CMD="umask 027 && '${EXE}' '${MULTIVERSE}'"	35	local CMD="umask 027 && '${EXE}' '${MULTIVERSE}'"
36	su -c "/usr/bin/tmux -S '${SOCKET}' new-session -n 'minecraft-${MULTIVERSE}' -d \"${CMD}\"" "@GAMES_USER_DED@"	36	su -c "/usr/bin/tmux -S '${SOCKET}' new-session -n 'minecraft-${MULTIVERSE}' -d \"${CMD}\"" "@GAMES_USER_DED@"
37		37
38	if ewaitfile 15 "${LOCK}" && local FUSER=$(fuser "${LOCK}" 2> /dev/null); then	38	local FUSER
		39	local SECONDS=15
		40	while ! FUSER=$(fuser "${LOCK}" 2> /dev/null) && [ $SECONDS -ne 0 ]; do
		41	SECONDS=$(($SECONDS - 1))
		42	sleep 1
		43	done
		44
		45	if [ -n "${FUSER}" ]; then
39	echo "${FUSER}" > "${PID}"	46	echo "${FUSER}" > "${PID}"
40	eend 0	47	eend 0
41	else	48	else