Multilib fix; also, remove unconditional call to make check in src_compile.

Package-Manager: portage-2.0.53_rc7

diff --git a/dev-util/libconf/ChangeLog b/dev-util/libconf/ChangeLog
index 6ac0547a2520d2b6fd8a855e57199a79bfdbc836..9aeacd3d894f3969b8bee26200eb325887b319d6 100644 (file)
--- a/dev-util/libconf/ChangeLog
+++ b/dev-util/libconf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/libconf
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/libconf/ChangeLog,v 1.37 2005/11/23 10:50:32 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/libconf/ChangeLog,v 1.38 2005/11/26 17:39:13 slarti Exp $
+
+  26 Nov 2005; Tom Martin <slarti@gentoo.org> libconf-0.42.10.ebuild:
+  Multilib fix -- ebuild will install to a multilib-strict environment now.
+  Also, remove call to make check in src_compile.
 
   23 Nov 2005; Luis Medinas <metalgod@gentoo.org> libconf-0.40.00.ebuild:
   Stable on amd64. Fixing bug #113291.

diff --git a/dev-util/libconf/Manifest b/dev-util/libconf/Manifest
index 44168ad773a8bcf438abc9482bb8a2775f8dbc90..d7134cc8ad05222e5ae62ee8af5c324037617ab7 100644 (file)
--- a/dev-util/libconf/Manifest
+++ b/dev-util/libconf/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1f2c38ee02dac48aaef8656d37ba6c3a ChangeLog 4589
+MD5 479b6c4373d1c4ce3c193fc8eed16503 ChangeLog 4784
 MD5 03c43e055ddc9c37a48a9ee955231f3b files/digest-libconf-0.40.00 73
 MD5 727d65ef0babfa4732ec75cd4d5f2ead files/digest-libconf-0.42.00 73
 MD5 727d65ef0babfa4732ec75cd4d5f2ead files/digest-libconf-0.42.00-r1 73
@@ -9,12 +9,12 @@ MD5 e6fd9a02a8d8d1cba6f06c9a6a3cdd07 files/digest-libconf-0.42.10 73
 MD5 341c99dd9cc268c12424631348073787 libconf-0.40.00.ebuild 751
 MD5 3ee593b728e83945abe66be4511bb15a libconf-0.42.00-r1.ebuild 1282
 MD5 e4b0d427f197e67a53277fd53ead0180 libconf-0.42.00.ebuild 1521
-MD5 f981924117136655c4249daa6cb76768 libconf-0.42.10.ebuild 1111
+MD5 b9a4d2fe4f5ce6d9955232177fe96268 libconf-0.42.10.ebuild 1488
 MD5 5f1c3b9a62f513d6a4802b57677c23bf metadata.xml 284
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDhEl4wUpWvClEHQoRAkUuAJ9lvDrxMYjLmJCvMv/kqpKfU6lLPQCaAo+q
-nCjE0g+YceQASHD6bm1wq1o=
-=CA78
+iD8DBQFDiJ3OCHk4+ZoBpvsRAlq0AJ0abZHvZrpBRbHWR7mJlNgrgOhOpACgghUe
+hEd/fHT0GWcNqgOe0jX5rfU=
+=39bK
 -----END PGP SIGNATURE-----

diff --git a/dev-util/libconf/libconf-0.42.10.ebuild b/dev-util/libconf/libconf-0.42.10.ebuild
index a1ce0781675d1c335e3bdf8debf3ddcf401a4e41..e22109e97060d2f4cc0dc94026270051fb4c0bed 100644 (file)
--- a/dev-util/libconf/libconf-0.42.10.ebuild
+++ b/dev-util/libconf/libconf-0.42.10.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/libconf/libconf-0.42.10.ebuild,v 1.1 2005/11/22 17:34:38 dams Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/libconf/libconf-0.42.10.ebuild,v 1.2 2005/11/26 17:39:13 slarti Exp $
+
+inherit multilib
 
 MY_P=perl-${PN/l/L}-${PV}
 S=${WORKDIR}/${MY_P}
@@ -19,19 +21,35 @@ dev-perl/XML-Twig
 python? ( >=dev-lang/python-2.4.2 )
 ruby? ( >=dev-lang/ruby-1.8.3 )"
 
-if use python; then
+if use python ; then
        mypython="python"
 fi
 
-if use ruby; then
+if use ruby ; then
        myruby="ruby"
 fi
 
 mybindings="c ${mypython} ${myruby} bash";
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       # Multilib fix
+       sed -i "/^LIB_DIR/ { s:lib:$(get_libdir): }" \
+               bindings/c/src/Makefile \
+               || die "bad sed"
+}
 src_compile() {
        emake "BINDINGS=${mybindings}" || die "make failed"
-       make "BINDINGS=${mybindings}" test || die "make test failed"
+
+       # Multilib fix. Needs to be in src_compile because we need to tweak the
+       # Makefile that's generated by extconf.rb. More elegant solution?
+       if use ruby ; then
+               sed -i "/^sitedir/ { s:lib:$(get_libdir): }" \
+                       bindings/ruby/src/Makefile \
+                       || die "bad sed"
+       fi
 }
 
 src_install() {