fix multilib-strict; bug 154279; credits to Christoph Mende

Package-Manager: portage-2.1.2-r5

diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index e302ea6db7c8b9190be8283157b4ab2c4cbd1cf3..bfdaffc720af6a3f32c68ce40e384bf1fd82743e 100644 (file)
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libxml2-2.6.27-tar_in_tests.patch 1233 RMD160 155939262d6d7d7533b7f8c1e94ed543c20677e6 SHA1 5f183dff302dc5d6cf0a4714e528afb2e03f5ada SHA256 ea16e680983ccc8d26350d9bfc2ab53c1613f089b70a421ea5a9bc2ad814222d
 MD5 2cabfd1ae865b683d15512b718c6a917 files/libxml2-2.6.27-tar_in_tests.patch 1233
 RMD160 155939262d6d7d7533b7f8c1e94ed543c20677e6 files/libxml2-2.6.27-tar_in_tests.patch 1233
@@ -10,14 +13,14 @@ EBUILD libxml2-2.6.26.ebuild 3117 RMD160 54c26fa30f8277e7283741b4c438eb627ad75f1
 MD5 1669c138af1f692e44e4ba68718cc973 libxml2-2.6.26.ebuild 3117
 RMD160 54c26fa30f8277e7283741b4c438eb627ad75f16 libxml2-2.6.26.ebuild 3117
 SHA256 3d2967e2c10ea88585228d550b7bd63d58b33fe59e1330e7626271c24c9e73f8 libxml2-2.6.26.ebuild 3117
-EBUILD libxml2-2.6.27.ebuild 3228 RMD160 c0937508215c0477a1cdfe7fbc5c55191344cd83 SHA1 e4617c5687c2d7cd94975a4243589cf0b23a808e SHA256 5d54528fdec188f9b90afa952cd27d82dceffa1166a6601e54721f787669e3d2
-MD5 07b1089cdcfbc6a1436ba712ea98e1f3 libxml2-2.6.27.ebuild 3228
-RMD160 c0937508215c0477a1cdfe7fbc5c55191344cd83 libxml2-2.6.27.ebuild 3228
-SHA256 5d54528fdec188f9b90afa952cd27d82dceffa1166a6601e54721f787669e3d2 libxml2-2.6.27.ebuild 3228
-MISC ChangeLog 20582 RMD160 499a53243d6d782b5a7e8ce45aeeb7e4d6b7dead SHA1 5fa81e815963685500cde02fed4ab5197b181729 SHA256 6f1f3b076a3bea982ad4694a3478bbc1c5795594262683f45961d7a7b802bad4
-MD5 66b753772c649f45d001ba249c1edacb ChangeLog 20582
-RMD160 499a53243d6d782b5a7e8ce45aeeb7e4d6b7dead ChangeLog 20582
-SHA256 6f1f3b076a3bea982ad4694a3478bbc1c5795594262683f45961d7a7b802bad4 ChangeLog 20582
+EBUILD libxml2-2.6.27.ebuild 3226 RMD160 58e293466d6989066f99a0aa17bf6cec78a95c47 SHA1 9117a388bed3a85efd37109f05545cd068438e84 SHA256 973d3193dbc024cc840963eff4020ee328a5265d3404585ec3ed0bbdd33d7e15
+MD5 064f17229871693d76b9e25a414a6240 libxml2-2.6.27.ebuild 3226
+RMD160 58e293466d6989066f99a0aa17bf6cec78a95c47 libxml2-2.6.27.ebuild 3226
+SHA256 973d3193dbc024cc840963eff4020ee328a5265d3404585ec3ed0bbdd33d7e15 libxml2-2.6.27.ebuild 3226
+MISC ChangeLog 20689 RMD160 82db458480771bc87b9138c35bdde0216968907f SHA1 38bbd3475567da424b12840fdab290c67f671f56 SHA256 6e48c91846f6c8ef62ab09dee09d6933bfa0c316a0fdc7a26691b60873bfc758
+MD5 1f04124c390b750b72ccac14711e215f ChangeLog 20689
+RMD160 82db458480771bc87b9138c35bdde0216968907f ChangeLog 20689
+SHA256 6e48c91846f6c8ef62ab09dee09d6933bfa0c316a0fdc7a26691b60873bfc758 ChangeLog 20689
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -28,3 +31,10 @@ SHA256 96488cff545e05e677002e2c56621e78c379e323721d2653d6c66034c9fdaf0b files/di
 MD5 6ed4a1410daa68756365714c1837988f files/digest-libxml2-2.6.27 747
 RMD160 2bf559252ed97b3dacdebd4468257f93da5749b4 files/digest-libxml2-2.6.27 747
 SHA256 b85b389225a0dee1359a01e90763181163325b878c503ec255272a4fae5222ab files/digest-libxml2-2.6.27 747
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+
+iD8DBQFFw0tYKRy60XGEcJIRAijlAJ0S67F+Qmn8efaqp5cAi9e55snKxQCfUpuv
+QbcM6QgDk3uHaA5vr/+/mx8=
+=xOBd
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/xalan-c/ChangeLog b/dev-libs/xalan-c/ChangeLog
index dce31fe24dc1db091136cb649b1e20fe9506565e..a100cb6596674dc02d78ebb89476d64b984b26d0 100644 (file)
--- a/dev-libs/xalan-c/ChangeLog
+++ b/dev-libs/xalan-c/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/xalan-c
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/ChangeLog,v 1.9 2006/12/04 17:49:19 dev-zero Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/ChangeLog,v 1.10 2007/02/02 14:28:30 blubb Exp $
+
+  02 Feb 2007; Simon Stelling <blubb@gentoo.org> xalan-c-1.10.0.ebuild:
+  fix multilib-strict; bug 154279; credits to Christoph Mende
 
   04 Dec 2006; Tiziano Müller <dev-zero@gentoo.org>
   -files/1.8.0-gcc34.patch, -xalan-c-1.7.0.ebuild, -xalan-c-1.8.0.ebuild,

