summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-05-28 19:45:30 +0000
committerZac Medico <zmedico@gentoo.org>2012-05-28 19:45:30 +0000
commit80423442fb616117c3373afa447bda8c54951f4a (patch)
treee8490d817e9495138a045fc4d83a219b3ac84d9c /dev-vcs/monotone
parentStable for x86, wrt bug #407355 (diff)
downloadgentoo-2-80423442fb616117c3373afa447bda8c54951f4a.tar.gz
gentoo-2-80423442fb616117c3373afa447bda8c54951f4a.tar.bz2
gentoo-2-80423442fb616117c3373afa447bda8c54951f4a.zip
Add patch to fix struct file_handle name collision with glibc >=2.14 for bug #418027.
(Portage version: 2.2.0_alpha108/cvs/Linux i686)
Diffstat (limited to 'dev-vcs/monotone')
-rw-r--r--dev-vcs/monotone/ChangeLog7
-rw-r--r--dev-vcs/monotone/monotone-0.99.1-r1.ebuild3
-rw-r--r--dev-vcs/monotone/monotone-1.0-r2.ebuild3
3 files changed, 10 insertions, 3 deletions
diff --git a/dev-vcs/monotone/ChangeLog b/dev-vcs/monotone/ChangeLog
index 87b18b0c295a..dcb0aab637ad 100644
--- a/dev-vcs/monotone/ChangeLog
+++ b/dev-vcs/monotone/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-vcs/monotone
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.22 2012/02/19 08:18:47 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.23 2012/05/28 19:45:30 zmedico Exp $
+
+ 28 May 2012; Zac Medico <zmedico@gentoo.org> monotone-0.99.1-r1.ebuild,
+ monotone-1.0-r2.ebuild:
+ Add patch to fix struct file_handle name collision with glibc >=2.14 for bug
+ #418027.
19 Feb 2012; Zac Medico <zmedico@gentoo.org>
+files/monotone-1.0-glibc-2.14-file-handle.patch, monotone-1.0-r3.ebuild:
diff --git a/dev-vcs/monotone/monotone-0.99.1-r1.ebuild b/dev-vcs/monotone/monotone-0.99.1-r1.ebuild
index 03e650047714..f242b0772290 100644
--- a/dev-vcs/monotone/monotone-0.99.1-r1.ebuild
+++ b/dev-vcs/monotone/monotone-0.99.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-0.99.1-r1.ebuild,v 1.1 2012/01/01 01:13:34 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-0.99.1-r1.ebuild,v 1.2 2012/05/28 19:45:30 zmedico Exp $
EAPI="4"
inherit bash-completion elisp-common eutils toolchain-funcs
@@ -37,6 +37,7 @@ src_prepare() {
( $(gcc-major-version) -eq "3" && $(gcc-minor-version) -le 3 ) ]]; then
die 'requires >=gcc-3.4'
fi
+ epatch "${FILESDIR}/monotone-1.0-glibc-2.14-file-handle.patch"
}
src_configure() {
diff --git a/dev-vcs/monotone/monotone-1.0-r2.ebuild b/dev-vcs/monotone/monotone-1.0-r2.ebuild
index fe228e0b8774..e4de3d3c0c1d 100644
--- a/dev-vcs/monotone/monotone-1.0-r2.ebuild
+++ b/dev-vcs/monotone/monotone-1.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-1.0-r2.ebuild,v 1.1 2012/01/01 01:13:34 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-1.0-r2.ebuild,v 1.2 2012/05/28 19:45:30 zmedico Exp $
# QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/
EAPI="4"
@@ -41,6 +41,7 @@ src_prepare() {
fi
epatch "${FILESDIR}/monotone-1.0-bash-completion-tests.patch"
epatch "${FILESDIR}/monotone-1.0-botan-1.10.patch"
+ epatch "${FILESDIR}/monotone-1.0-glibc-2.14-file-handle.patch"
}
src_configure() {