Fix data dependency issue.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 166 insertions, 5 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index fc7a60baec15..57352131866f 100644
--- a/games-rpg/eternal-lands/ChangeLog
+++ b/games-rpg/eternal-lands/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/eternal-lands
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.60 2012/03/02 18:25:27 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.61 2012/03/02 18:28:24 rich0 Exp $
+
+*eternal-lands-1.9.3-r1 (02 Mar 2012)
+
+  02 Mar 2012; Richard Freeman <rich0@gentoo.org>
+  +eternal-lands-1.9.3-r1.ebuild:
+  Fix data dependency issue.
 
   02 Mar 2012; Richard Freeman <rich0@gentoo.org> -eternal-lands-1.9.0.ebuild,
   -eternal-lands-1.9.0_p20100717.ebuild, -eternal-lands-1.9.1.ebuild:
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 34ed7accd139..f90dcdf24949 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -9,13 +9,14 @@ DIST elc_1.9.3-20120213.tar.bz2 2401172 RMD160 c3088a744e1a3950086742206151ba07c
 DIST eternal-lands.png 9955 RMD160 2f9c8acd96214577cf8b8027f0d20fb1fe7574ff SHA1 34ee1c154178090f45ca171509f8ba00d26d6a21 SHA256 dd7d45cd9948fe7875ebd0bfcd1925d9b34e7606a223faf61d37a6dd2cd433fb
 EBUILD eternal-lands-1.9.2-r1.ebuild 4178 RMD160 3eb4421d112c613b9e2ba9d28a528294142f7774 SHA1 1202be6237babb04d16cdb758eab5c2e7173b0cc SHA256 8a4f33082bcb523a5a90dc5ef450b9520d864c495550ed7152ad8b27ed60d3fb
 EBUILD eternal-lands-1.9.2.ebuild 4072 RMD160 01c9e3a645d3c0ab195370fd3739d24b7a84033a SHA1 168d3192cef862bc6663748a51319a2d670b4224 SHA256 3d61f6f8051121cbd648bcec2e2dce8a87992117346d5ff66e6e1e59bd3db045
+EBUILD eternal-lands-1.9.3-r1.ebuild 4155 RMD160 3e722b75ab399e63182f1bbd73594dfd3ea783a4 SHA1 41e912d53ef8fc166a7038066d25fca499c01c90 SHA256 cf5b143cd6589b195976629b5b4a31861e45dc775cb9151f1ae63cfb7dbd6b91
 EBUILD eternal-lands-1.9.3.ebuild 4155 RMD160 51b6098ecf6dcddddd16ba16babd3292ef95b3d8 SHA1 4eed729c7144f66a3cc797fba1b4650c3e2ccb7d SHA256 2ca5492f0c691e6a8352867f0b6a0c2f110d424ba17947238ff657cd0d2ef9d8
