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.

Package-Manager: portage-2.1.2_rc1-r4

6 files changed, 93 insertions, 10 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/Manifest b/dev-libs/popt/Manifest
index 0888a6cc8b3d..a1245b3d33c1 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX popt-1.10.4-lib64.patch 930 RMD160 f164ac8b27609475114c1c123bce87ea3d94653c SHA1 9988e3d97767d2f6c0fa3cb5b43f9710097aaf5f SHA256 275670fd8084ec383382c9c01f87a755b3fdeec7d594b435e88dd36754980a5c
 MD5 8a936081f98e277545a42196582f0674 files/popt-1.10.4-lib64.patch 930
 RMD160 f164ac8b27609475114c1c123bce87ea3d94653c files/popt-1.10.4-lib64.patch 930
@@ -6,6 +9,10 @@ AUX popt-1.10.4-nls.patch 1922 RMD160 c4cc1523a9f2618b5655b2625ffffb828525ba94 S
 MD5 0f7b3549b18a6a95717cb7cd65d1fef3 files/popt-1.10.4-nls.patch 1922
 RMD160 c4cc1523a9f2618b5655b2625ffffb828525ba94 files/popt-1.10.4-nls.patch 1922
 SHA256 ea35416a55ef6a55ab5e79955d96a07b6bf49f29f21c7df47fe8308fba8e9de1 files/popt-1.10.4-nls.patch 1922
+AUX popt-1.10.4-regression.patch 504 RMD160 b499b5682852f23b927cc087ba0c5d4ea531e6e8 SHA1 72175578f31ba28c7f810bd85f0c67e314f2bca9 SHA256 4db2a98c96c47fb85300487654cf9f607454a0ee795850cb1956903d0dbad9f9
+MD5 926247bf47d9d3f339b2b49c967ae571 files/popt-1.10.4-regression.patch 504
+RMD160 b499b5682852f23b927cc087ba0c5d4ea531e6e8 files/popt-1.10.4-regression.patch 504
+SHA256 4db2a98c96c47fb85300487654cf9f607454a0ee795850cb1956903d0dbad9f9 files/popt-1.10.4-regression.patch 504
 AUX popt-1.7-missing-tests.patch 552 RMD160 9e13b505de24b95e03f3b9fb930f01e0c76dad1a SHA1 cc82b360c466a1a19a81cfba09c3f91b88454fbd SHA256 50ab39942289a1ba728d025fab609556315669f6dc2a47161fcaf0c65c0e83d9
 MD5 65e91b3cbc5d3c136d141bae0629fc6a files/popt-1.7-missing-tests.patch 552
 RMD160 9e13b505de24b95e03f3b9fb930f01e0c76dad1a files/popt-1.7-missing-tests.patch 552
@@ -24,24 +31,38 @@ EBUILD popt-1.10.4-r2.ebuild 962 RMD160 e73ce41af7c79db1bcd7bb1b42d04d9ca217175f
 MD5 1b692fd50b9af7a07daaa010d9be1d0d popt-1.10.4-r2.ebuild 962
 RMD160 e73ce41af7c79db1bcd7bb1b42d04d9ca217175f popt-1.10.4-r2.ebuild 962
 SHA256 06538ba1470175eb82433cc196216765733e27f8f1e71108ec71afc963a591a6 popt-1.10.4-r2.ebuild 962
+EBUILD popt-1.10.4-r3.ebuild 901 RMD160 49345a045823efe462692516b1fb2cab565e76b4 SHA1 ee2822fd00d7249202db511bda376069c1f6763a SHA256 5b7d27054bac4139240652f60d245d82e7516e4b55e511893665ad8db93e6ffd
+MD5 a6ac00b5fb67721ca854bb624c622b8c popt-1.10.4-r3.ebuild 901
+RMD160 49345a045823efe462692516b1fb2cab565e76b4 popt-1.10.4-r3.ebuild 901
+SHA256 5b7d27054bac4139240652f60d245d82e7516e4b55e511893665ad8db93e6ffd popt-1.10.4-r3.ebuild 901
 EBUILD popt-1.7-r1.ebuild 963 RMD160 c56b1c3f24b9227a569aa995e9a76dc57c4393ff SHA1 d903fdee9e2fddebf5d4320ba237ec4270271d7b SHA256 72d2836fc67c6a784b3ca983ebf48c21f89e99d5d792b04e2c650529ab4bf8df
 MD5 7f1d9f5ac8b642317b932a104f9c38bc popt-1.7-r1.ebuild 963
 RMD160 c56b1c3f24b9227a569aa995e9a76dc57c4393ff popt-1.7-r1.ebuild 963
 SHA256 72d2836fc67c6a784b3ca983ebf48c21f89e99d5d792b04e2c650529ab4bf8df popt-1.7-r1.ebuild 963
