diff options
| -rw-r--r-- | dev-libs/popt/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/popt/popt-1.10.7.ebuild | 16 |
2 files changed, 11 insertions, 10 deletions
diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog index e0bb538ce404..c109e0f8ed84 100644 --- a/dev-libs/popt/ChangeLog +++ b/dev-libs/popt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/popt # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.52 2007/01/13 09:47:18 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.53 2007/01/13 23:34:36 vapier Exp $ + + 13 Jan 2007; Mike Frysinger <vapier@gentoo.org> popt-1.10.7.ebuild: + Cleanup patches and drop requirement for autotools. 13 Jan 2007; nixnut <nixnut@gentoo.org> popt-1.10.4-r3.ebuild, popt-1.10.7.ebuild: diff --git a/dev-libs/popt/popt-1.10.7.ebuild b/dev-libs/popt/popt-1.10.7.ebuild index 0ad02d8972e5..0c9ecb7fbb5a 100644 --- a/dev-libs/popt/popt-1.10.7.ebuild +++ b/dev-libs/popt/popt-1.10.7.ebuild @@ -1,11 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.7.ebuild,v 1.6 2007/01/13 23:15:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.7.ebuild,v 1.7 2007/01/13 23:34:36 vapier Exp $ -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="1.9" - -inherit flag-o-matic autotools +inherit eutils DESCRIPTION="Parse Options - Command line parser" HOMEPAGE="http://www.rpm.org/" @@ -22,14 +19,15 @@ DEPEND="nls? ( sys-devel/gettext )" src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${PN}-1.10.4-lib64.patch epatch "${FILESDIR}"/${PN}-1.10.4-regression.patch - use nls || epatch "${FILESDIR}"/${PN}-1.10.4-nls.patch - eautoreconf + epatch "${FILESDIR}"/${PN}-1.10.4-lib64.patch } src_compile() { - econf $(use_enable nls) || die + econf \ + --without-included-gettext \ + $(use_enable nls) \ + || die emake || die "emake failed" } |