summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2013-01-25 13:53:30 +0000
committerIan Stakenvicius <axs@gentoo.org>2013-01-25 13:53:30 +0000
commitfb39478bc92d13618ca1a009f4bf5c468d5eba21 (patch)
tree56e2821aa6a1d667ad8a1969af05d2e2abcb4095 /app-portage
parentBump and remove old (diff)
downloadgentoo-2-fb39478bc92d13618ca1a009f4bf5c468d5eba21.tar.gz
gentoo-2-fb39478bc92d13618ca1a009f4bf5c468d5eba21.tar.bz2
gentoo-2-fb39478bc92d13618ca1a009f4bf5c468d5eba21.zip
fixed bug 452548
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'app-portage')
-rw-r--r--app-portage/eix/ChangeLog8
-rw-r--r--app-portage/eix/eix-0.28.1-r1.ebuild (renamed from app-portage/eix/eix-0.28.1.ebuild)3
-rw-r--r--app-portage/eix/files/eix-0.28.1-overlay-number-regression.patch14
3 files changed, 23 insertions, 2 deletions
diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index df0be299427d..9d7592e8d9b2 100644
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-portage/eix
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.443 2013/01/14 21:50:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.444 2013/01/25 13:53:30 axs Exp $
+
+*eix-0.28.1-r1 (25 Jan 2013)
+
+ 25 Jan 2013; Ian Stakenvicius <axs@gentoo.org> -eix-0.28.1.ebuild,
+ +eix-0.28.1-r1.ebuild, +files/eix-0.28.1-overlay-number-regression.patch:
+ fixed bug 452548
*eix-0.28.1 (14 Jan 2013)
diff --git a/app-portage/eix/eix-0.28.1.ebuild b/app-portage/eix/eix-0.28.1-r1.ebuild
index ded602c5b2ce..52f1ed38ae2c 100644
--- a/app-portage/eix/eix-0.28.1.ebuild
+++ b/app-portage/eix/eix-0.28.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.28.1.ebuild,v 1.1 2013/01/14 21:50:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.28.1-r1.ebuild,v 1.1 2013/01/25 13:53:30 axs Exp $
EAPI=5
@@ -33,6 +33,7 @@ pkg_setup() {
}
src_prepare() {
+ epatch "${FILESDIR}"/${P}-overlay-number-regression.patch
epatch_user
}
diff --git a/app-portage/eix/files/eix-0.28.1-overlay-number-regression.patch b/app-portage/eix/files/eix-0.28.1-overlay-number-regression.patch
new file mode 100644
index 000000000000..de79e91f68a7
--- /dev/null
+++ b/app-portage/eix/files/eix-0.28.1-overlay-number-regression.patch
@@ -0,0 +1,14 @@
+--- src/output/formatstring.cc
++++ src/output/formatstring.cc
+@@ -240,9 +240,8 @@
+ if(some_overlay_used)
+ *some_overlay_used = true;
+ if(overlay_translations) {
+- overlay = (*overlay_translations)[index];
+- if(overlay != 0) {
+- number = 0;
++ number = (*overlay_translations)[index];
++ if(number == 0) {
+ for(vector<ExtendedVersion::Overlay>::iterator it(overlay_translations->begin());
+ likely(it != overlay_translations->end()); ++it) {
+ if(number < *it)