Add patch to fix struct file_handle name collision with glibc >=2.14 for bug #418027.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux i686

4 files changed, 17 insertions, 10 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/Manifest b/dev-vcs/monotone/Manifest
index 8f02575756ab..f9b7e75a8383 100644
--- a/dev-vcs/monotone/Manifest
+++ b/dev-vcs/monotone/Manifest
@@ -12,15 +12,15 @@ AUX read-permissions 192 RMD160 de9f340da2e143f306b7cf37584d7b43b100c06b SHA1 b8
 AUX write-permissions 32 RMD160 164bc129fb3cdb2314d7ec96d23a9fc6f0e856a3 SHA1 0b48801914336a5a3baebf79725be81b52d279f4 SHA256 ddd40fac5d6fe98d9f58c4731a500eb1350a42ae7ca0ddaa40eaa3bbeb99026c
 DIST monotone-0.99.1.tar.gz 4940291 RMD160 c0db85af8b584e375ca992b3384bd8a38d5b380e SHA1 e74ba571b358f6b76370f882d15ddbd1edd9f37e SHA256 204ebb12f36599ac4c105ae5bf45edd7da13a4e57dc45f31789634fc8c2b30a1
 DIST monotone-1.0.tar.bz2 3588074 RMD160 4c0813ae0c11f271dc88f42dd8814e474a67e988 SHA1 aac556bb26d92910b74b65450a0be6c5045e2052 SHA256 5c530bc4652b2c08b5291659f0c130618a14780f075f981e947952dcaefc31dc
-EBUILD monotone-0.99.1-r1.ebuild 3293 RMD160 ad432f122bf80002e0bb4e73d01a7e27bf8712f2 SHA1 37a704d4348c98876108333a7404a0c231488b02 SHA256 d712ac8b9b2ceb96f771747c5fa0cb9fe4f6fd5e4e2b7f5980cf7f3486089c49
-EBUILD monotone-1.0-r2.ebuild 3591 RMD160 59bc6acb0f27431d837f53fb9dd8c21f502885cf SHA1 03502350eaeec7d01e71f760673d8160dd3683b3 SHA256 c7668530ad248b663f78c24f5545bf30fd40e66f29259ef6caefbb7d6a7bb04d
+EBUILD monotone-0.99.1-r1.ebuild 3359 RMD160 e7261eaaf5ccefcd8f550f7f1a4d6a8c5aff1466 SHA1 f7cb90f252fc47782f470d96542dc5817816bee0 SHA256 73f5cb93f6cac1e31f4d04533335d2b513b3a7a079fb87afedce7e60d0186db7
+EBUILD monotone-1.0-r2.ebuild 3657 RMD160 8137e460f6614291750dab9594a84fa9dca52a79 SHA1 e1a2610927125779bf923fec6adba59ba978f66b SHA256 010d6d12ac01d0d8fdf169d7a445621650706959e079a8eb8f6c03781d077a4d
 EBUILD monotone-1.0-r3.ebuild 3356 RMD160 447013c306c6478a783271b0fd69297dae11cc1b SHA1 68a3af7c89f724c90cc8aa86266eae6ac13ab857 SHA256 671765cbe90f1c86b11c854ff5fd9f1c14790e484da79019a666fba703902083
-MISC ChangeLog 15070 RMD160 f009b9cb0e0a8eff65bb13455d89e9ac855b578c SHA1 3042818fdb9db47f897b50186f1bf2683508f6da SHA256 5a0fda99f56b97e8b2a10739ea6ba3a6a1f957a718174cb352f14ce9d82034b9
+MISC ChangeLog 15261 RMD160 4bfacc5056d1a1ae530a3c73a3b5b2b1b922eacb SHA1 4735bab8454b6900a0c431009f4a9c3110260595 SHA256 c8309f316b7827880f9536065ba6e52efc46f8f203b82f6f4b788c105f4504b1
 MISC metadata.xml 991 RMD160 3acf16e7c7f41e0213c4b375ab7db39859be8900 SHA1 7e1b7e8360577c3e1ae8550711f443ad7e410a76 SHA256 ffedc0e4cff4495d7569eeba2ef0938a5d0c6b655e7c941326d22353af88ffb0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9AsG0ACgkQ/ejvha5XGaOziQCfVymHmi2DSAiLP5a+KW9coeW1
-CCUAniG/5M2DgERHBCiWOVH2pv+Rx7Od
-=2cNc
+iEYEARECAAYFAk/D1eAACgkQ/ejvha5XGaPgIQCff/E+U1DEPfh8gBx7BimWbBjR
+rowAoL1NQ7oqmrMdk36MleA9jS62yiwN
+=RP2K
 -----END PGP SIGNATURE-----
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() {