sys-fs/fuse: Resolve duplicate _GNU_SOURCE definition

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 15 insertions, 20 deletions

diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog
index 96edd07bba7f..201c72dd3521 100644
--- a/sys-fs/fuse/ChangeLog
+++ b/sys-fs/fuse/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/fuse
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.159 2012/04/21 05:55:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.160 2012/07/09 22:17:05 sping Exp $
+
+  09 Jul 2012; Sebastian Pipping <sping@gentoo.org> fuse-2.8.7.ebuild,
+  fuse-2.9.0.ebuild:
+  Resolve duplicate _GNU_SOURCE for FUSE >=2.8.7 (patch only needed for
+  <=2.8.6)
 
 *fuse-2.9.0 (21 Apr 2012)
 
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 9e1a6703fb04..bff6bb434b2a 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX fuse-fbsd.init 467 RMD160 ac8ce54b189b3433cede1c8360b63d38a4203e67 SHA1 8f0f10dac4653a82677f31a079a3b006cc8e122d SHA256 d896a80d67668246f586c6283f95f624fdbecb306408bec6f2c944601aae7273
 AUX fuse.init 756 RMD160 0950f906866311b19c0712f88911e83f6481b5f7 SHA1 96551a5d9ebf21560adafeb2b65c339fa8cfe898 SHA256 22a22c914d2a4f0fb5fc8495f4b7efcd1819efde548c9033ca612c181cd29eda
@@ -7,18 +7,14 @@ DIST fuse-2.8.6.tar.gz 505334 RMD160 df66df0256a677c50f2fc94fef6f34b2d598386c SH
 DIST fuse-2.8.7.tar.gz 530601 RMD160 7eef1ecc26e5f90ef0278402c9bedb8ab0d807a3 SHA1 284f22401131ec148bd04362dc86f7b0e94fb5f4 SHA256 20713319a55f87ca6a4587721549cc76e11c54b095fa3cb69aa8b179aeb9b49d
 DIST fuse-2.9.0.tar.gz 558554 RMD160 c0b8a9c2ad75fdaf51e6462a715ff9239e9cb577 SHA1 e64396d516cca55995e0a8f8dd75456fd9d9d21d SHA256 1bf669e5388d4f256c7875079d5a6b97837bad23eb77a1cbc8b54b46a88315f2
 EBUILD fuse-2.8.6.ebuild 2071 RMD160 75d59e853c11fcc16f9109d9d53f1f9f9d11e87b SHA1 39d3162c272f7ccd734eeb6bb7b127dd1705b3ad SHA256 24cd9894ea2a74ba46c2126cee87a12a85225cbb5784c51f8e17d6ed8c66e120