-MISC ChangeLog 11026 RMD160 96d6590076f8bd4e300815058425f9800cabd8e8 SHA1 be08208585326bb4bca5af34c0b0617b46208177 SHA256 785ae62a90cbdbf22427da0435089e2c04ab3b1002b3603e2ddef04c0da1f4c9
+MISC ChangeLog 11179 RMD160 9acb6b70db4e86ce4cfcd7dd960f3c29551053d9 SHA1 a0b50b52013fafa51c4bc1775d85c39cd1c07843 SHA256 84359d729391e9829a1345f8d9366efff1e09890e7905e9a2c7386d3a2d082a4
 MISC metadata.xml 366 RMD160 ccbe7a2729da6681a8dbcd3d7ea23add0ff18c65 SHA1 667cc0ff9d3cc004febdc7e34903e6d81ad2c68d SHA256 3d87566ab1a097e5e331a2238ddb230fe2e5eb2b7097744a2aa609abf0d90732
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9REJwACgkQCMFw3lXsEjpK9wD9Hkk6ST9vp8ICzt5IA6IVY1RR
-EQ7cU9KopJ7VpffXDJQA/3bCBuR2pXf/DehRZopF5IXeoV+oD4e9WIQ60pK4X+Zw
-=IHZN
+iF4EAREIAAYFAk9REU4ACgkQCMFw3lXsEjo4IQD/cwDD1F3nYPaocezf7Z+J1fyf
+ZzBUQ9BXKUmYRbaENokA/RHHmrO2afHNK/lljkW6XAtYdLth9Rb8CbjQmsRFmjMX
+=79YP
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.3-r1.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.3-r1.ebuild
new file mode 100644
index 000000000000..3228ab2adbeb
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.3-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.9.3-r1.ebuild,v 1.1 2012/03/02 18:28:24 rich0 Exp $
+
+EAPI=2
+inherit eutils flag-o-matic games
+
+DESCRIPTION="An online MMORPG written in C and SDL"
+HOMEPAGE="http://www.eternal-lands.com"
+SRC_URI="mirror://gentoo/elc_1.9.3-20120213.tar.bz2
+	http://dev.gentoo.org/~rich0/distfiles/eternal-lands.png"
+
+LICENSE="eternal_lands"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="debug doc kernel_linux"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	virtual/opengl
+	virtual/glu
+	media-libs/libsdl[X]
+	media-libs/sdl-net
+	media-libs/sdl-image
+	media-libs/openal
+	media-libs/freealut
+	media-libs/libvorbis
+	dev-libs/libxml2
+	media-libs/cal3d[-16bit-indices]
+	media-libs/libpng
+	>=games-rpg/eternal-lands-data-1.9.3"
+
+DEPEND="${RDEPEND}
+	>=app-admin/eselect-opengl-1.0.6-r1
+	app-arch/unzip
+	doc? ( app-doc/doxygen
+		media-gfx/graphviz )"
+
+#ECVS_SERVER="cvs.elc.berlios.de:/cvsroot/elc"
+#ECVS_MODULE="elc"
+#ECVS_USER="anonymous"
+#ECVS_LOCALNAME="elc"
+#ECVS_PASS=""
+#ECVS_CVS_OPTIONS="-dP -z3"
+#ECVS_BRANCH="elc_1_8_0"
+
+#S="${WORKDIR}/${ECVS_MODULE}"
+S="${WORKDIR}/elc"
+
+src_unpack() {
+#	cvs_src_unpack
+	OPTIONS="-DDATA_DIR="\\\\\"${GAMES_DATADIR}/${PN}/\\\\\"""
+	S_CLIENT="${WORKDIR}/elc"
+	BROWSER="firefox"
+	unpack ${A}
+	cd "${S}"
+}
+
+src_prepare() {
+	# Add debugging options
+	if use debug ; then
+		OPTIONS="${OPTIONS} -DMEMORY_DEBUG"
+		append-flags -ggdb
+	fi
+
+	# Clean compile flags (make Gentoo friendly)
+	sed -i \
+		-e "s@CFLAGS=\$(PLATFORM) \$(CWARN) -O0 -ggdb -pipe@CFLAGS = ${CFLAGS} ${OPTIONS} @g" \
+		-e "s@CXXFLAGS=\$(PLATFORM) \$(CXXWARN) -O0 -ggdb -pipe@CXXFLAGS = ${CXXFLAGS} ${OPTIONS} @g" \
+		-e 's/lopenal/lopenal -l alut/' \
+		Makefile.linux || die "sed failed"
+
+	sed -i \
+		-e 's/#browser/browser/g' \
+		-e "s/browser = mozilla/#browser = ${BROWSER}/g" \
+		-e "s@#data_dir = /usr/local/games/el/@#data_dir = ${GAMES_DATADIR}/${PN}/@g" \
+		el.ini || die "sed failed"
+
+	# Support BSD in the Linux makefile - it's easier
+	use kernel_linux || sed -i \
+		-e 's/^CFLAGS=.*/& -DBSD/' \
+		Makefile.linux || die "sed failed"
+
+	# Clean up library flag order for --as-needed
+#	sed -i -e 's/@$(LINK) $(CFLAGS) $(LDFLAGS) -o $(EXE) $(OBJS)/@$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)/' Makefile.linux
+
+	# Finally, update the server
+	sed -i -e '/#server_address =/ s/.*/#server_address = game.eternal-lands.com/' \
+		el.ini || die "sed failed"
+
+	sed -i -e 's:FEATURES:EL_FEATURES:' make.defaults
+	sed -i -e 's:FEATURES:EL_FEATURES:' Makefile.linux
+
+	if use debug; then
+		sed -i -e 's/#\(EL_FEATURES += MEMORY_DEBUG\)/\1/' make.defaults
+		sed -i -e 's/#\(EL_FEATURES += MEMORY_DEBUG\)/\1/' Makefile.linux
+	fi
+
+	cp Makefile.linux Makefile
+
+	epatch "${FILESDIR}/${PN}-1.9.2-glext.patch"
+#	epatch "${FILESDIR}/${PN}-1.9.1-libpng.patch"
+
+# Fix for Gentoo zlib OF redefine
+
+	sed -i '1i#define OF(x) x' `find -name "*.c"` || die "sed failed"
+}
+
+src_compile() {
+	emake || die "make failed"
+
+	if use doc; then
+		emake docs || die "Failed to create documentation, try with USE=-doc"
+		mv ./docs/html/ ../client || die "Failed to move documentation directory"
+	fi
+}
+
+src_install() {
+	doicon "${DISTDIR}/eternal-lands.png" ${PN}.png
+
+	newgamesbin el.x86.linux.bin el \
+		|| die "newgamesbin failed"
+	make_desktop_entry el "Eternal Lands" \
+		|| die "make_desktop_entry failed"
+	insopts -m 0660
+	insinto "${GAMES_DATADIR}/${PN}"
+
+	doins -r *.ini *.txt commands.lst \
+		|| die "doins failed"
+
+	if use doc ; then
+		dohtml -r client/*
+	fi
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "Auto Update is now enabled in Eternal Lands"
+	elog "If an update occurs then the client will suddenly exit"
+	elog "Updates only happen when the game first loads"
+	elog "Please don't report this behaviour as a bug"
+
+	# Ensure that the files are writable by the game group for auto
+	# updating.
+	chmod -R g+rw "${ROOT}/${GAMES_DATADIR}/${PN}"
+
+	# Make sure new files stay in games group
+	find "${ROOT}/${GAMES_DATADIR}/${PN}" -type d -exec chmod g+sx {} \;
+
+}