Fix compilation with uclibc, patch by René Rhéaume <rene.rheaume@gmail.com> in bug #509888

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 69 insertions, 15 deletions

diff --git a/sys-fs/shake/ChangeLog b/sys-fs/shake/ChangeLog
index ab6aadf6fae8..7bce6ef1f3ad 100644
--- a/sys-fs/shake/ChangeLog
+++ b/sys-fs/shake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/shake
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/shake/ChangeLog,v 1.13 2013/06/13 01:37:59 creffett Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/shake/ChangeLog,v 1.14 2014/05/13 06:53:13 voyageur Exp $
+
+  13 May 2014; Bernard Cafarelli <voyageur@gentoo.org> shake-0.999.ebuild,
+  +files/shake-0.999-uclibc.patch:
+  Fix compilation with uclibc, patch by René Rhéaume <rene.rheaume@gmail.com>
+  in bug #509888
 
   13 Jun 2013; Chris Reffett <creffett@gentoo.org> -shake-0.31.ebuild:
   Maintainer timeout, remove old wrt bug 460572.
diff --git a/sys-fs/shake/Manifest b/sys-fs/shake/Manifest
index 98452ed342c6..66ecbe069dc5 100644
--- a/sys-fs/shake/Manifest
+++ b/sys-fs/shake/Manifest
@@ -2,16 +2,15 @@
 Hash: SHA256
 
 AUX shake-0.999-fix_stat_include.patch 827 SHA256 5dbe88b8980f8663cf7cabf6bc4c99c4c8e8d7e0c918e61de14def93240bdde4 SHA512 92918957fe5af4024e0d4600fc601a8c8aae26edc5b353caea8879582c06908b42184f4d5bb7f388c071816ca1f70bdb4b9768b18e8ec3669481ca486b705fc8 WHIRLPOOL 825bb1430bb472ca3e7f9a3575bc7442e4b724598e0c989812fd3795f6507b93a376f5375e7412a4ce0d500f9037d548ad22fcf1195f61e0eaa283052b5fc21b
+AUX shake-0.999-uclibc.patch 1180 SHA256 fe8339ed47ae63db4d4c6092eb2037740ed1ecf661f3823ad972a569d4318827 SHA512 f37a4fbcc1ae932c0c8c9af090cb93481f3c6eb3de1994cc1585903e3ddaccf4c1c8a4e121b720119378fdd0f1d74235f197ba1a5c984aa416107bec6eb39a1e WHIRLPOOL ccfe5e93456a231b86ab89cdf44678959952d07ecb1e25f85cdf429e71d4b483de179e94dc102923d7f9482ce13164344a8b6ca7c23684dfb17dc1eba56a52d7
 DIST shake-0.999.tar.bz2 37225 SHA256 f030d5ba5d4d2d449249c49b253a71de8c342b9b2f5e1e7d3e7ba5277e3f5e91 SHA512 7dbd61cb35f771ffae6ec90bcdbf0cc467166661a78379191c7cf888d5f32ad27ea56da739f8f39344a209003747de2be1b57f2335ddc5641f55605c15c84b78 WHIRLPOOL 1d7354dac8aa3582048e8f8532ee308a792c041f15dc7b1e9e68b86b7cbfa66a72bbf9bbca481a3ac9738cb505d529eecd9aae135f2a64cfe5570ace59b862d8
