Fix a typo which sometimes caused qimlate to fail, see Bug #133514. Also fix a check for 2 errors, error checking patch by tove@g.o.

(Portage version: 2.0.54-r2)

5 files changed, 73 insertions, 1 deletions

diff --git a/app-portage/portage-utils/ChangeLog b/app-portage/portage-utils/ChangeLog
index 268b462a3f62..24254ec118a9 100644
--- a/app-portage/portage-utils/ChangeLog
+++ b/app-portage/portage-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-portage/portage-utils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.46 2006/05/14 18:55:05 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.47 2006/05/16 21:33:12 tcort Exp $
+
+*portage-utils-0.1.17-r1 (16 May 2006)
+
+  16 May 2006; Thomas Cort <tcort@gentoo.org>
+  +files/portage-utils-0.1.17-bug133514.patch,
+  +portage-utils-0.1.17-r1.ebuild:
+  Fix a typo which sometimes caused qimlate to fail, see Bug #133514. Also fix
+  a check for 2 errors, error checking patch by tove@g.o.
 
   14 May 2006; Thomas Cort <tcort@gentoo.org>
   +files/portage-utils-0.1.17-enum.patch, portage-utils-0.1.17.ebuild:
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 7c8de1d60d39..05ac9a9c4273 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -2,8 +2,11 @@ MD5 fba07aa253b92029f7e3e3d1f3761213 ChangeLog 10207
 MD5 c1884644ce45bbd0053fa0450906637a files/digest-portage-utils-0.1.15 262
 MD5 bceb8979c5802dcfdd92ce05626af703 files/digest-portage-utils-0.1.16 72
 MD5 95d8fbb9e5074beb0ecb70bb89a4c78b files/digest-portage-utils-0.1.17 72
+MD5 95d8fbb9e5074beb0ecb70bb89a4c78b files/digest-portage-utils-0.1.17-r1 72
+MD5 777e171783321a0a006df55f25102878 files/portage-utils-0.1.17-bug133514.patch 992
 MD5 9a7f00bdf4ed218d4f33fc5909c1e25c files/portage-utils-0.1.17-enum.patch 3237
 MD5 5a808b54f37942c1de1ff75edc43f69d metadata.xml 281
 MD5 44bea646c7eec7a2d090794f752e5753 portage-utils-0.1.15.ebuild 714
 MD5 dd973c166758e6297dc16888171d2d94 portage-utils-0.1.16.ebuild 679
+MD5 c8cf8444495766f0f5f875e91ef79533 portage-utils-0.1.17-r1.ebuild 803
 MD5 31d4a62883d41d2435728d517fa2ace6 portage-utils-0.1.17.ebuild 762
diff --git a/app-portage/portage-utils/files/digest-portage-utils-0.1.17-r1 b/app-portage/portage-utils/files/digest-portage-utils-0.1.17-r1
new file mode 100644
index 000000000000..49651a4cbf61
--- /dev/null
+++ b/app-portage/portage-utils/files/digest-portage-utils-0.1.17-r1
@@ -0,0 +1 @@
+MD5 f78cf6ded26d606a6fafcd55745734b5 portage-utils-0.1.17.tar.bz2 60785
diff --git a/app-portage/portage-utils/files/portage-utils-0.1.17-bug133514.patch b/app-portage/portage-utils/files/portage-utils-0.1.17-bug133514.patch
new file mode 100644
index 000000000000..da4917bbc1e5
--- /dev/null
+++ b/app-portage/portage-utils/files/portage-utils-0.1.17-bug133514.patch
@@ -0,0 +1,29 @@
+Index: qimlate.c
+===================================================================
+RCS file: /var/cvsroot/gentoo-projects/portage-utils/qimlate.c,v
+retrieving revision 1.5
+diff -u -b -B -r1.5 qimlate.c
+--- qimlate.c	14 May 2006 17:26:59 -0000	1.5
++++ qimlate.c	16 May 2006 21:24:56 -0000
+@@ -173,7 +173,7 @@
+ 	if (argc != optind + 1 || !(test_arch = decode_arch(argv[optind])))
+ 		qimlate_usage(EXIT_FAILURE);
+ 
+-	pathcache = (char *) xmalloc(strlen(portdir) + strlen("/metadata/cache") + 1);
++	pathcache = (char *) xmalloc(strlen(portdir) + strlen("/metadata/cache/") + 1);
+ 	strcpy(pathcache,portdir);
+ 	strcat(pathcache+strlen(portdir),"/metadata/cache/");
+ 
+@@ -194,10 +194,10 @@
+ 		current_category = categories[i]->d_name;
+ 
+ 		numpkg = scandir(pathcat, &packages, file_select, alphasort);
+-		if (numcat == (-1))
++		if (numpkg == (-1))
+ 			err("%s %s", pathcat, strerror(errno));
+ 
+-		if (!numcat)
++		if (!numpkg)
+ 			warn("%s is empty!",pathcat);
+ 
+ 		for (j = 0; j < numpkg; j++) {
diff --git a/app-portage/portage-utils/portage-utils-0.1.17-r1.ebuild b/app-portage/portage-utils/portage-utils-0.1.17-r1.ebuild
new file mode 100644
index 000000000000..0ce6aec86df7
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.1.17-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.1.17-r1.ebuild,v 1.1 2006/05/16 21:33:12 tcort Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="small and fast portage helper tools written in C"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-enum.patch
+	epatch ${FILESDIR}/${P}-bug133514.patch
+}
+
+src_install() {
+	dobin q || die "dobin failed"
+	doman man/*.[0-9]
+	for applet in $(<applet-list) ; do
+		dosym q /usr/bin/${applet}
+	done
+}