Version bump wrt #270444, thanks to Conrad Kostecki for reporting.

(Portage version: 2.2_rc41/cvs/Linux x86_64)

3 files changed, 61 insertions, 1 deletions

diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog
index 472ca09174b7..ecd92cf08d49 100644
--- a/dev-libs/popt/ChangeLog
+++ b/dev-libs/popt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/popt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.64 2009/07/29 20:07:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.65 2009/09/24 11:09:11 ssuominen Exp $
+
+*popt-1.15 (24 Sep 2009)
+
+  24 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> +popt-1.15.ebuild,
+  +files/popt-1.15-check.patch:
+  Version bump wrt #270444, thanks to Conrad Kostecki for reporting.
 
   29 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> popt-1.14.ebuild:
   Don't remove .la files so this can be unmasked.
diff --git a/dev-libs/popt/files/popt-1.15-check.patch b/dev-libs/popt/files/popt-1.15-check.patch
new file mode 100644
index 000000000000..242643f2645e
--- /dev/null
+++ b/dev-libs/popt/files/popt-1.15-check.patch
@@ -0,0 +1,21 @@
+diff -ur popt-1.15.orig/testit.sh popt-1.15/testit.sh
+--- popt-1.15.orig/testit.sh	2009-04-12 10:08:59.000000000 +0300
++++ popt-1.15/testit.sh	2009-09-24 14:10:40.000000000 +0300
+@@ -111,7 +111,7 @@
+ run test1 "test1 - 54" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr
+ 
+ run test1 "test1 - 55" "\
+-Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
++Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
+         [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val]
+         [-i|--int=INT] [-l|--long=LONG] [-L|--longlong=LONGLONG]
+         [-f|--float=FLOAT] [-d|--double=DOUBLE] [--randint=INT]
+@@ -120,7 +120,7 @@
+         [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage
+ 
+ run test1 "test1 - 56" "\
+-Usage: lt-test1 [OPTION...]
++Usage: test1 [OPTION...]
+       --arg1                      First argument with a really long
+                                   description. After all, we have to test
+                                   argument help wrapping somehow, right?
diff --git a/dev-libs/popt/popt-1.15.ebuild b/dev-libs/popt/popt-1.15.ebuild
new file mode 100644
index 000000000000..6a03a5a2e6d0
--- /dev/null
+++ b/dev-libs/popt/popt-1.15.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.15.ebuild,v 1.1 2009/09/24 11:09:11 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Parse Options - Command line parser"
+HOMEPAGE="http://rpm5.org/"
+SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz"
+
+LICENSE="popt"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-check.patch
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc CHANGES README
+}