Fix assertion error with >=libxml2-2.9 (bug #449352).

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

3 files changed, 121 insertions, 20 deletions

diff --git a/games-rpg/eternal-lands-data/ChangeLog b/games-rpg/eternal-lands-data/ChangeLog
index fbcd314bb14f..6363059d605d 100644
--- a/games-rpg/eternal-lands-data/ChangeLog
+++ b/games-rpg/eternal-lands-data/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/eternal-lands-data
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands-data/ChangeLog,v 1.29 2012/03/02 18:26:07 rich0 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands-data/ChangeLog,v 1.30 2013/07/06 16:58:23 calchan Exp $
+
+*eternal-lands-data-1.9.3-r1 (06 Jul 2013)
+
+  06 Jul 2013; Denis Dupeyron <calchan@gentoo.org>
+  +eternal-lands-data-1.9.3-r1.ebuild:
+  Fix assertion error with >=libxml2-2.9 (bug #449352).
 
   02 Mar 2012; Richard Freeman <rich0@gentoo.org>
   -eternal-lands-data-1.9.1.ebuild, -eternal-lands-data-1.9.1_p20110117.ebuild:
diff --git a/games-rpg/eternal-lands-data/Manifest b/games-rpg/eternal-lands-data/Manifest
index 803104251dfd..b532dcb2926e 100644
--- a/games-rpg/eternal-lands-data/Manifest
+++ b/games-rpg/eternal-lands-data/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST EL_sound_191.zip 43002046 RMD160 fe09613b055ead992ba6dee22efde67a73dd30ab SHA1 687382b559101f72656d858624d4d372f44ad0a8 SHA256 407a8220a7e2e9dc9a176e8868de2734565bf9bc83cb59a5a5c12571f29e157c
-DIST el_linux_192.zip 65888714 RMD160 f0fd296c8ed76463a1102331418ef4457b61729f SHA1 8d87c228b5519e520fec709f5b51d48458657396 SHA256 bd700258110b8ac7b540cce1517777ca718c22cb5330989e097206adf962b8e9
-DIST el_linux_193.zip 67104165 RMD160 6dadab4dd419bfd60779554e436309b3c9891c30 SHA1 026092aad4dbed57fe448552bf890d66d9aff8ae SHA256 32881313e48bf9a6520dc77b55ef1f4ede3b8922383c4976ca38d0aceeea628a
-DIST el_music_full-20060803.zip 65511882 RMD160 63955f223a8472c9956a5b6912dec7db924f32ee SHA1 fd470d14d50873704de2ae13876b411a58eb39de SHA256 1ea4de25081034ac684aaebf127ab6ca8524ba5367532863d84d63837dd631ec
-EBUILD eternal-lands-data-1.9.2-r1.ebuild 3189 RMD160 e42c9220103bb8fed208732fe7b4c361d8b716f0 SHA1 0c685af725ae65f2a22cd7ddc8dc0945b7da5956 SHA256 50cf509246a73d2888233190a9eda9547b2a69b8f3d026045458307fc3d6870a
-EBUILD eternal-lands-data-1.9.3.ebuild 3186 RMD160 b75e340cabe1b2c7152bbeb8ccdbd8f54c819d6e SHA1 2d02132d932c8fc17f35125d343373f8da2f7bce SHA256 057ddee9e789f85dca992ae29edc864b589793a22bcbd40468b4bea64e24fd6b
-MISC ChangeLog 5190 RMD160 933599e83ae3909ce1b34fc23c205f3bff918dcb SHA1 f9e2f2a2a9bad78254567489689b01562f1ef280 SHA256 75ee1958c26b8141e55732172e63f4a539d38537623f611c79121107aa831636
-MISC metadata.xml 586 RMD160 1cbf81bf89c35dc7a10bc0af26de44f14f21227e SHA1 02ce38637be4a991d71ea8f67eda5b585cda0127 SHA256 6ea27dae8902a12cc11500efb97c22c7d99c04811839612dba2972028168ab18
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk9REMQACgkQCMFw3lXsEjopCAD+M9uFoS/lQIHoi9m3MhS525t3
-gpLTZrL1Pqx2c/HmaGoA/REXkoUBtncolwfLlb2tqqnB1MDQFzyJMDTQsTWroptw
-=5NwH
------END PGP SIGNATURE-----
+DIST EL_sound_191.zip 43002046 SHA256 407a8220a7e2e9dc9a176e8868de2734565bf9bc83cb59a5a5c12571f29e157c SHA512 cc4103d6cdafffcf3926f0e90ca2555b09b22d9e00947f9e1790cfa5b7c945cff16f935ede886b498ac86028b77e8f1ead6eecab2d59848100233eed373c1310 WHIRLPOOL dbe4219e5702abb446cc62b9c33789126a96c575cbce3e26f3e134a8be3de7cbdd5ab34f4bb70e6428823d910bdbac8009fbbafbccd29f2f0d616a82e265e09d
+DIST el_linux_192.zip 65888714 SHA256 bd700258110b8ac7b540cce1517777ca718c22cb5330989e097206adf962b8e9
+DIST el_linux_193.zip 67104165 SHA256 32881313e48bf9a6520dc77b55ef1f4ede3b8922383c4976ca38d0aceeea628a SHA512 95de984998bfc27525b7986895d1154a74c6e4dbffb9bf115c1284213acf56a470967b55e0507ed6aacd67f972bce4689aa7cffb9acd16d92bf448f195dc4f0c WHIRLPOOL 43206d9b6e349fb2419d53c53d8169750044dc577d19d1fa30daa93adccee08180dea32faf8e4aeef7a0e0c9d8f7bdd3cdc88e4f06c59876350ffa29b4f1cdf8
+DIST el_music_full-20060803.zip 65511882 SHA256 1ea4de25081034ac684aaebf127ab6ca8524ba5367532863d84d63837dd631ec SHA512 dbd24cb20331d3640b3a5891faaf88aa0e71ba0564dfde347f2ea0fcb7e0f2700f1324ee8e988c551efb943183bbc823d4ee0373ed2b1f6d0300df76e25a524c WHIRLPOOL 3ab2a25cfab24a0e621dcb47db4a2e5edef96ae50b4cbc8d5e2e8c081453cf20ad7db5c5520d7cc859b1340fe8b52fde45c4bf02edb3f267ca0eaa113b0c596c
+EBUILD eternal-lands-data-1.9.2-r1.ebuild 3189 SHA256 50cf509246a73d2888233190a9eda9547b2a69b8f3d026045458307fc3d6870a SHA512 931d0590f6863e93417b3570a39a2a4ed90934c823c4e7a4981e41fb7f5e10b5cbca7d97e247c06c47ed06bc0670d423f9f14a53ea32ef9d3286812760bf066f WHIRLPOOL 6b25648284458ba83648f9ebf0e917f2653be29fdbf242a0f48c3a8b70bd8335a4113f0b2fa123dd00778dfc5139d754870a48c6c2f75d6532f40be1d5828c00
+EBUILD eternal-lands-data-1.9.3-r1.ebuild 3365 SHA256 e7829872aceb7733b69c1e3494d9c4444665632a45e927bb9263dc6350518142 SHA512 2e032eb229066fc9344be5b26fc00df6575f5e403ada48317ebf1492f8a24bf4e72d39e98007e35f0efb43d5627fc4ae5f383084005ad401da9857bc2063c05e WHIRLPOOL 38c3f7f7ee60c4001f7c29aa8609296f72c53e20cee015d07ee433b52c22f772923d709d4c6b63459911e6976eb464f089604b523482d4a6a7f6c30361a1f5f1
+EBUILD eternal-lands-data-1.9.3.ebuild 3186 SHA256 057ddee9e789f85dca992ae29edc864b589793a22bcbd40468b4bea64e24fd6b SHA512 108044f496e87b4e4d7f0c86b26f38028fe398449434064abe18a44ac8c1f728a0be7d5defa5d1c2d603755ee4bf4adfd61fe36902f367adcbf54e0d12e4d046 WHIRLPOOL 6497a53aa5e9f8616689dc6e3f8c9dd1757bdc67209ec239f8b31060cc15da354e59f7d09db7177d59a1e3cea7a75e79404d7ce79ba81022c582693fe34aaf1c
+MISC ChangeLog 5383 SHA256 b5c00c1980de2d2b840c50f715dc27fee95a39565a4ef4159ee4b0a06c0b67c4 SHA512 6a6b6306045ebe6a3a27518812aa6cc57b32fa1b61a36f3dd903383812e03d1f946cddc8d28611f83ff7504f1333408a0b783288db89314106ec24978711c42d WHIRLPOOL 5946bf9aae499c3c0728570858b4bed3f5df84a7d72da0cf07b49e94cf3c5763d70c6c61c28e79baec003df646155b191589a1d55c67cd9de4ee8b8c677db236
+MISC metadata.xml 586 SHA256 6ea27dae8902a12cc11500efb97c22c7d99c04811839612dba2972028168ab18 SHA512 86be17f3cb720d87b809c482992fbfbc676533434a047c8349418ac5c2295380550f695d20e709c56a7150b1b91bdbb1b16569ab6aed35a1421020b3138042f5 WHIRLPOOL 13225b4c6d0307438a36af07c0fee13c8725ea3cc3c46bed1ed5e13e4f6a47a7913a70fc5d6b588d2bc3d7e59dcf83ded7818f2a5b607404c5fb8f599a0347fe
diff --git a/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild b/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
new file mode 100644
index 000000000000..7e5671e7a0b4
--- /dev/null
+++ b/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild,v 1.1 2013/07/06 16:58:23 calchan Exp $
+
+EAPI=2
+
+inherit games
+
+MUSIC_DATE="20060803"
+
+MY_PV="${PV//_/}"
+MY_PV="${MY_PV//./}"
+MY_PN="${PN%*-data}"
+DESCRIPTION="An online MMORPG written in C and SDL"
+HOMEPAGE="http://www.eternal-lands.com"
+SRC_URI="http://www.eternal-lands.com/el_linux_193.zip
+		music? ( mirror://gentoo/el_music_full-${MUSIC_DATE}.zip )
+		sound? ( http://www.eternallands.co.uk/EL_sound_191.zip )"
+# WARNING: The music file is held at
+# http://www.eternal-lands.com/page/music.php
+# We only mirror it so that it is versioned by the date we mirrored it
+# AND prefixed with el_ so as not cause any conflicts. Maybe oneday they will
+# version their music, maybe not.
+
+LICENSE="eternal_lands"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="music sound bloodsuckermaps"
+
+DEPEND="app-arch/unzip
+		!bloodsuckermaps? ( !games-rpg/eternal-lands-bloodsucker )"
+
+PDEPEND="bloodsuckermaps? ( >=games-rpg/eternal-lands-bloodsucker-3.0_p20110618 )"
+
+# Maybe one day upstream will do things in a consistent way.
+S="${WORKDIR}/el_linux"
+
+src_prepare() {
+	# Move our music files to the correct directory
+	if use music ; then
+		mkdir music
+		mv ../*.ogg ../*.pll music || die
+	fi
+
+	# Fix assertion error with >=libxml2-2.9 (see bug #449352)
+	xmllint --noent actor_defs/actor_defs.xml > actor_defs.xml || die "Failed parsing actor_defs.xml"
+	mv actor_defs.xml actor_defs
+}
+
+src_install() {
+	# These are provided by eternal-lands ebuild
+
+	rm license.txt
+	rm commands.lst
+
+	# don't install maps if using alternate maps
+	if use bloodsuckermaps ; then
+		rm maps/anitora.dds maps/cave1.dds maps/cont2map10.dds
+		rm maps/cont2map11.dds maps/cont2map12.dds maps/cont2map13.dds
+		rm maps/cont2map14.dds maps/cont2map15.dds maps/cont2map16.dds
+		rm maps/cont2map17.dds maps/cont2map18.dds maps/cont2map19.dds
+		rm maps/cont2map1.dds maps/cont2map20.dds maps/cont2map21.dds
+		rm maps/cont2map22.dds maps/cont2map23.dds maps/cont2map24.dds
+		rm maps/cont2map2.dds maps/cont2map3.dds maps/cont2map4.dds
+		rm maps/cont2map5.dds maps/cont2map6.dds maps/cont2map7.dds
+		rm maps/cont2map8.dds maps/cont2map9.dds maps/irilion.dds
+		rm maps/legend.dds maps/map11.dds maps/map12.dds
+		rm maps/map13.dds maps/map14f.dds maps/map15f.dds
+		rm maps/map2.dds maps/map3.dds maps/map4f.dds
+		rm maps/map5nf.dds maps/map6nf.dds maps/map7.dds
+		rm maps/map8.dds maps/map9f.dds maps/seridia.dds
+		rm maps/startmap.dds
+	fi
+
+	insopts -m 0660
+	insinto "${GAMES_DATADIR}/${MY_PN}"
+	doins -r 2dobjects 3dobjects actor_defs animations maps meshes \
+		particles skeletons shaders textures languages shaders skybox \
+		*.lst 3dobjects.txt *.xml \
+		|| die "doins failed"
+
+	if use music ; then
+		doins -r music || die "doins music failed"
+	fi
+
+	# Removed sound from above - need to handle sound support
+
+	cd "${WORKDIR}"
+	if use sound ; then
+	   doins -r sound || die "doins sound failed"
+	fi
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	# Ensure that the files are writable by the game group for auto
+	# updating.
+	chmod -R g+rw "${ROOT}/${GAMES_DATADIR}/${MY_PN}"
+
+	# Make sure new files stay in games group
+	find "${ROOT}/${GAMES_DATADIR}/${MY_PN}" -type d -exec chmod g+sx {} \;
+}