-MISC ChangeLog 6037 RMD160 00665d25f4c9c076f7ff1d389ed5fcd4fb6229d4 SHA1 9f63696e91887dd82544bf3469a7c39103d2fa97 SHA256 eb3678dfd262fd471bb5614594819d7740df1fafe298a357b56fc8d930ee7d64
-MD5 1211ff52763be2ba9bfe76c42aad3f0a ChangeLog 6037
-RMD160 00665d25f4c9c076f7ff1d389ed5fcd4fb6229d4 ChangeLog 6037
-SHA256 eb3678dfd262fd471bb5614594819d7740df1fafe298a357b56fc8d930ee7d64 ChangeLog 6037
-MISC metadata.xml 201 RMD160 84f5c130041f4ed38aa2d689e6c5faa4048e4124 SHA1 fc8b97ba1f227aef406eee81975083451a66704b SHA256 07c89cd922e9d70aed17db9b28f90676f57137cfadc39f18b082634557b89de6
-MD5 a55db6e9a92a8c7dacc74eee4e08d5dc metadata.xml 201
-RMD160 84f5c130041f4ed38aa2d689e6c5faa4048e4124 metadata.xml 201
-SHA256 07c89cd922e9d70aed17db9b28f90676f57137cfadc39f18b082634557b89de6 metadata.xml 201
+MISC ChangeLog 6366 RMD160 1f29adbdca6f591bcd82cb26e928b75cc510d115 SHA1 615cde658746c87ab7bb8527062891d476a16d69 SHA256 df9e0b26f0920cfd227e5c73114f2b01114401b3979b1f1e6ab449bcb1e39ba5
+MD5 3341cd6acde2be8d58d3390e0ced8afe ChangeLog 6366
+RMD160 1f29adbdca6f591bcd82cb26e928b75cc510d115 ChangeLog 6366
+SHA256 df9e0b26f0920cfd227e5c73114f2b01114401b3979b1f1e6ab449bcb1e39ba5 ChangeLog 6366
+MISC metadata.xml 200 RMD160 331ec44f62309eb45aea8c9eab75e00969431e6d SHA1 38bcf7483ccd7147602ab1a4a684f670a8b2b5d0 SHA256 c230e59ad2ffb0572f140ddeb37a4ca49a99d74b8bc61558bdae47b1d087478d
+MD5 12d99f523f4f80f436a421930e3cc4d8 metadata.xml 200
+RMD160 331ec44f62309eb45aea8c9eab75e00969431e6d metadata.xml 200
+SHA256 c230e59ad2ffb0572f140ddeb37a4ca49a99d74b8bc61558bdae47b1d087478d metadata.xml 200
 MD5 d7e804dbbef8fda403d02783f850e194 files/digest-popt-1.10.4-r1 238
 RMD160 6aa1853854f4ac00c49321b24d115c899f7ca590 files/digest-popt-1.10.4-r1 238
 SHA256 7105ccdb425cc4574413c5068a97947bd1fdb6127a19809dfe56ad190f0a5d61 files/digest-popt-1.10.4-r1 238
 MD5 d7e804dbbef8fda403d02783f850e194 files/digest-popt-1.10.4-r2 238
 RMD160 6aa1853854f4ac00c49321b24d115c899f7ca590 files/digest-popt-1.10.4-r2 238
 SHA256 7105ccdb425cc4574413c5068a97947bd1fdb6127a19809dfe56ad190f0a5d61 files/digest-popt-1.10.4-r2 238
+MD5 d7e804dbbef8fda403d02783f850e194 files/digest-popt-1.10.4-r3 238
+RMD160 6aa1853854f4ac00c49321b24d115c899f7ca590 files/digest-popt-1.10.4-r3 238
+SHA256 7105ccdb425cc4574413c5068a97947bd1fdb6127a19809dfe56ad190f0a5d61 files/digest-popt-1.10.4-r3 238
 MD5 c4150da38b9b4dfabecb9734ccc6a538 files/digest-popt-1.7-r1 226
 RMD160 8d8f96da5bebaa712af0f571e912024d5e4c3c84 files/digest-popt-1.7-r1 226
 SHA256 ca02fb4b04a3255cf323e653dc5f48866f12ecd3f72c1fe40b1cbf8b52d2e62b files/digest-popt-1.7-r1 226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFUPyNwmS/YhfgUiURAvXBAJ4jd2I4C1qm0Q/Q/FlWg2GM3iG+igCfclPS
+2anRNzxfO1F46rN6QaOXVAw=
+=u0XW
+-----END PGP SIGNATURE-----
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
+}