Reverting elibtoolize change, and back to ppc-macos conditional on request of leonardop

Package-Manager: portage-2.0.51.22-r3

diff --git a/net-libs/libwww/ChangeLog b/net-libs/libwww/ChangeLog
index 6ddc4006869c63708c8936fb9286fe859d62576e..cbfe7cb3a65320e28fe7afb1dbb60545a29a53a9 100644 (file)
--- a/net-libs/libwww/ChangeLog
+++ b/net-libs/libwww/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libwww
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.39 2005/10/28 13:26:24 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.40 2005/10/28 15:24:32 grobian Exp $
+
+  28 Oct 2005; Fabian Groffen <grobian@gentoo.org> libwww-5.4.0-r4.ebuild:
+  Reverting elibtoolize change, and back to ppc-macos conditional on request of
+  leonardop
 
   28 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   libwww-5.4.0-r4.ebuild:

diff --git a/net-libs/libwww/Manifest b/net-libs/libwww/Manifest
index df9aac3b4ddd12e3abf1b60a5c705ab2227a8e2b..24a8db5710e2ce2180ac8c1c8e3122fc7685fcfa 100644 (file)
--- a/net-libs/libwww/Manifest
+++ b/net-libs/libwww/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fc0e95dca3152edd410f764be926039b libwww-5.4.0-r4.ebuild 2075
+MD5 97f76b0f21eb8f2c17e643b2d7e95150 libwww-5.4.0-r4.ebuild 2155
 MD5 4c70dae7ce4964982b3ebe728633f9f0 libwww-5.4.0-r3.ebuild 1943
-MD5 7abc1ffa71f5bc3925737f9378810324 ChangeLog 5699
+MD5 722716e852a07a3522f5144af4859534 ChangeLog 5866
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 e99f48d15e0834666b84203b48805872 files/libwww-config-liborder.patch 776
 MD5 078b6239f293e1cc65f3f977b3136317 files/digest-libwww-5.4.0-r3 151
@@ -13,10 +10,3 @@ MD5 1866b237427a244b9923469b52f54473 files/libwww-5.4.0-autoconf-gentoo.diff 108
 MD5 0851f5aef9f0960efcdcabfdfa960341 files/libwww-5.4.0-disable-ndebug-gentoo.diff 370
 MD5 b0a8e638d02da0d0284e8555866f1f38 files/libwww-5.4.0-mysql-4.1.patch 1674
 MD5 6853cd848815d9446ef820e3a74878ca files/libwww-5.4.0-htbound.patch 13279
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDYicSKRy60XGEcJIRAmgbAJ9M4NVHtHE2nVBV8Jac3k1ZWAxVDwCgrbNP
-r6bLH/Nu57uK7pKsYslfjPk=
-=6aPk
------END PGP SIGNATURE-----

diff --git a/net-libs/libwww/libwww-5.4.0-r4.ebuild b/net-libs/libwww/libwww-5.4.0-r4.ebuild
index e559b25d35e5ba4dc04c9d5b01970e7cd9fb6526..e5c19fefb837917b636d609deeee767f4666f76b 100644 (file)
--- a/net-libs/libwww/libwww-5.4.0-r4.ebuild
+++ b/net-libs/libwww/libwww-5.4.0-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r4.ebuild,v 1.3 2005/10/28 13:26:24 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r4.ebuild,v 1.4 2005/10/28 15:24:32 grobian Exp $
 
-inherit eutils multilib libtool
+inherit eutils multilib
 
 MY_P=w3c-${P}
 DESCRIPTION="A general-purpose client side WEB API"
@@ -45,7 +45,12 @@ src_unpack() {
        export WANT_AUTOMAKE=1.4
        aclocal || die "aclocal failed"
 
-       elibtoolize || die "libtoolize failed"
+       if use ppc-macos;
+       then
+               glibtoolize -c -f || die "glibtoolize failed"
+       else
+               libtoolize -c -f || die "libtoolize failed"
+       fi
 
        autoconf || die "autoconf failed"
 }