summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-07-10 14:30:40 +0000
committerJustin Lecher <jlec@gentoo.org>2012-07-10 14:30:40 +0000
commitdb1064221d925c2a6a824d057c391660195a47f1 (patch)
tree5216c86666cc21e0472e134a379c4d17e477ea19
parentwhitespace (diff)
downloadgentoo-2-db1064221d925c2a6a824d057c391660195a47f1.tar.gz
gentoo-2-db1064221d925c2a6a824d057c391660195a47f1.tar.bz2
gentoo-2-db1064221d925c2a6a824d057c391660195a47f1.zip
Add workaround for #425512
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64, RepoMan options: --force)
-rw-r--r--app-portage/eix/ChangeLog7
-rw-r--r--app-portage/eix/eix-0.26.0.ebuild8
-rw-r--r--app-portage/eix/files/eix-0.26.0-tools.patch8
3 files changed, 19 insertions, 4 deletions
diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index 68311d541d73..a37dd2da2229 100644
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -1,6 +1,10 @@
# 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.418 2012/07/10 14:04:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.419 2012/07/10 14:30:40 jlec Exp $
+
+ 10 Jul 2012; Justin Lecher <jlec@gentoo.org> +files/eix-0.26.0-tools.patch,
+ eix-0.26.0.ebuild:
+ Add workaround for #425512
10 Jul 2012; Jeroen Roovers <jer@gentoo.org> eix-0.26.0.ebuild:
Marked ~hppa (bug #425494).
@@ -1637,4 +1641,3 @@
18 Jan 2005; Benedikt Boehm <hollow@gentoo.org> +eix-0.1.2.ebuild:
Initial Import. Thanks to xororand for creating the ebuild
-
diff --git a/app-portage/eix/eix-0.26.0.ebuild b/app-portage/eix/eix-0.26.0.ebuild
index e08ea711f5ad..fe08b82ee97e 100644
--- a/app-portage/eix/eix-0.26.0.ebuild
+++ b/app-portage/eix/eix-0.26.0.ebuild
@@ -1,10 +1,10 @@
# 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.2 2012/07/10 14:04:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.26.0.ebuild,v 1.3 2012/07/10 14:30:40 jlec Exp $
EAPI=4
-inherit multilib bash-completion-r1
+inherit eutils multilib bash-completion-r1
DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
HOMEPAGE="http://eix.berlios.de"
@@ -30,6 +30,10 @@ pkg_setup() {
fi
}
+src_prepare() {
+ use tools && epatch "${FILESDIR}"/${P}-tools.patch
+}
+
src_configure() {
econf $(use_with sqlite) $(use_with doc extra-doc) \
$(use_with zsh-completion) \
diff --git a/app-portage/eix/files/eix-0.26.0-tools.patch b/app-portage/eix/files/eix-0.26.0-tools.patch
new file mode 100644
index 000000000000..2ff98d3228ae
--- /dev/null
+++ b/app-portage/eix/files/eix-0.26.0-tools.patch
@@ -0,0 +1,8 @@
+--- 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"