From 267588855f8d68788260efb5b385c810b7461a6d Mon Sep 17 00:00:00 2001
From: Seemant Kulleen <seemant@gentoo.org>
Date: Fri, 28 Mar 2003 06:27:20 +0000
Subject: gettext is an optional dependency

---
 dev-libs/popt/ChangeLog          |  6 +++++-
 dev-libs/popt/popt-1.7-r1.ebuild | 11 +++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'dev-libs/popt')

diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog
index 8c6dfcc8f6e2..c86ee1827825 100644
--- a/dev-libs/popt/ChangeLog
+++ b/dev-libs/popt/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for dev-libs/popt
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.15 2003/03/20 13:32:44 vladimir Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.16 2003/03/28 06:27:20 seemant Exp $
 
 *popt-1.7-r1 (20 Mar 2003)
 
+  27 Mar 2003; Seemant Kulleen <seemant@gentoo.org> popt-1.7-r1.ebuild:
+  gettext is no longer a REQUIRED dependency, though it's a quirky way of
+  disabling it -- tsk tsk @ the upstream authors
+
   20 Mar 2003; Graham Forest <vladimir@gentoo.org> popt-1.7-r1.ebuild:
   Removed usage of pic USE flag
 
diff --git a/dev-libs/popt/popt-1.7-r1.ebuild b/dev-libs/popt/popt-1.7-r1.ebuild
index 4a3ca66d32bd..f4203754d895 100644
--- a/dev-libs/popt/popt-1.7-r1.ebuild
+++ b/dev-libs/popt/popt-1.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.7-r1.ebuild,v 1.1 2003/03/20 13:32:44 vladimir Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.7-r1.ebuild,v 1.2 2003/03/28 06:27:20 seemant Exp $
 
 inherit libtool
 
@@ -18,12 +18,15 @@ DEPEND="nls? ( sys-devel/gettext )"
 src_compile() {
 	elibtoolize
 	local myconf="--with-gnu-ld"
-	use nls || myconf="${myconf} --disable-nls"
-	econf ${myconf}
+	use nls || ( \
+		myconf="${myconf} --disable-nls"
+		touch ../rpm.c
+	)
+	econf ${myconf} || die
 	make || die
 }
 
 src_install() {
-	einstall
+	einstall || die
 	dodoc ABOUT-NLS CHANGES README
 }
-- 
cgit v1.2.3-65-gdbad