Version bump, including a fix for a regression found by wormo@gentoo.org and fixed with a patch provided by drizzt@gentoo.org, last fix needed for bug #121862.

(Portage version: 2.1.2_rc1-r4)

5 files changed, 64 insertions, 2 deletions

diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog
index e1d3010ad29c..72748f984b22 100644
--- a/dev-libs/popt/ChangeLog
+++ b/dev-libs/popt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/popt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.42 2006/11/05 17:26:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.43 2006/11/07 21:41:56 sanchan Exp $
+
+*popt-1.10.4-r3 (07 Nov 2006)
+
+  07 Nov 2006; Sandro Bonazzola <sanchan@gentoo.org>
+  +files/popt-1.10.4-regression.patch, metadata.xml, +popt-1.10.4-r3.ebuild:
+  Version bump, including a fix for a regression found by wormo@gentoo.org and
+  fixed with a patch provided by drizzt@gentoo.org, last fix needed for bug
+  #121862.
 
   05 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> popt-1.10.4-r2.ebuild:
   Add ~alpha keyword.
diff --git a/dev-libs/popt/files/digest-popt-1.10.4-r3 b/dev-libs/popt/files/digest-popt-1.10.4-r3
new file mode 100644
index 000000000000..7e169cde2429
--- /dev/null
+++ b/dev-libs/popt/files/digest-popt-1.10.4-r3
@@ -0,0 +1,3 @@
+MD5 dd22a6873b43d00f75e1c1b7dcfd1ff7 popt-1.10.4.tar.gz 1169462
+RMD160 c59c383f5e9f53b2fc17294bb2568cc46f204784 popt-1.10.4.tar.gz 1169462
+SHA256 1ce47451c9ac9d81f42b2b7fcb11c2f211b4943e3e5d7d946da53ced7fb04114 popt-1.10.4.tar.gz 1169462
diff --git a/dev-libs/popt/files/popt-1.10.4-regression.patch b/dev-libs/popt/files/popt-1.10.4-regression.patch
new file mode 100644
index 000000000000..141a25e5d573
--- /dev/null
+++ b/dev-libs/popt/files/popt-1.10.4-regression.patch
@@ -0,0 +1,13 @@
+--- popt.c.bak	2006-11-04 00:14:31.553881369 +0100
++++ popt.c	2006-11-04 00:15:19.607576097 +0100
+@@ -748,9 +748,7 @@
+ 	    if (origOptString == NULL)	/* XXX can't happen */
+ 		return POPT_ERROR_BADOPT;
+ 
+-	    if (con->restLeftover || *origOptString != '-' ||
+-		(*origOptString == '-' && origOptString[1] == '\0'))
+-	    {
++	    if (con->restLeftover || *origOptString != '-') {
+ 		if (con->flags & POPT_CONTEXT_POSIXMEHARDER)
+ 		    con->restLeftover = 1;
+ 		if (con->flags & POPT_CONTEXT_ARG_OPTS) {
diff --git a/dev-libs/popt/metadata.xml b/dev-libs/popt/metadata.xml
index 5701ee52db3c..555793dd4d58 100644
--- a/dev-libs/popt/metadata.xml
+++ b/dev-libs/popt/metadata.xml
@@ -5,4 +5,3 @@
 <email>sanchan@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
-
diff --git a/dev-libs/popt/popt-1.10.4-r3.ebuild b/dev-libs/popt/popt-1.10.4-r3.ebuild
new file mode 100644
index 000000000000..4885da684889
--- /dev/null
+++ b/dev-libs/popt/popt-1.10.4-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.4-r3.ebuild,v 1.1 2006/11/07 21:41:56 sanchan Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="1.9"
+
+inherit flag-o-matic autotools
+
+DESCRIPTION="Parse Options - Command line parser"
+HOMEPAGE="http://www.rpm.org/"
+SRC_URI="ftp://jbj.org/pub/rpm-4.4.x/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-lib64.patch
+	epatch "${FILESDIR}"/${P}-regression.patch
+	use nls || epatch "${FILESDIR}"/${P}-nls.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable nls) || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc CHANGES README
+}