[patch] Ebuild patch 2

ebuild.patch (text/plain), 1.44 KB, created by Fabian Groffen on 2006-01-06 05:37:29 UTC

--- libwww-5.4.0-r4.ebuild
+++ libwww-5.4.0-r4.ebuild
@	6 Jan 2006 13:35:52 -0000@ -2,7 +2,7 @@
 # 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.14 2005/11/20 13:21:05 hardave Exp $
 
-inherit eutils multilib
+inherit eutils multilib autotools
 
 MY_P=w3c-${P}
 DESCRIPTION="A general-purpose client side WEB API"
@@ -41,18 +41,14 @@
 	epatch "${FILESDIR}"/${P}-mysql-4.1.patch
 	# Fix multiple problems, potentially exploitable (bug #109040)
 	epatch "${FILESDIR}"/${P}-htbound.patch
+	# Fix linking while using --as-needed
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	# Drop Externls rebuild after automake
+	epatch "${FILESDIR}/${P}-noexport.patch"
+	# Mac OS X has no automake 1.4, only 1.6.3
+	epatch "${FILESDIR}/${P}-automake-macos.patch"
 
-	export WANT_AUTOMAKE=1.4
-	aclocal || die "aclocal failed"
-
-	if use ppc-macos;
-	then
-		glibtoolize -c -f || die "glibtoolize failed"
-	else
-		libtoolize -c -f || die "libtoolize failed"
-	fi
-
-	autoconf || die "autoconf failed"
+	eautoreconf
 }
 
 src_compile() {
@@ -62,6 +58,7 @@
 		myconf="--without-mysql"
 	fi
 
+	export ac_cv_header_appkit_appkit_h=no
 	econf \
 		--enable-shared \
 		--enable-static \
@@ -71,8 +68,6 @@
 		$(use_with ssl) \
 		${myconf} || die "./configure failed"
 
-	emake check-am || die
-	use ppc-macos && echo "#undef HAVE_APPKIT_APPKIT_H" >> wwwconf.h
 	emake || die "Compilation failed"
 }