Fix bug #80318

(Portage version: 2.0.51-r15)

4 files changed, 49 insertions, 14 deletions

diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index cd3378c7087a..6cd0718ecde2 100644
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/eix
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.7 2005/02/01 06:17:35 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.8 2005/02/01 14:31:43 hollow Exp $
+
+  01 Feb 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/0.2.0_alpha-portdir.patch, eix-0.2.0_alpha.ebuild:
+  Fix bug #80318
 
 *eix-0.2.0_alpha (01 Feb 2005)
 
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 69f2fe1582cf..279eff33b98b 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f9174308ba5481ddcf2bcdccfbbc78fc eix-0.1.2.ebuild 906
 MD5 121b6ccdc3a71ce24009646999b1be38 ChangeLog 973
 MD5 74c5aadf8e3e9d642a20e64d1afefec8 metadata.xml 239
 MD5 899859c820908cdddfde8b785d28ce13 eix-0.1.3.ebuild 906
 MD5 5b05bad1e4a1351770d39b0db3ad61eb eix-0.1.4.ebuild 929
-MD5 b15ddf3fd5a38c80ee28d5616983f577 eix-0.2.0_alpha.ebuild 928
+MD5 c38d1da73d2de951a06e09a772c7a3bd eix-0.2.0_alpha.ebuild 1006
 MD5 3081ee5e5e220ef71769117b2c358728 files/digest-eix-0.1.2 62
 MD5 32cf20c34a830b9f3489b66d5515bed9 files/digest-eix-0.1.3 62
 MD5 6344828d1a455d5b7c31a1d5dea74661 files/digest-eix-0.1.4 62
 MD5 60e6685c015f26383866ec5a58a54a25 files/digest-eix-0.2.0_alpha 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB/x8kmPFBzbX68WERAhLcAJ9lpNXvfo4HQBAJvx/KvhZB+qJB/wCdGKZy
-GcYWewFmNx7KADO+qQAX8TI=
-=4wjs
------END PGP SIGNATURE-----
+MD5 10c6bee37e79e0d24cc25a9fdba886e6 files/0.2.0_alpha-portdir.patch 1667
diff --git a/app-portage/eix/eix-0.2.0_alpha.ebuild b/app-portage/eix/eix-0.2.0_alpha.ebuild
index 78126174de3c..37ca049a056c 100644
--- a/app-portage/eix/eix-0.2.0_alpha.ebuild
+++ b/app-portage/eix/eix-0.2.0_alpha.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.2.0_alpha.ebuild,v 1.1 2005/02/01 06:17:35 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.2.0_alpha.ebuild,v 1.2 2005/02/01 14:31:43 hollow Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="Small utility for searching ebuilds with indexing for fast results"
 HOMEPAGE="http://sourceforge.net/projects/eix"
@@ -18,6 +18,8 @@ RDEPEND="sys-apps/portage
 	virtual/libc"
 
 src_compile() {
+	epatch ${FILESDIR}/${PV}-portdir.patch || die "portdir patch failed"
+
 	aclocal
 	libtoolize --force --copy
 	autoconf
diff --git a/app-portage/eix/files/0.2.0_alpha-portdir.patch b/app-portage/eix/files/0.2.0_alpha-portdir.patch
new file mode 100644
index 000000000000..7dbe43c864fa
--- /dev/null
+++ b/app-portage/eix/files/0.2.0_alpha-portdir.patch
@@ -0,0 +1,38 @@
+diff -urN eix-0.2.0_alpha/work/eix-0.2.0_alpha/src/portagedb.cc eix-0.2.0_alpha-corrected/work/eix-0.2.0_alpha/src/portagedb.cc
+--- eix-0.2.0_alpha/work/eix-0.2.0_alpha/src/portagedb.cc	2005-02-01 13:08:57.000000000 +0100
++++ eix-0.2.0_alpha-corrected/work/eix-0.2.0_alpha/src/portagedb.cc	2005-02-01 13:05:05.000000000 +0100
+@@ -119,11 +119,11 @@
+ {
+ 	// get portdir
+ 	VarsReader vr("/etc/make.conf");
+-	portdir = vr["portdir"];
++	portdir = vr["PORTDIR"];
+ 	if( portdir.size() == 0 )
+ 		portdir = "/usr/portage/";
+ 	else
+-		/* dont neet to do this because "/usr/" is the same as "/usr//"
++		/* dont need to do this because "/usr/" is the same as "/usr//"
+ 		 * else if( portdir[portdir.size() - 1] != '/' ) */
+ 		portdir.append("/");
+ 
+diff -urN eix-0.2.0_alpha/work/eix-0.2.0_alpha/src/version.cc eix-0.2.0_alpha-corrected/work/eix-0.2.0_alpha/src/version.cc
+--- eix-0.2.0_alpha/work/eix-0.2.0_alpha/src/version.cc	2005-01-31 22:39:22.000000000 +0100
++++ eix-0.2.0_alpha-corrected/work/eix-0.2.0_alpha/src/version.cc	2005-02-01 13:11:10.000000000 +0100
+@@ -61,7 +61,7 @@
+ 	else
+ 	{
+ 		primary = full;
+-		cerr << "Error in versions.cc: regexec(\"" << full << "\") failed. can't determine primary version." << endl;
++		cerr << "Error in version.cc: regexec(\"" << full << "\") failed. can't determine primary version." << endl;
+ 	}
+ 
+ 	// try to split primary version
+@@ -86,7 +86,7 @@
+ 		gr+=2;
+ 		gentoorelease=strtol(gr,NULL,10);
+ 		if( gentoorelease == 0 ) {
+-			cerr << "Error in versions.cc: invalid gentoo release number in \"" << full << "\"" << endl;
++			cerr << "Error in version.cc: invalid gentoo release number in \"" << full << "\"" << endl;
+ 		}
+ 	}
+