dont set EXTRA_ECONF

3 files changed, 44 insertions, 40 deletions

diff --git a/net-misc/pavuk/pavuk-0.9.28-r4.ebuild b/net-misc/pavuk/pavuk-0.9.28-r4.ebuild
index db23f64cd3c7..07ec7390e96e 100644
--- a/net-misc/pavuk/pavuk-0.9.28-r4.ebuild
+++ b/net-misc/pavuk/pavuk-0.9.28-r4.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.28-r4.ebuild,v 1.2 2004/09/12 11:59:37 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.28-r4.ebuild,v 1.3 2004/09/24 00:08:39 vapier Exp $
 
 inherit eutils
 
-IUSE="ssl X gtk gnome mozilla socks5 nls"
-
-S="${WORKDIR}/${PN}-0.9pl28"
 DESCRIPTION="Web spider and website mirroring tool"
 HOMEPAGE="http://www.pavuk.org/"
 SRC_URI="http://www.pavuk.org/sw/${PN}-0.9pl28.tgz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
+SLOT="0"
+KEYWORDS="ppc sparc x86"
+IUSE="ssl X gtk gnome mozilla socks5 nls"
 
 DEPEND=">=sys-apps/sed-4
 	sys-devel/gettext
@@ -25,6 +23,8 @@ DEPEND=">=sys-apps/sed-4
 	mozilla? ( net-www/mozilla )
 	socks5? ( net-misc/tsocks )"
 
+S="${WORKDIR}/${PN}-0.9pl28"
+
 src_unpack() {
 	unpack ${A}
 
@@ -41,8 +41,9 @@ src_unpack() {
 }
 
 src_compile() {
-	EXTRA_ECONF="--enable-threads --with-regex=auto" \
-		econf \
+	econf \
+		--enable-threads \
+		--with-regex=auto \
 		$(use_with X x) \
 		$(use_enable ssl) \
 		$(use_enable gtk) \
@@ -66,7 +67,7 @@ src_install() {
 
 	einstall || die
 
-	dodoc ABOUT-NLS README CREDITS FAQ NEWS AUTHORS COPYING BUGS \
+	dodoc README CREDITS FAQ NEWS AUTHORS BUGS \
 		TODO MAILINGLIST ChangeLog wget-pavuk.HOWTO jsbind.txt \
 		pavuk_authinfo.sample  pavukrc.sample
 }
diff --git a/net-p2p/amule/amule-2.0.0_rc5.ebuild b/net-p2p/amule/amule-2.0.0_rc5.ebuild
index a418f05878e7..8f3855a97155 100644
--- a/net-p2p/amule/amule-2.0.0_rc5.ebuild
+++ b/net-p2p/amule/amule-2.0.0_rc5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.0_rc5.ebuild,v 1.5 2004/08/24 17:37:32 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.0_rc5.ebuild,v 1.6 2004/09/24 00:09:30 vapier Exp $
 
 inherit wxwidgets
 
@@ -9,15 +9,14 @@ MY_P=${MY_P/_/}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org"
+HOMEPAGE="http://www.amule.org/"
 SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug gtk2 nls remote stats unicode gd"
 
-
 # USE "stats" enables external utilities (statistics and other)
 # USE "remote" enables remote controlling utilities (webserver, text client)
 
@@ -59,21 +58,21 @@ pkg_setup() {
 }
 
 src_compile() {
-
-	EXTRA_ECONF="--disable-optimise \
+	econf \
+		--disable-optimise \
 		--with-wx-config=${WX_CONFIG} \
-		--with-wxbase-config=${WX_CONFIG}"
-
-	econf `use_enable nls` \
-	`use_enable remote amulecmd` \
-	`use_enable remote amulecmdgui` \
-	`use_enable remote webserver` \
-	`use_enable remote webservergui` \
-	`use_enable stats cas` \
-	`use_enable stats wxcas` \
-	`use_enable stats alc` \
-	`use_enable stats alcc` \
-	`use_enable debug` || die
+		--with-wxbase-config=${WX_CONFIG} \
+		`use_enable nls` \
+		`use_enable remote amulecmd` \
+		`use_enable remote amulecmdgui` \
+		`use_enable remote webserver` \
+		`use_enable remote webservergui` \
+		`use_enable stats cas` \
+		`use_enable stats wxcas` \
+		`use_enable stats alc` \
+		`use_enable stats alcc` \
+		`use_enable debug` \
+		|| die
 
 	emake -j1 || die
 }
diff --git a/sys-apps/sed/sed-4.0.9.ebuild b/sys-apps/sed/sed-4.0.9.ebuild
index 551ae3d0d30f..63ea0839f031 100644
--- a/sys-apps/sed/sed-4.0.9.ebuild
+++ b/sys-apps/sed/sed-4.0.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.0.9.ebuild,v 1.21 2004/09/22 03:23:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.0.9.ebuild,v 1.22 2004/09/24 00:11:05 vapier Exp $
 
-inherit gnuconfig
+inherit gnuconfig flag-o-matic
 
 DESCRIPTION="Super-useful stream editor"
 HOMEPAGE="http://www.gnu.org/software/sed/sed.html"
@@ -17,24 +17,27 @@ RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-src_compile() {
-	# Needed for mips and probably others
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 	gnuconfig_update
+}
 
+src_compile() {
+	local myconf=""
 	if use macos || use ppc-macos ; then
-		EXTRA_ECONF="--program-prefix=g"
-	fi
-	econf $(use_enable nls) || die "Configure failed"
-	if use static ; then
-		emake LDFLAGS=-static || die "Static build failed"
-	else
-		emake || die "Shared build failed"
+		myconf="--program-prefix=g"
 	fi
+	econf \
+		$(use_enable nls) \
+		${myconf} \
+		|| die "Configure failed"
+
+	use static && append-ldflags -static
+	emake LDFLAGS="${LDFLAGS}" || die "build failed"
 }
 
 src_install() {
-	local x
-
 	into /
 	dobin sed/sed
 	if ! use build
@@ -50,6 +53,7 @@ src_install() {
 	rm -f "${D}/usr/bin/sed"
 	if use macos || use ppc-macos ; then
 		cd "${D}"
+		local x
 		for x in $(find . -name 'sed*' -print);
 		do
 			mv "$x" "${x//sed/gsed}"