diff --git a/dev-libs/xalan-c/Manifest b/dev-libs/xalan-c/Manifest
index dc53635aec2f6b5a160a6b16d0de4448df02ff68..a106998cc7e70a73da76951e817c0f00dfa3e5e4 100644 (file)
--- a/dev-libs/xalan-c/Manifest
+++ b/dev-libs/xalan-c/Manifest
@@ -1,16 +1,20 @@
 DIST Xalan-C_1_10_0-src.tar.gz 1554940 RMD160 537ba0be6a14e47eb4453c2d813b31ec416835ab SHA1 3fc63045048176e0ab00ce8aa0d15b2c1e5d646b SHA256 40797957fb22797894d33a2fa0e01e3b6cc509fb89bb772c0e835ae840714cfd
-EBUILD xalan-c-1.10.0.ebuild 1769 RMD160 d41884395a1951c4cf7a2214a831e459d630aa60 SHA1 1c8a4ff3d0efca6ad59446b679a82bd569fff1cd SHA256 01b6e7324c0424e0b8d1739d74b5f859cc7f63d863b8d38aa02e884f0cb2558d
-MD5 f4acedf071867812754229c718f5a85e xalan-c-1.10.0.ebuild 1769
-RMD160 d41884395a1951c4cf7a2214a831e459d630aa60 xalan-c-1.10.0.ebuild 1769
-SHA256 01b6e7324c0424e0b8d1739d74b5f859cc7f63d863b8d38aa02e884f0cb2558d xalan-c-1.10.0.ebuild 1769
-MISC ChangeLog 1459 RMD160 5389ffb1f9eafa66c4d3148a2f97c38f38a98561 SHA1 372c688fa65de54b79c8c9f3637b6b4a6584f4bc SHA256 426560bf2067c5c743e93b41f522db740b2b6d3a12b985c331cf4dad74f634e1
-MD5 b350f04b279b5034f5089bc6a30709cf ChangeLog 1459
-RMD160 5389ffb1f9eafa66c4d3148a2f97c38f38a98561 ChangeLog 1459
-SHA256 426560bf2067c5c743e93b41f522db740b2b6d3a12b985c331cf4dad74f634e1 ChangeLog 1459
+EBUILD xalan-c-1.10.0.ebuild 1807 RMD160 3fdc0a32d0edf2e0c357a54fb0080b89102c3a83 SHA1 19486ce48c8354ad00907bd8d07a5cac4ec85d5e SHA256 97edbf19bfba397d832a399ef176fe4b887390fa9368f811e666cafea05047a5
+MD5 5b96d854e03045568d4c60450319b6c6 xalan-c-1.10.0.ebuild 1807
+RMD160 3fdc0a32d0edf2e0c357a54fb0080b89102c3a83 xalan-c-1.10.0.ebuild 1807
+SHA256 97edbf19bfba397d832a399ef176fe4b887390fa9368f811e666cafea05047a5 xalan-c-1.10.0.ebuild 1807
+MISC ChangeLog 1592 RMD160 30727a866956607d497a72ddf88905b2aa8b08f4 SHA1 25f03fc71f82ffa565ded85dd557d608f1498617 SHA256 7076d24179d675361adbf3df0da04d1dd09b3ece9b83991e2aea7e4352fb0a48
+MD5 25f75e40af45077dcc5070135d1579f1 ChangeLog 1592
+RMD160 30727a866956607d497a72ddf88905b2aa8b08f4 ChangeLog 1592
+SHA256 7076d24179d675361adbf3df0da04d1dd09b3ece9b83991e2aea7e4352fb0a48 ChangeLog 1592
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
 MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156
 RMD160 537178ef5a820896e97475fb9aded47d50474bef metadata.xml 156
 SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f metadata.xml 156
