Version bump from upstream for bug fixes (closes Gentoo bugs 425512, 426256, 427644)

(Portage version: 2.1.10.65/cvs/Linux i686)

4 files changed, 12 insertions, 13 deletions

diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index ba0eb4aec51b..efede4543afb 100644
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/eix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.422 2012/07/23 20:50:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.423 2012/07/24 13:54:22 darkside Exp $
+
+*eix-0.26.1 (24 Jul 2012)
+
+  24 Jul 2012; Jeremy Olexa <darkside@gentoo.org> -eix-0.26.0.ebuild,
+  -files/eix-0.26.0-tools.patch, +eix-0.26.1.ebuild, metadata.xml:
+  Version bump from upstream for bug fixes (closes Gentoo bugs 425512, 426256,
+  427644)
 
   23 Jul 2012; Markus Meier <maekke@gentoo.org> eix-0.25.5.ebuild:
   arm stable, bug #427100
diff --git a/app-portage/eix/eix-0.26.0.ebuild b/app-portage/eix/eix-0.26.1.ebuild
index fe08b82ee97e..25fc6a9ceba6 100644
--- a/app-portage/eix/eix-0.26.0.ebuild
+++ b/app-portage/eix/eix-0.26.1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.26.0.ebuild,v 1.3 2012/07/10 14:30:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.26.1.ebuild,v 1.1 2012/07/24 13:54:22 darkside Exp $
 
 EAPI=4
 
-inherit eutils multilib bash-completion-r1
+PLOCALES="de ru"
+inherit bash-completion-r1 eutils multilib l10n
 
 DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
 HOMEPAGE="http://eix.berlios.de"
@@ -31,7 +32,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use tools && epatch "${FILESDIR}"/${P}-tools.patch
+	epatch_user
 }
 
 src_configure() {
diff --git a/app-portage/eix/files/eix-0.26.0-tools.patch b/app-portage/eix/files/eix-0.26.0-tools.patch
deleted file mode 100644
index 2ff98d3228ae..000000000000
--- a/app-portage/eix/files/eix-0.26.0-tools.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/main/main_all.cc
-+++ src/main/main_all.cc
-@@ -10,5 +10,4 @@
- #define EIX_BINARY 1
- #define DIFF_BINARY 1
- #define UPDATE_BINARY 1
--#define DROP_PERMISSIONS_BINARY 1
- #include "main.cc"
diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
index d952cb4cc92d..1ddfd347f08a 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -16,7 +16,6 @@
 	<flag name="debug">Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.</flag>
 	<flag name="dep">Make DEP=true the default which enables support for {,R,P}DEPEND but requires roughly double disk and memory.</flag>
 	<flag name="doc">Create description of the eix cache file additionally in html format</flag>
-	<flag name="nls">Support foreign language messages (experimental; currently only de)</flag>
 	<flag name="optimization">Accept upstream's choices for CXXFLAGS/LDFLAGS for optimization. Absense of this USE flag does not strip user's *FLAGS</flag>
 	<flag name="security">This adds some checks which can prevent certain exploits if e.g. the eix code has a bug. If you use the hardened toolchain, using this flag does not increase security and can even lead to problems. </flag>
 	<flag name="strong-optimization">Adds several more agressive CXXFLAGS/LDFLAGS for optimization like graphite (if available). May cause trouble with some buggy compiler versions. Absense of this USE flag does not strip user's *FLAGS</flag>