autoconf fix

1 files changed, 20 insertions, 26 deletions

diff --git a/media-libs/libungif/libungif-4.1.0.1b.ebuild b/media-libs/libungif/libungif-4.1.0.1b.ebuild
index b0e3a22cc558..fe3759460ebd 100644
--- a/media-libs/libungif/libungif-4.1.0.1b.ebuild
+++ b/media-libs/libungif/libungif-4.1.0.1b.ebuild
@@ -1,50 +1,45 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libungif/libungif-4.1.0.1b.ebuild,v 1.5 2003/12/17 05:08:12 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libungif/libungif-4.1.0.1b.ebuild,v 1.6 2004/02/06 22:31:46 vapier Exp $
 
 inherit libtool
 
-IUSE="X gif"
-
 REAL_P=${P/.1b/b1}
-
-S=${WORKDIR}/${REAL_P}
 DESCRIPTION="A library for reading and writing gif images without LZW compression"
 HOMEPAGE="http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml"
 SRC_URI="mirror://gentoo/${REAL_P}.tar.bz2"
 
-DEPEND="X? ( virtual/x11 )"
-
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ppc64"
+IUSE="X gif"
+
+RDEPEND="X? ( virtual/x11 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58"
+
+S=${WORKDIR}/${REAL_P}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 <${FILESDIR}/libungif-CVS.patch
-	patch -p1 <${FILESDIR}/libungif-4.1.0-stdarg.patch
+	epatch ${FILESDIR}/libungif-CVS.patch
+	epatch ${FILESDIR}/libungif-4.1.0-stdarg.patch
 }
 
 src_compile() {
+	elibtoolize || die
+	export WANT_AUTOCONF=2.5
+
 	local myconf
-	use X \
-		&& myconf="--with-x" \
-		|| myconf="--without-x"
 	use alpha \
 		&& myconf="${myconf} --host=alpha-unknown-linux-gnu"
-
-	elibtoolize || die
-
-	econf ${myconf} || die
+	econf `use_with X x` ${myconf} || die
 	emake || die
 }
 
 src_install() {
-
-	make \
-		prefix=${D}/usr \
-		install || die
+	make prefix=${D}/usr install || die
 
 	use gif && rm -rf ${D}/usr/bin
 
@@ -55,15 +50,14 @@ src_install() {
 }
 
 pkg_postinst() {
-
-	use gif 2>/dev/null && (
+	if [ `use gif` ] ; then
 		einfo "You had the gif USE flag set, so it is assumed that you want"
 		einfo "the binary from giflib instead.  Please make sure you have"
 		einfo "giflib emerged.  Otherwise, unset the gif flag and remerge this"
-	) || (
+	else
 		einfo "You did not have the gif USE flag, so your gif binary is being"
 		einfo "provided by this package.  If you would rather use the binary"
 		einfo "from giflib, please set the gif USE flag, and re-emerge both"
 		einfo "this and giflib"
-	)
+	fi
 }