+MISC xalan-c-1.10.0.ebuild.orig 1769 RMD160 d41884395a1951c4cf7a2214a831e459d630aa60 SHA1 1c8a4ff3d0efca6ad59446b679a82bd569fff1cd SHA256 01b6e7324c0424e0b8d1739d74b5f859cc7f63d863b8d38aa02e884f0cb2558d
+MD5 f4acedf071867812754229c718f5a85e xalan-c-1.10.0.ebuild.orig 1769
+RMD160 d41884395a1951c4cf7a2214a831e459d630aa60 xalan-c-1.10.0.ebuild.orig 1769
+SHA256 01b6e7324c0424e0b8d1739d74b5f859cc7f63d863b8d38aa02e884f0cb2558d xalan-c-1.10.0.ebuild.orig 1769
 MD5 b9a0ee8addeabd5f995d3557148be8e6 files/digest-xalan-c-1.10.0 259
 RMD160 aa4a33c3ebd6997f6e36eec4c98a85ac5341436e files/digest-xalan-c-1.10.0 259
 SHA256 3569e93d269bf4b619540c5039a8c05db10a2d783e89f993461aba179e5d1beb files/digest-xalan-c-1.10.0 259

diff --git a/dev-libs/xalan-c/xalan-c-1.10.0.ebuild b/dev-libs/xalan-c/xalan-c-1.10.0.ebuild
index 426fbd4036655df26b6ab6026624b0e0c26ed9d9..0ce775b2fee38361a3f6f39a5cc0839369c6f9e0 100644 (file)
--- a/dev-libs/xalan-c/xalan-c-1.10.0.ebuild
+++ b/dev-libs/xalan-c/xalan-c-1.10.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/xalan-c-1.10.0.ebuild,v 1.5 2006/12/04 17:49:19 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/xalan-c-1.10.0.ebuild,v 1.6 2007/02/02 14:28:30 blubb Exp $
 
-inherit toolchain-funcs eutils flag-o-matic
+inherit toolchain-funcs eutils flag-o-matic multilib
 
 MY_PV=${PV//./_}
 
@@ -41,7 +41,8 @@ src_compile() {
        export XERCESCROOT="/usr/include/xercesc"
        append-ldflags -pthread
 
-       ./runConfigure -p linux -c "$(tc-getCC)" -x "$(tc-getCXX)" -P /usr || die "configure failed"
+       ./runConfigure -p linux -c "$(tc-getCC)" -x "$(tc-getCXX)" -P /usr -C
+       --libdir=/usr/$(get_libdir) || die "configure failed"
        emake -j1 || die "emake failed"
 
        if use doc ; then