-EBUILD shake-0.999.ebuild 650 SHA256 3e814b640badc341cf5532e880b789413c697e30030fc7478438a0e03a4600d9 SHA512 e6cda8dfc2c50c6bbf58013ea62881c33a5f51cccf8b5eac0358ceac779c60c90fd8697d9289fe12263da5b5f037528f428e93944470e44e250ad1744e03f472 WHIRLPOOL b5475445e10edf7af13475eebb399a6cf7a77bff6bb5fcfe80f6590e1b566f88be8d650a4c034c0837018f9a8cbc2d8b1ec6f09cbaf98e70b433058882fecb37
-MISC ChangeLog 1815 SHA256 c9f0e9124a643ef154c39613ec570838eb1d9f9e210358eafb7c5c8929eeb685 SHA512 bc3ad03aeb5ae167b3e71c6e69fe71cb720820d79d6ab1878ef0fe4d40ef074fa4de4090123cec43127e1b412379148b1522875c46164ae2556ac15dded1174c WHIRLPOOL 79bee56c8897491c6707753f58460bb8c0188cee8939d26c53d59112f8c1dc04619708ee30facef7248095eb3b6ac93ddca23b16ca54beb3cecc33a54bc5c285
+EBUILD shake-0.999.ebuild 676 SHA256 d560245d4ed96f3c79d8eebc9027822c0d197855f379ee98bda2ecfc5a141b35 SHA512 29b9a1437ff33f29d512d77766a4030162c1877bf4ab56b60c19f213889dd6c47a982202aa273f14d7365e3bdabf7acfdfa5b26bbd3d581ebcbc140a5836f198 WHIRLPOOL 51fadcbd374084423f8e3d77fd8c7309907645aa4e522d7200e2d1e05ac8906b24932fc7a5503f07d74703d0935aa597b96b541f2021a8401507b3beb7a4cdec
+MISC ChangeLog 2023 SHA256 7d7f1f340401975d68505aa1e34625bea3559e5f5866f9e9d9b67edc38a1adea SHA512 a6b537200a33247ff61ad5a7fc0c44f92131d5547ec660230b3e7701be904153cf5a3d285a6cf410fdd85c6938d06f58ecfc2ef8789126e26d38401fdf8ce0be WHIRLPOOL 95b5e5b2e1be23a7b441dc914e41f682df686525326c2c7b7e432a91c583049ad4ae0764bf1dba170da1d94a3547cd3c45189f127954c87d1735f75f198d827d
 MISC metadata.xml 360 SHA256 db1a357ad1e6a10f35887f9e4694840651de265803ef134f96c3fddb42a909fd SHA512 d3c84556d3f8c8f7f0fe87d30d8b33880f89b298b38057e1726fd50c88f950a6713fe4536c67bae78353b458e24c6ffb23fa15b9a523d306b934fd107955a547 WHIRLPOOL 77401fccfb9ae8c5240d2de662ab285e51b3b2ab68e97919a3e87c811914e382c4a75587c175aa38bd3d4c1706040b3082d252150101686b9a8abac8a2ff1c96
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iKYEAREIAGYFAlG5In1fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1Q5xACfVeUiCDK8FTQtPDadDBMxXSmV
-0kgAmwWHIEhHiVToMArYCYpfRvLPF2bq
-=Is6d
+iF4EAREIAAYFAlNxwWQACgkQFYEBGcdFJfIoigD6AzrN3z9kc0ekzydt2u/7hi/y
+qpByGDMtZejsdZqwIA4BAIE++G0BnCpHjYh1wxRY/a+Gs5/R6hMon62RH3l2BU7r
+=TrSn
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/shake/files/shake-0.999-uclibc.patch b/sys-fs/shake/files/shake-0.999-uclibc.patch
new file mode 100644
index 000000000000..2c54df0b552c
--- /dev/null
+++ b/sys-fs/shake/files/shake-0.999-uclibc.patch
@@ -0,0 +1,49 @@
+--- shake-fs-0.999-orig/executive.c
++++ shake-fs-0.999/executive.c
+@@ -214,12 +214,21 @@ release (struct accused *a, struct law *
+   assert (a->fd >= 0);
+   /* Restores mtime */
+   {
++#ifdef __UCLIBC__
++    struct timespec tv[2];
++    tv[0].tv_sec = a->atime;
++    tv[0].tv_nsec = 0;
++    tv[1].tv_sec = a->mtime;
++    tv[1].tv_nsec = 0;
++    futimens (a->fd, tv);
++#else
+     struct timeval tv[2];
+     tv[0].tv_sec = a->atime;
+     tv[0].tv_usec = 0;
+     tv[1].tv_sec = a->mtime;
+     tv[1].tv_usec = 0;
+     futimes (a->fd, tv);
++#endif
+   }
+   if (has_been_unlocked (a, l))
+     error (0, 0, "%s: concurent accesses", a->name);
+--- shake-fs-0.999-orig/linux.h
++++ shake-fs-0.999/linux.h
+@@ -32,7 +32,6 @@
+ /* Called once, perform OS-specific tasks.
+  */
+ int os_specific_setup (const char *tempfile);
+-
+ 
+ 
+ /* Get a write lock on the file.
+@@ -54,12 +53,13 @@ int readlock_to_writelock (int fd);
+ /* Return true if fd is locked, else false
+  */
+ bool is_locked (int fd);
+-
+ 
+ 
++#ifndef __UCLIBC__
+ /* Declares the glibc function
+  */
+ int futimes (int fd, const struct timeval tv[2]);
++#endif
+ 
+ /* Set the shake_ptime field and ctime of the file to the actual date.
+  */
diff --git a/sys-fs/shake/shake-0.999.ebuild b/sys-fs/shake/shake-0.999.ebuild
index 826d3a456c4b..0f7b1b4c0347 100644
--- a/sys-fs/shake/shake-0.999.ebuild
+++ b/sys-fs/shake/shake-0.999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/shake/shake-0.999.ebuild,v 1.6 2013/03/22 17:20:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/shake/shake-0.999.ebuild,v 1.7 2014/05/13 06:53:13 voyageur Exp $
 
 EAPI=5
 inherit cmake-utils eutils
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-fs-${PV}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix_stat_include.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_stat_include.patch
+	"${FILESDIR}"/${P}-uclibc.patch
+	)