fix m4 warning and make it so we dont need to run autotools

(Portage version: 2.0.51.20-r5)

1 files changed, 14 insertions, 27 deletions

diff --git a/media-libs/aalib/aalib-1.4_rc4-r2.ebuild b/media-libs/aalib/aalib-1.4_rc4-r2.ebuild
index c8a63d7d65eb..e6cb1aad51d7 100644
--- a/media-libs/aalib/aalib-1.4_rc4-r2.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc4-r2.ebuild,v 1.28 2005/04/09 22:00:32 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc4-r2.ebuild,v 1.29 2005/04/28 23:17:59 vapier Exp $
 
 inherit eutils libtool
 
@@ -13,48 +13,35 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~ppc-macos s390 sparc x86"
 IUSE="X slang gpm static"
 
-RDEPEND=">=sys-libs/ncurses-5.1
+DEPEND=">=sys-libs/ncurses-5.1
 	X? ( virtual/x11 )
 	gpm? ( sys-libs/gpm )
 	slang? ( >=sys-libs/slang-1.4.2 )"
-DEPEND="${RDEPEND}
-	!ppc-macos? (>=sys-devel/autoconf-2.58)
-	>=sys-devel/automake-1.4"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-m4.patch
 	if use ppc-macos; then
-		cd ${S}/src
-		epatch ${FILESDIR}/${PN}-osx.patch
+		cd src
+		epatch "${FILESDIR}"/${PN}-osx.patch
 	fi
-
-	elibtoolize
-
-	touch *
 }
 
 src_compile() {
-	# We need autoconf-2.5 and automake-1.4
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.4
-
-	econf	`use_with slang slang-driver` \
-		`use_with X x11-driver` \
-		`use_enable static`
-
-	if use ppc-macos; then
-		cd ${S}
-		sed -i -e 's:$(AUTOMAKE) --foreign --include-deps:$(AUTOMAKE) --foreign --include-deps -a -c -f:' src/Makefile
-	fi
-
+	econf \
+		$(use_with slang slang-driver) \
+		$(use_with X x11-driver) \
+		$(use_enable static) \
+		|| die
 	emake || die
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README*
+	dodoc ANNOUNCE AUTHORS ChangeLog NEWS README*
 }