summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2009-08-20 03:25:34 +0000
committerJeremy Olexa <darkside@gentoo.org>2009-08-20 03:25:34 +0000
commita1a629d7ba22e8447ece4573f69e5f4a1f803c93 (patch)
treeb93ba41531a5ace659e2d239213d0bccdd922fb6 /app-portage
parentbuild fix for automagic cython dep, bug 280488. patch by Arfrever (diff)
downloadgentoo-2-a1a629d7ba22e8447ece4573f69e5f4a1f803c93.tar.gz
gentoo-2-a1a629d7ba22e8447ece4573f69e5f4a1f803c93.tar.bz2
gentoo-2-a1a629d7ba22e8447ece4573f69e5f4a1f803c93.zip
remove unused patch
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'app-portage')
-rw-r--r--app-portage/eix/ChangeLog6
-rw-r--r--app-portage/eix/files/eix-0.13.3-numeric-compare.patch84
2 files changed, 5 insertions, 85 deletions
diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index e206d5b315b7..ccb9ca48cf49 100644
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-portage/eix
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.294 2009/07/19 14:36:52 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.295 2009/08/20 03:25:34 darkside Exp $
+
+ 20 Aug 2009; Jeremy Olexa <darkside@gentoo.org>
+ -files/eix-0.13.3-numeric-compare.patch:
+ remove unused patch
19 Jul 2009; nixnut <nixnut@gentoo.org> eix-0.16.0.ebuild:
ppc stable #273555
diff --git a/app-portage/eix/files/eix-0.13.3-numeric-compare.patch b/app-portage/eix/files/eix-0.13.3-numeric-compare.patch
deleted file mode 100644
index 7a36b87ab1a3..000000000000
--- a/app-portage/eix/files/eix-0.13.3-numeric-compare.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Index: trunk/src/eixTk/compare.h
-===================================================================
---- trunk/src/eixTk/compare.h (revision 590)
-+++ trunk/src/eixTk/compare.h (revision 730)
-@@ -1,3 +1,3 @@
--// vim:set et cinoptions=g0,t0,^-2,(0 sw=4 ts=4:
-+// vim:set noet cinoptions=g0,t0,(0 sw=4 ts=4:
- // This file is part of the eix project and distributed under the
- // terms of the GNU General Public License v2.
-@@ -5,4 +5,5 @@
- // Copyright (c)
- // Emil Beinroth <emilbeinroth@gmx.net>
-+// Martin VÀth <vaeth@mathematik.uni-wuerzburg.de>
-
- #ifndef __GUARD__COMPARE_H__
-@@ -14,34 +15,40 @@
- namespace eix
- {
-- /// compare two objects.
-- /// @return 0 if equal, 1 if left > right or -1 if left < right.
-- template<typename T>
-- int default_compare(const T& left, const T& right)
-- {
-- if (left == right)
-- return 0;
-- else if(left < right)
-- return -1;
-- else
-- return 1;
-- }
-+ /// compare two objects.
-+ /// @return 0 if equal, 1 if left > right or -1 if left < right.
-+ template<typename T>
-+ int default_compare(const T& left, const T& right)
-+ {
-+ if (left == right)
-+ return 0;
-+ if(left < right)
-+ return -1;
-+ return 1;
-+ }
-
-- /// numeric comparison.
-- /// @note empty strings count a "0"
-- static inline int
-- numeric_compare(const std::string& left, const std::string& right)
-- {
-- // strip leading 0's
-- const std::string::size_type lstart = left.find_first_not_of('0');
-- const std::string::size_type rstart = right.find_first_not_of('0');
-+ /// numeric comparison.
-+ /// @note empty strings count a "0"
-+ static inline int
-+ numeric_compare(const std::string& left, const std::string& right)
-+ {
-+ // strip leading 0's
-+ std::string::size_type lstart = left.find_first_not_of('0');
-+ std::string::size_type rstart = right.find_first_not_of('0');
-+ // Special cases: number is 0 or string is empty
-+ if (lstart == std::string::npos) {
-+ if(rstart == std::string::npos)
-+ return 0;
-+ return -1;
-+ }
-+ if (rstart == std::string::npos)
-+ return 1;
-
-- // check if one is longer, that one would be bigger
-- const int size_result = default_compare(left.size() - (lstart == std::string::npos ? 0 : lstart),
-- right.size() - (rstart == std::string::npos ? 0 : rstart));
-- if (size_result)
-- return size_result;
-- // both strings have the same length, do string comparison
-- return left.compare(lstart, std::string::npos, right, rstart, std::string::npos);
-- }
-+ // check if one is longer, that one would be bigger
-+ int size_result = default_compare(left.size() - lstart, right.size() - rstart);
-+ if (size_result)
-+ return size_result;
-+ // both strings have the same length, do string comparison
-+ return left.compare(lstart, std::string::npos, right, rstart, std::string::npos);
-+ }
- }
-