bumped revision (fixed parsing of make.conf)

4 files changed, 65 insertions, 1 deletions

diff --git a/app-admin/kportage/ChangeLog b/app-admin/kportage/ChangeLog
index 65d055a79584..2b84e9794fd6 100644
--- a/app-admin/kportage/ChangeLog
+++ b/app-admin/kportage/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/kportage
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-admin/kportage/ChangeLog,v 1.2 2002/11/03 15:57:33 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/kportage/ChangeLog,v 1.3 2002/11/11 18:34:49 hannes Exp $
+
+*kportage-0.5.1-r1 (11 Nov 2002)
+
+  11 Nov 2002; Hannes Mehnert <hannes@gentoo.org> kportage-0.5.1-r1.ebuild:
+  fixed broken make.conf parsing
 
 *kportage-0.5.1 (03 Nov 2002)
 
diff --git a/app-admin/kportage/files/digest-kportage-0.5.1-r1 b/app-admin/kportage/files/digest-kportage-0.5.1-r1
new file mode 100644
index 000000000000..5f1f554ca1b8
--- /dev/null
+++ b/app-admin/kportage/files/digest-kportage-0.5.1-r1
@@ -0,0 +1 @@
+MD5 2266e0b52ab6868440c02409a0465e45 kportage-0.5.1.tar.bz2 409842
diff --git a/app-admin/kportage/files/kportage-0.5.1.diff b/app-admin/kportage/files/kportage-0.5.1.diff
new file mode 100644
index 000000000000..02201dcb8516
--- /dev/null
+++ b/app-admin/kportage/files/kportage-0.5.1.diff
@@ -0,0 +1,40 @@
+--- kportage/config/parsemakeconfs.cpp.orig	2002-11-02 16:40:24.000000000 +0100
++++ kportage/config/parsemakeconfs.cpp	2002-11-11 19:22:40.000000000 +0100
+@@ -48,11 +48,11 @@
+ 					//kdDebug() << "multiline: " << foo << endl;
+ 					if ( !t.eof()) foo = t.readLine().stripWhiteSpace();
+ 					while ( !t.eof() && foo.contains('"')==0 ) {
+-						foo = t.readLine().stripWhiteSpace();
+ 						//kdDebug() << foo << endl;
+-						value += foo+" ";
++						value += foo.replace(QRegExp("\"|\'"),"")+" ";
++						foo = t.readLine().stripWhiteSpace();
+ 					}
+-					value += foo+" ";
++					value += foo.replace(QRegExp("\"|\'"),"")+" ";
+ 					value.stripWhiteSpace();
+ 					//kdDebug() << "end of multiline, grabbed " << value << endl;
+ 				}
+@@ -79,7 +79,7 @@
+ bool ParseMakeConfs::incremental(QString foo) {
+ 	if (foo.contains(QRegExp("^FEATURES"))>0 || foo.contains(QRegExp("^ACCEPT_KEYWORDS"))>0 ||
+ 		foo.contains(QRegExp("^ACCEPT_LICENSE"))>0 || foo.contains(QRegExp("^CONFIG_PROTECT"))>0 ||
+-		foo.contains(QRegExp("^CONFIG_PROTECT_MASK"))>0) //|| foo.contains(QRegExp("^USE"))>0)
++		foo.contains(QRegExp("^CONFIG_PROTECT_MASK"))>0 || foo.contains(QRegExp("^USE"))>0)
+ 		return true;
+ 	else return false;
+ }
+@@ -410,8 +410,11 @@
+ 		if (file.open(IO_WriteOnly)) {
+ 			QTextStream w( &file);
+ 			for (QStringList::Iterator it=makeConf.begin(); it!=makeConf.end(); ++it) {
+-				w << *it << endl;
+-				//kdDebug() << *it << endl;
++				if ((*it).contains('=')==0 && (*it).contains('#')==0)
++					w << "#" << endl;
++					//kdDebug() << "#" << endl;
++				else w << *it << endl;
++				//else kdDebug() << *it << endl;
+ 			}
+ 			file.close();
+ 		} else
diff --git a/app-admin/kportage/kportage-0.5.1-r1.ebuild b/app-admin/kportage/kportage-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..b5ad9f9c495f
--- /dev/null
+++ b/app-admin/kportage/kportage-0.5.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/kportage/kportage-0.5.1-r1.ebuild,v 1.1 2002/11/11 18:34:49 hannes Exp $
+
+inherit kde-base
+need-kde 3
+
+PATCHES="${FILESDIR}/${P}.diff"
+IUSE=""
+DESCRIPTION="A graphical frontend for portage"
+SRC_URI="http://freesoftware.fsf.org/download/${PN}/${PN}.pkg/0.5/${P}.tar.bz2"
+HOMEPAGE="http://www.freesoftware.fsf.org/kportage/"
+
+LICENSE="GPL-2"
+KEYWORDS="x86 ~sparc ~sparc64 ~ppc"
+
+newdepend "	kde-base/kdebase
+	>=sys-apps/portage-2.0.26"