use use_with; tidy

3 files changed, 19 insertions, 32 deletions

diff --git a/media-libs/giflib/ChangeLog b/media-libs/giflib/ChangeLog
index 5d652e5c7f6a..db4fb124a3a1 100644
--- a/media-libs/giflib/ChangeLog
+++ b/media-libs/giflib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/giflib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.9 2003/05/18 21:56:28 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.10 2003/12/11 01:17:55 mr_bones_ Exp $
+
+  10 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org> giflib-4.1.0-r3.ebuild:
+  use use_with; tidy
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index cdbb8699eaa9..e15d39a7fbd6 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,3 +1,3 @@
-MD5 8e41fa0f65fa9e91a4eac5054f07e2af ChangeLog 1505
-MD5 7bd3d42e339d97001406a3ac6a73e55f giflib-4.1.0-r3.ebuild 1730
+MD5 b0b6bdd61ae5f08db33eab99775c5269 ChangeLog 1610
+MD5 6d9a2b12196693d85a5ef4f743b62691 giflib-4.1.0-r3.ebuild 1679
 MD5 93888297538e2f77defcfef93578b8db files/digest-giflib-4.1.0-r3 64
diff --git a/media-libs/giflib/giflib-4.1.0-r3.ebuild b/media-libs/giflib/giflib-4.1.0-r3.ebuild
index 3bca5e22278e..4fa8297fa9d2 100644
--- a/media-libs/giflib/giflib-4.1.0-r3.ebuild
+++ b/media-libs/giflib/giflib-4.1.0-r3.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.0-r3.ebuild,v 1.21 2003/09/22 01:31:47 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.0-r3.ebuild,v 1.22 2003/12/11 01:17:55 mr_bones_ Exp $
 
 inherit gnuconfig
 
 IUSE="X gif"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Library to handle, display and manipulate GIF images"
 HOMEPAGE="http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/libs/giflib/${P}.tar.gz
 	 ftp://prtr-13.ucsc.edu/pub/libungif/${P}.tar.gz"
 
-DEPEND="X? ( virtual/x11 )"
-
 SLOT="0"
 LICENSE="as-is | BSD"
 KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
 
+DEPEND="X? ( virtual/x11 )"
+
 src_unpack() {
 	unpack ${A} || die
 	cd ${S}
@@ -28,45 +27,30 @@ src_unpack() {
 }
 
 src_compile() {
-
-	local myconf
-
-	use X \
-		&& myconf="--with-x" \
-		|| myconf="--without-x"
-
-	econf ${myconf} || die
-	emake || die
-
+	econf `use_with x` || die
+	emake || die "emake failed"
 }
 
 src_install() {
-
-	make \
-		prefix=${D}/usr	\
-		install || die
+	make prefix=${D}/usr install || die "make install failed"
 
 	# if gif is not in USE, then ungif is preferred
-	use gif || rm -rf ${D}/usr/bin
-
-
-	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS ONEWS
-	dodoc PATENT_PROBLEMS README TODO
-	dodoc doc/*.txt
-	dohtml -r doc
+	use gif || rm -rf "${D}/usr/bin"
 
+	dodoc AUTHORS BUGS ChangeLog NEWS ONEWS PATENT_PROBLEMS \
+		README TODO doc/*.txt || die "dodoc failed"
+	dohtml -r doc || die "dohtml failed"
 }
 
 pkg_postinst() {
-
-	use gif 2>/dev/null && (
+	if use gif ; then
 		einfo "You had the gif USE flag set, so the binary from this library"
 		einfo "is your gif binary.  If you would prefer to use the binary from"
 		einfo "the ungif library, please unset the gif USE toggle, and remerge"
 		einfo "both this and libungif"
-	) || (
+	else
 		einfo "You did not have the gif USE toggle set, so the binary from"
 		einfo "the libungif package is assumed to be your gif binary. Please"
 		einfo "make sure that you have libungif emerged."
-	)
+	fi
 }