-EBUILD fuse-2.8.7.ebuild 2082 RMD160 f1a9d37b0ebf1ff1b6d9180bd260ffb62b604839 SHA1 b51fd9c4b9713774ac3c26b3d51f4464982af885 SHA256 544f601cbecb6c0b6f361bcce604076bd692c1b01fb8eebe8905b8392192556d
-EBUILD fuse-2.9.0.ebuild 2081 RMD160 12ebd292b034ed78b851a5fe2c5ea3c01113f509 SHA1 ec78ec8ef5e0e31ca9798e721f831a1f31ad2349 SHA256 c9acec7c963dc2875af7730723bf3b37b688f7f8f31300d956a083de7ae7ad9d
-MISC ChangeLog 21235 RMD160 49ee4d434e72f73d63b12f22d6cb44721e38b101 SHA1 c3ab756907d52610c953c9cc2e62950722e8e46b SHA256 f46f2a080a3ee9d63715bbbe8f83791d4a99b4bd4207adf5185b1451173a63c2
+EBUILD fuse-2.8.7.ebuild 1979 RMD160 e5fe37e6e1937857cbd106641e02d111806aceb0 SHA1 59514f4b67f445ab8d70fff539d645ed7de35220 SHA256 f052bd5ab7b587f690a0ed5793987bef95073a6ed6e8ee9ea7598c4d4373dfa9
+EBUILD fuse-2.9.0.ebuild 1979 RMD160 baf666e7a2b6bed0ef0c4f75ee1ec4243fda9450 SHA1 73ba35662b44c036a2bbd21784000ab452c49e82 SHA256 3fc71d001f1c8b60e0e02889613a7eba3c9aa942f23dec05da40abdf7fe6dbad
+MISC ChangeLog 21407 RMD160 7f9ffa4f38face6fe0ab0418e69d65c130f0d2d4 SHA1 fdb38e8255643d2be7e8b242e3ef2de3c9f782a4 SHA256 52f8f433d4727112aa15bbb6a819577bbf80faed73aa54705ec4fd591e2774e1
 MISC metadata.xml 166 RMD160 c3e22956fa1bdf11cc38cceb1460a5e32de37018 SHA1 a81e3c6c2214866a94b7b8ad96d82f30e952ad01 SHA256 f07e997e7e54cfa7611f01ff3a778174ba1b8f9e856baf7eec48206ed24e0c14
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPkkvQAAoJEEqz6FtPBkyj+9kH/RBhKMaUiT/U4+3ZyybM94vv
-VPzKjbqYczyfLWsHw+mR9GIDfLJpOIf13vASXELRDPu0Fj8seVm4+s9zhuivPH/B
-H7K3RELYzsUvKFrfhnNnZ3k9CVT/V/OCu1PxTJD1z50Dt7+i/8T1u85KxXTbC5d0
-QPqT1s4UlWsOFBLjOEFLubTGhqm6njOdXwROBUZZfRYin/g6RRW2xuLc5Um5QFWN
-Vi9Hr8oLOAwvuGYRp4zNwPdYRWDRCH1zRmByzSODUR+zrwXnqy3PY31DMs72roDN
-CdJBgpW8M5qfFevVnnVJCWDbdYpZX35d/UYf0PgsGorQGvGR9+b+OworrZsiNqU=
-=13Xi
+iEYEARECAAYFAk/7WFQACgkQsAvGakAaFgChqgCginqvmV0P7Pfo1XI2F/bOpV5U
+6rQAoJ/lyME3xwbGtsyD8YvKzpExCvKs
+=5a+1
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/fuse/fuse-2.8.7.ebuild b/sys-fs/fuse/fuse-2.8.7.ebuild
index 1667949cfced..21d0aebe12ed 100644
--- a/sys-fs/fuse/fuse-2.8.7.ebuild
+++ b/sys-fs/fuse/fuse-2.8.7.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/sys-fs/fuse/fuse-2.8.7.ebuild,v 1.2 2012/04/12 09:13:26 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.8.7.ebuild,v 1.3 2012/07/09 22:17:05 sping Exp $
 
 EAPI=4
 inherit libtool linux-info
@@ -31,9 +31,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# fix building with glibc-2.14 #370411
-	sed -i '1i#define _GNU_SOURCE' util/fusermount.c || die
-
 	elibtoolize
 }
 
diff --git a/sys-fs/fuse/fuse-2.9.0.ebuild b/sys-fs/fuse/fuse-2.9.0.ebuild
index 2397aed14ef1..614e675f0302 100644
--- a/sys-fs/fuse/fuse-2.9.0.ebuild
+++ b/sys-fs/fuse/fuse-2.9.0.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/sys-fs/fuse/fuse-2.9.0.ebuild,v 1.1 2012/04/21 05:55:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.9.0.ebuild,v 1.2 2012/07/09 22:17:05 sping Exp $
 
 EAPI=4
 inherit libtool linux-info
@@ -31,9 +31,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# fix building with glibc-2.14 #370411
-	sed -i '1i#define _GNU_SOURCE' util/fusermount.c || die
-
 	elibtoolize
 }