Various fixes for the tests suite.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 36 insertions, 24 deletions

diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index 681c0a600150..3b166d277f40 100644
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/expat
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.51 2006/03/30 15:03:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.52 2006/04/12 22:14:26 exg Exp $
+
+  12 Apr 2006; Emanuele Giaquinta <exg@gentoo.org>
+  +files/expat-2.0.0-test-64bit.patch, expat-2.0.0.ebuild:
+  Remove dep on dev-libs/check since it's not needed anymore. Use eautoreconf
+  instead of elibtoolize to fix test linking. Add patch to fix test build on 64
+  bit hosts (thanks Flameeyes).
 
   30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> expat-1.95.8.ebuild,
   expat-2.0.0.ebuild:
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index d721ed05f954..5d1ee3beef2d 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 025d48262f64ff8b31521fe7153cadb1 ChangeLog 6268
-RMD160 8bd0a746cdad1871172ff98be3488d31380c519c ChangeLog 6268
-SHA256 2ba89c115437414a6bff84a7358b0408ff4b7ebeb3635e52fd1c7e76cccde223 ChangeLog 6268
+MD5 ad36dbee5f33067e7e0efcd76a179393 ChangeLog 6563
+RMD160 f9d775e1d0934bb37ec5c26bb0b4261692176836 ChangeLog 6563
+SHA256 75ff02cd9eb0778c7e74da3f6066f034399bbf7f8f25cb27dff0c98486c85f41 ChangeLog 6563
 MD5 588390c6d6676d327a3594a5df5adb03 expat-1.95.7-r1.ebuild 798
 RMD160 96939e97c312a25636a13df80d06143730204d3a expat-1.95.7-r1.ebuild 798
 SHA256 80ad4dd86627ffcd222169c96517485eae4533fd859deff992df15b864f044d4 expat-1.95.7-r1.ebuild 798
@@ -13,9 +13,9 @@ SHA256 713268e6054578283e5aeef3bf157dccec6224b721628e8ca62f8c82aa8c5200 expat-1.
 MD5 c542c5ec7bf381313cf7f060fb964e97 expat-1.95.8.ebuild 1023
 RMD160 fe25644a293b94ccbea0eb79f73ee11635e2463d expat-1.95.8.ebuild 1023
 SHA256 f8574cc1565a8e27d0b3ec5be1d2eda07b407045c79e8937b454dfd5cd02a1c5 expat-1.95.8.ebuild 1023
-MD5 38da4d0cf0a2417e1eb9bbc37d998312 expat-2.0.0.ebuild 1211
-RMD160 fae6778de0447f8f1ea9ba708e5df9d3bb259c05 expat-2.0.0.ebuild 1211
-SHA256 e08b3864f92b45f4e6c15dc2eb5a85a2871f6a2168dca02c8a81cea8841300cb expat-2.0.0.ebuild 1211
+MD5 f86118be3a3c8216428d3e7180d81bb8 expat-2.0.0.ebuild 965
+RMD160 3d35754dda17f888d731448ff1bc77d918fa1c0f expat-2.0.0.ebuild 965
+SHA256 23d5f3cd54b4c35e5c5a4db223747bfb0f06a8f6a1571a3dbd7987bdd9515281 expat-2.0.0.ebuild 965
 MD5 0137bf2c738329ab03f266ac859b4613 files/digest-expat-1.95.7 64
 RMD160 7265c7a502ca2701336a99c0e955990174de579d files/digest-expat-1.95.7 64
 SHA256 3d417edb76c30f9fd4ffc52dc6511c254a8f2393e12ed659293a779937642cfe files/digest-expat-1.95.7 64
@@ -28,13 +28,16 @@ SHA256 f9629ffd024e258f09eb5412d39fb8fcc8243b638cbd3aeea1eb01f328e5345f files/di
 MD5 f02030d63a6ed3f89cf6a782c22c97c5 files/digest-expat-2.0.0 235
 RMD160 f9843590f3e371b609a26e3f7e0d7598c966f4c3 files/digest-expat-2.0.0 235
 SHA256 2797b4f9bc91ad0c665ff61cbbf04ccb9e5745f9e880f5238bf8060bf1e5b641 files/digest-expat-2.0.0 235
+MD5 00dc1c8eecaf52818b5a71bfaef06ad7 files/expat-2.0.0-test-64bit.patch 390
+RMD160 9044687fd2a342a94c99ee9421f562253a3bdcd8 files/expat-2.0.0-test-64bit.patch 390
+SHA256 8ecdd7c3f4b3bef9acce6420376b3c994a13d84e5753996b30bc8521567aaf4f files/expat-2.0.0-test-64bit.patch 390
 MD5 43e377139ff5f3b7415b94a8c8d5260d metadata.xml 158
 RMD160 f197c34c7dd71f6025e93436e3f999137928554a metadata.xml 158
 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEK/M7AiZjviIA2XgRAkb4AKDNOP39OKuNoY9FZuQAnFKphybKqwCeJlQa
-LYSEQY5SfVaZxJkN2a3EweU=
-=0d4z
+iD8DBQFEPXrY2iXjgNjfe5sRAgyUAJ48wPfJYlng4yFlH5LJi7SU583xYACdEy3u
+O+5AFUZEebN41Ts7asIj84g=
+=ezHO
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/expat/expat-2.0.0.ebuild b/dev-libs/expat/expat-2.0.0.ebuild
index a2a519748ac7..6ab4f210185f 100644
--- a/dev-libs/expat/expat-2.0.0.ebuild
+++ b/dev-libs/expat/expat-2.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.0.0.ebuild,v 1.3 2006/03/30 15:03:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.0.0.ebuild,v 1.4 2006/04/12 22:14:26 exg Exp $
 
-inherit libtool multilib
+inherit autotools
 
 DESCRIPTION="XML parsing libraries"
 HOMEPAGE="http://expat.sourceforge.net/"
@@ -11,24 +11,16 @@ SRC_URI="mirror://sourceforge/expat/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="test"
+IUSE=""
 
-DEPEND="test? ( >=dev-libs/check-0.8 )"
+DEPEND=""
 RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	elibtoolize
-}
-
-src_test() {
-	if ! use test && [[ -z $(best_version dev-libs/check) ]] ; then
-		ewarn "You dont have USE=test and dev-libs/check is not installed."
-		ewarn "src_test will be skipped."
-		return 0
-	fi
-	make check || die "make check failed"
+	epatch ${FILESDIR}/${P}-test-64bit.patch
+	eautoreconf
 }
 
 src_install() {
diff --git a/dev-libs/expat/files/expat-2.0.0-test-64bit.patch b/dev-libs/expat/files/expat-2.0.0-test-64bit.patch
new file mode 100644
index 000000000000..07d7b643089d
--- /dev/null
+++ b/dev-libs/expat/files/expat-2.0.0-test-64bit.patch
@@ -0,0 +1,11 @@
+--- tests/runtests.c.old	2006-04-12 11:32:20.616132185 +0200
++++ tests/runtests.c	2006-04-12 11:32:27.152122381 +0200
+@@ -1176,7 +1176,7 @@
+                         const XML_Char *systemId,
+                         const XML_Char *publicId) 
+ {
+-    int callno = 1 + (int)XML_GetUserData(parser);
++    long callno = 1 + (int)XML_GetUserData(parser);
+     char *text;
+     XML_Parser p2;
+