Add fix for Gentoo zlib OF rename - 384587. Thanks to Steffen for patch!

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

3 files changed, 167 insertions, 6 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index 502739110536..71f3cbfbc2f5 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.57 2011/06/18 18:26:02 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.58 2011/10/01 13:27:34 rich0 Exp $
+
+*eternal-lands-1.9.2-r1 (01 Oct 2011)
+
+  01 Oct 2011; Richard Freeman <rich0@gentoo.org>
+  +eternal-lands-1.9.2-r1.ebuild:
+  Add fix for Gentoo zlib OF rename - 384587. Thanks to Steffen for patch!
 
 *eternal-lands-1.9.2 (18 Jun 2011)
 
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 5ec73ebbc5a0..d040c064cd0a 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX eternal-lands-1.9.0-glext.patch 302 RMD160 81702799ee5b06ed43e6a858c48fd36ab8450a8f SHA1 4281701bf4b1c87ca54f0f0476e524335c461b9b SHA256 696da44a3c5064881f738cc08af05a9e0aa9ae80c342b1d04170459f3834f016
 AUX eternal-lands-1.9.1-libpng.patch 604 RMD160 65e1c768de9f4633726c2bdce7dba5de7c2d29cb SHA1 3040914f67e91b9f85afdf382f19b039e1163c07 SHA256 a60bd9a16aa965e451a747bd43a5650af9d62b53a2e6fae93a6b3d94b2357e60
@@ -12,13 +12,14 @@ DIST eternal-lands.png 9955 RMD160 2f9c8acd96214577cf8b8027f0d20fb1fe7574ff SHA1
 EBUILD eternal-lands-1.9.0.ebuild 3969 RMD160 e1832d432a2e370503629b3c207b78fab5d8ad75 SHA1 cec8e0bbe9c962df9a292093111815b75d8493a7 SHA256 a7906a80e30e56f56f4b29595ac62a15abff7e350ca6a89c4d5ae98b2bbd7b5f
 EBUILD eternal-lands-1.9.0_p20100717.ebuild 3988 RMD160 ef3c64e5e393f73791facffed4af0d5d2e44b51a SHA1 1f09a17b2f94b1880274d0de08229a3e592df02d SHA256 7dc78ac38ed026ba471a8b48bbffb5543531c1c41824b8b2e2db043dff8e716d
 EBUILD eternal-lands-1.9.1.ebuild 4025 RMD160 0894df3f3aa7ae92880562dcabbddf00274dd864 SHA1 ec6918014b32fe7ce4b78c4976ce616b61130114 SHA256 9777e6aabe2ff4408f73b45607a3a959cbaab1f29debc72f1e555126004cbfab
+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
-MISC ChangeLog 10469 RMD160 a5e7239ad1a79b7ff047bca5521630041cda439e SHA1 45590d07fe052a6eb9705cceab8d095e75d37069 SHA256 d9c05679d9b2d124ec91521b1173133f687ca29155f739dac2a499d145975951
+MISC ChangeLog 10668 RMD160 b2b22762f062750009b0a807b874e4075883389b SHA1 01019b9508972045d0b58c6f4e85259aee616cd7 SHA256 801b38d5717a9c2e823244f49a0d1decf77c034756a3a7a89b8c5f0a65899a4a
 MISC metadata.xml 366 RMD160 ccbe7a2729da6681a8dbcd3d7ea23add0ff18c65 SHA1 667cc0ff9d3cc004febdc7e34903e6d81ad2c68d SHA256 3d87566ab1a097e5e331a2238ddb230fe2e5eb2b7097744a2aa609abf0d90732
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk387cAACgkQG4/rWKZmVWmtQgCgkJP53f+2D7ODvwKyyF3Puw0q
-pBUAniG5Sa9meOWHoiX7anTrqO83jNx+
-=cCUG
+iF4EAREIAAYFAk6HFU4ACgkQCMFw3lXsEjo6wgEAi0fgp7j14dk+tAw3Twun4Spd
+YyxEuDPvefKDnXpnEeIA/joYUYVVyOPL1OqCT/j86c6b9FK1lQzXvgZMy1t8EDeT
+=B9I0
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.2-r1.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..02aeeaad66db
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.2-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2011 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.2-r1.ebuild,v 1.1 2011/10/01 13:27:34 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="http://dev.gentoo.org/~rich0/distfiles/elc_1.9.2-20110618.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.2"
+
+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 {} \;
+
+}