summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2009-07-21 07:04:53 +0000
committerChristian Faulhammer <fauli@gentoo.org>2009-07-21 07:04:53 +0000
commit131c1a8e23e0f4f5ceaa06562cb3e324953a0d8b (patch)
treea79dcf5f05317b5caca57be525bb4e2a8ea59815 /app-portage
parentversion bump (diff)
downloadgentoo-2-131c1a8e23e0f4f5ceaa06562cb3e324953a0d8b.tar.gz
gentoo-2-131c1a8e23e0f4f5ceaa06562cb3e324953a0d8b.tar.bz2
gentoo-2-131c1a8e23e0f4f5ceaa06562cb3e324953a0d8b.zip
clean up
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'app-portage')
-rw-r--r--app-portage/gatt/ChangeLog6
-rw-r--r--app-portage/gatt/files/gatt-0.6.1-nonfataltests.patch13
-rw-r--r--app-portage/gatt/files/gatt-0.6.1-tests.patch73
3 files changed, 5 insertions, 87 deletions
diff --git a/app-portage/gatt/ChangeLog b/app-portage/gatt/ChangeLog
index 02c3b57087d0..2985cb39f1e6 100644
--- a/app-portage/gatt/ChangeLog
+++ b/app-portage/gatt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-portage/gatt
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gatt/ChangeLog,v 1.38 2009/07/21 07:02:42 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gatt/ChangeLog,v 1.39 2009/07/21 07:04:53 fauli Exp $
+
+ 21 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+ -files/gatt-0.6.1-nonfataltests.patch, -files/gatt-0.6.1-tests.patch:
+ clean up
*gatt-0.6.4 (21 Jul 2009)
diff --git a/app-portage/gatt/files/gatt-0.6.1-nonfataltests.patch b/app-portage/gatt/files/gatt-0.6.1-nonfataltests.patch
deleted file mode 100644
index 301d60c36fa9..000000000000
--- a/app-portage/gatt/files/gatt-0.6.1-nonfataltests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/tests/t_pkg_use_file.cc
-===================================================================
---- src/tests/t_pkg_use_file.cc (revision 584)
-+++ src/tests/t_pkg_use_file.cc (working copy)
-@@ -56,7 +56,7 @@
- verifyUseSet("=x11-libs/gtk+-2.10.14", "jpeg tiff");
- verifyUseSet("=sys-libs/ncurses-5.4-r6", "");
- verifyUseSet("=sys-libs/ncurses-5.5-r3", "nocxx minimal");
-- verifyUseSet("=sys-kernel/gentoo-sources-2.6.19-r5", "");
-+ verifyUseSet("=sys-kernel/gentoo-sources-2.6.24-r8", "");
- verifyUseSet("=sys-kernel/gentoo-sources-2.6.23-r9", "symlink");
- verifyUseSet("=dev-java/sun-jdk-1.4.2.17", "");
- verifyUseSet("=dev-java/sun-jdk-1.6.0.06", "examples doc jce");
diff --git a/app-portage/gatt/files/gatt-0.6.1-tests.patch b/app-portage/gatt/files/gatt-0.6.1-tests.patch
deleted file mode 100644
index 296d4121f216..000000000000
--- a/app-portage/gatt/files/gatt-0.6.1-tests.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- ../../tags/gatt-0.6.1/src/atom.cc 2008-06-09 01:54:18.000000000 +0200
-+++ atom.cc 2008-07-28 17:36:21.000000000 +0200
-@@ -36,6 +36,7 @@
- bool toNextPotenialExactAtom(string::const_iterator& p, const string::const_iterator& end, bool ignoreMissingPrefix);
- bool sequenceAdvance(const string& sequence, string::const_iterator& p, const string::const_iterator& end);
- int versionNumberCompare(const string& ls, const string& rs);
-+int toCannocalValue(int arg);
-
- class PVSuffixToken
- {
-@@ -190,7 +191,16 @@
- }
-
- }
-- return lls.compare(rrs);
-+
-+ //we want this function to return -1, 0 or 1!
-+ return toCannocalValue(lls.compare(rrs));
-+}
-+
-+inline int toCannocalValue(int arg)
-+{
-+ if(arg != 0)
-+ return (arg < 0 ? -1 : 1);
-+ return 0;
- }
-
- PVSuffixToken::PVSuffixToken(const string& str)
-@@ -463,7 +473,7 @@
- {
- string opMe(getCategory() + getPN());
- string opOther(other.getCategory() + other.getPN());
-- return opMe.compare(opOther);
-+ return local::toCannocalValue(opMe.compare(opOther));
- }
-
- int Atom::comparePV(const ExactAtom& other) const
-@@ -478,7 +488,7 @@
- string ov(other._pv);
- if(ov.size() > mv.size())
- ov.erase(mv.size());
-- return mv.compare(ov);
-+ return local::toCannocalValue(mv.compare(ov));
- }
-
- if(_pv.empty() || other._pv.empty())
-@@ -518,7 +528,7 @@
- {
- hlp = mTok[i].compare(oTok[i]);
- if(hlp != 0)
-- return hlp;
-+ return local::toCannocalValue(hlp);
- ++i;
- }
- else if(isPVOptionalLetterComponentIndex(i))
-@@ -570,7 +580,7 @@
- local::PVSuffixToken tokO(oTok[i]);
- int hlp = tokL.compare(tokO);
- if(hlp != 0)
-- return hlp;
-+ return local::toCannocalValue(hlp);
- }
- return trailingPVPartIncoperate(other);
- }
-@@ -882,7 +892,7 @@
-
- bool ExactAtom::operator<(const ExactAtom& other) const
- {
-- return compare(other) == -1;
-+ return compare(other) < 0;
- }
-
- int ExactAtom::compare(const ExactAtom& other) const