Make sure the system expat is used

Package-Manager: portage-2.1.3_rc6

3 files changed, 31 insertions, 16 deletions

diff --git a/games-emulation/mamory/ChangeLog b/games-emulation/mamory/ChangeLog
index c2e093ef0d7f..c520cccf985c 100644
--- a/games-emulation/mamory/ChangeLog
+++ b/games-emulation/mamory/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/mamory
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mamory/ChangeLog,v 1.19 2007/01/19 02:16:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mamory/ChangeLog,v 1.20 2007/07/02 21:25:34 nyhm Exp $
+
+  02 Jul 2007; Tristan Heaven <nyhm@gentoo.org> mamory-0.2.23.ebuild:
+  Make sure the system expat is used
 
 *mamory-0.2.23 (19 Jan 2007)
 
diff --git a/games-emulation/mamory/Manifest b/games-emulation/mamory/Manifest
index 96b168c7eb05..129a7eafc975 100644
--- a/games-emulation/mamory/Manifest
+++ b/games-emulation/mamory/Manifest
@@ -1,12 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST mamory-0.2.23.tar.gz 514258 RMD160 4f1bf8526c1267211336f7e71bc2041fcf963716 SHA1 672c1324367c9aaba3fd0be77fefb3a312f94f30 SHA256 678d541aed23cd78d70fd473cd450a1dbe697a6bf6e0f4801f85e21d7583d11c
-EBUILD mamory-0.2.23.ebuild 1162 RMD160 620ffce0687b78021753d24e7a4d9cb6d17cfd15 SHA1 cd49df50642f4f4d1a6dd26dc9db857b4441ccb3 SHA256 41aa21e0a947d352649aafcc639f1d4b1cb941f843a093aa832b4f2d54cc73b1
-MD5 c16c460b76fb4bdc5575b2213277f1f5 mamory-0.2.23.ebuild 1162
-RMD160 620ffce0687b78021753d24e7a4d9cb6d17cfd15 mamory-0.2.23.ebuild 1162
-SHA256 41aa21e0a947d352649aafcc639f1d4b1cb941f843a093aa832b4f2d54cc73b1 mamory-0.2.23.ebuild 1162
-MISC ChangeLog 2479 RMD160 8a5c85e8d5d390efab8f482becfad09d18741b9f SHA1 3bbc33df58da51de84f3cfe084bd0c55210f58fd SHA256 2b8dbdf61582d0c20133ef16095a5988fe8b2b59ce3458522433f73f3b12f151
-MD5 27f8b984c61d6094e1cd8ed5aade2284 ChangeLog 2479
-RMD160 8a5c85e8d5d390efab8f482becfad09d18741b9f ChangeLog 2479
-SHA256 2b8dbdf61582d0c20133ef16095a5988fe8b2b59ce3458522433f73f3b12f151 ChangeLog 2479
+EBUILD mamory-0.2.23.ebuild 1291 RMD160 627213004fb3e8a357cf2cc8202e917321681c5c SHA1 c986ab3260a92d09fba36787422a9af2ba65c600 SHA256 0a2e1285446e02b37d50da895191a3cd20654bc90aecbb5a8ccdac1a943a97ce
+MD5 e6b995e75d691beb3594296bd7b2224c mamory-0.2.23.ebuild 1291
+RMD160 627213004fb3e8a357cf2cc8202e917321681c5c mamory-0.2.23.ebuild 1291
+SHA256 0a2e1285446e02b37d50da895191a3cd20654bc90aecbb5a8ccdac1a943a97ce mamory-0.2.23.ebuild 1291
+MISC ChangeLog 2582 RMD160 0af5aeae6d989814e63021fb5bd702a366974a55 SHA1 84ce14de0106545e0773ab77fc2ad6f4a4b52d01 SHA256 0c92dab60c83863b78022152e640703ecdc1407013a25e575618ddb26464408e
+MD5 67a766c3b2782a29406f201c2ab15f72 ChangeLog 2582
+RMD160 0af5aeae6d989814e63021fb5bd702a366974a55 ChangeLog 2582
+SHA256 0c92dab60c83863b78022152e640703ecdc1407013a25e575618ddb26464408e ChangeLog 2582
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -14,3 +17,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 4cfd6176c1bdfe248522ec5673fbf509 files/digest-mamory-0.2.23 241
 RMD160 ccd87290686a25148212595440c1bc643e547c23 files/digest-mamory-0.2.23 241
 SHA256 f96744e451bb0606f52688b464aa0c91e9073f31a9900233996052beafcf0eab files/digest-mamory-0.2.23 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGiW1Udz7hIScOURERAvzQAJ9ix7tXtEQ7ofPgA4H8RSe9E3YReQCgw9cv
+IGSEmnC27P3xk5D1R7YWoNU=
+=bal4
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/mamory/mamory-0.2.23.ebuild b/games-emulation/mamory/mamory-0.2.23.ebuild
index 6a70b0ca04d8..de8018bc2189 100644
--- a/games-emulation/mamory/mamory-0.2.23.ebuild
+++ b/games-emulation/mamory/mamory-0.2.23.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mamory/mamory-0.2.23.ebuild,v 1.1 2007/01/19 02:16:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mamory/mamory-0.2.23.ebuild,v 1.2 2007/07/02 21:25:34 nyhm Exp $
 
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
 inherit autotools games
 
 DESCRIPTION="ROM management tools and library"
@@ -15,24 +13,28 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
+DEPEND="dev-libs/expat"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	# Make sure the system expat is used
+	sed -i \
+		-e 's/#ifdef.*SYSEXPAT/#if 1/' \
+		mamory/amlxml.c mamory/amlxml.h \
+		|| die "sed amlxml failed"
 
 	# Remove hardcoded CFLAGS options
 	sed -i \
 		-e '/AC_ARG_ENABLE(debug,/ {N;N;N;d}' \
 		configure.ac \
-		|| die "sed failed"
+		|| die "sed configure.ac failed"
 
 	# Make it possible for eautoreconf to fix fPIC etc.
 	sed -i \
 		-e '/libcommon_la_LDFLAGS= -static/d' \
 		common/Makefile.am \
-		|| die "sed failed"
+		|| die "sed Makefile.am failed"
 
 	AT_M4DIR="config" eautoreconf || die
 }