Fix build for musl. Bug #550298.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 43 insertions, 17 deletions

diff --git a/sys-libs/libcap-ng/ChangeLog b/sys-libs/libcap-ng/ChangeLog
index 660c801f28c3..6dd3084a38db 100644
--- a/sys-libs/libcap-ng/ChangeLog
+++ b/sys-libs/libcap-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libcap-ng
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/ChangeLog,v 1.77 2015/05/11 10:00:25 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/ChangeLog,v 1.78 2015/05/25 18:04:24 blueness Exp $
+
+  25 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +files/libcap-ng-0.7.5-add-unistd_h.patch, libcap-ng-0.7.5.ebuild:
+  Fix build for musl.  Bug #550298.
 
 *libcap-ng-0.7.5 (11 May 2015)
 
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index 206a18d8dd3c..d64ff9bd177a 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libcap-ng-0.7.5-add-unistd_h.patch 832 SHA256 e5afe27a8ab8fc6d29edc81a07e905cf7ba5c40731ce9ab10184385c77d38c5e SHA512 0d9dcdfaf209ca36fa95ccd3134ad86aa5883b664e8110753939678dd63defef716f0f8490816a74958ca302f30f4a06bf7ae2bf698bfb51ad4590432a02461d WHIRLPOOL c58821c6271e08b9ff4687fbf8d40211d7804c42d9dac89925815ce3ab191cd665bdf3585fb3b9dd43da1c32c5918b85586d71d2b0c8ceecb2b1f1c36e548964
 DIST libcap-ng-0.6.6.tar.gz 367231 SHA256 89589a29a6b19068edd650dd4f626c10e84bfe63eacae7b1fd1f98f3ac8ea00d SHA512 383aaa9e315e2498c779a17bef35df6aee072c42598d07d92bdd7a2328a3bcd22d5ec46d600babc467aa4d1b01e9dd660493dafba3b06c7ac81f35df9d4d6e3e WHIRLPOOL c1a72480d545b45ae385065449098f0878f8c8d138f1d9bd9b3445d1146fd6a227bb9b0ac0148542995c5b6683c7c5998d0cd61a369b9f5c84fb39a9dc5cf8a3
 DIST libcap-ng-0.7.3.tar.gz 392613 SHA256 5ca441c8d3a1e4cfe8a8151907977662679457311ccaa7eaac91447c33a35bb1 SHA512 f03a35c54b5998ef2e712540caa1f4ade37f9abe60992a1e727142b26815a4b8a7ce86ea94466fe692e4798c7297e5e1bbd338e5afe05689905ee9e0c0f16ef2 WHIRLPOOL 7752a70ea348dfc52537f67d5dccab03d598a112a7263a8811987453b53cda58643e938b4651c5cd8d0ea02f20fddc10bff2ac8bc23f68f97c9ab8c5791429ab
 DIST libcap-ng-0.7.4.tar.gz 407007 SHA256 48a2083276f9820cb92dcb05d001b30733bcbf48c14c230303cac3cd08b45b6b SHA512 443b92f44cffd4b436a2651eb3539c560382102d918faf63f993d3b6627c03e80f7b4a5105ddb040890ef82122a42ca6881795ab0639de337f693705f5506cf0 WHIRLPOOL 3d62f26fad8c9e7756374022982a4f2fcdde5af5532474dfa7eb6ba1bc7f97984691bdda8975ef32423b8e86af2462ef672ba3175a3121a484c46096cc8f10b2
@@ -8,23 +9,23 @@ DIST libcap-ng-0.7.5.tar.gz 409426 SHA256 7ba01e73c027e4f17bff6cdd77c01b25987e58
 EBUILD libcap-ng-0.6.6.ebuild 2515 SHA256 34967b49aaab191ccd019a7d057b533665f227cb4e9657b91cd3c9e63ec9c2b2 SHA512 af0d89bb0a7a5b422668cd2cba3ad87deca3b559be2b0d552c82d37b99c289eee2d1270a7813fb6f0f00f8fd52395f3f4704e482cc93d462238e063706efab8b WHIRLPOOL 2614cb420195b3a1924722b95230e8bcfc0bac379ebfc544d90a0dda3a4e899ddab0598b556afddfeb06eaf8729631f1a02112adc3497aebe381332ec3c760a0
 EBUILD libcap-ng-0.7.3.ebuild 2544 SHA256 97da6bcf610be3a52d54a7eab1be25ab62b5b474d7af483cffd66f6daa8bf020 SHA512 1cd200527ff4c548c705674df9a5903d15cfff42a82cad3160f6776c587dfafb77b875096cfc391b845bbc49ca63c0001c917af9d009b1a5ff8f76be5499ead3 WHIRLPOOL 954d4a5cdd4c06b28c631eb44f8b71c04b79878eb78e471a93694c6347321e16fe3f6c99b512b90fe3f9cad569190abcf0fdd34d06ad71d81bdab0eeaf1f4bd2
 EBUILD libcap-ng-0.7.4.ebuild 2099 SHA256 34ec6acbd9c621d0fb536bcb2b16e3a1402d0cebbceda4abed32849762401d0e SHA512 8dc48ce30a61ab7ec2b5321384e9a885e417319f6564d998e6ee6d7e9ff670fe9a39c440faa63834894dcf556b2d78e301aaddc14f7a0f96ec0dc7fe431cce5f WHIRLPOOL f3cecb8d3da6cd23b9e6a9bed31ebef471c47b50c2c310fd3c1f8adcf4ef6416748683d3adaa15bf673f19e45b53f7b0609fcfd04144ac8496e31397f409cbe9
-EBUILD libcap-ng-0.7.5.ebuild 2115 SHA256 21396e69b7f60100717b405eea798e9395663f0fbcd0a5f196638cce9895d3ab SHA512 314856ed6949380b9dfbe5268eb90280d20642532f61df8d234fd71b750888e42c1d80f5300633c150c011fd30f4e110de3b245693cddd418e786f184e4f1a48 WHIRLPOOL f3517e433e7619093b649eaad3caed2374eed7834727526a00df8949d51f2abf14f9b360286858fe92454d022b5d041d6a064dc33daa6f4ed21c2d251d5e7ed1
-MISC ChangeLog 9750 SHA256 030021e1043d277c5bde0260492b3f653db45f72ed911e99addec836f4fbd8f7 SHA512 10411a31796b38dfdf4680e8334566901dc4c2ba98168dc296c0e47c63bd5cc9d5f66f9cceb4c459c4a8a4fcb99eb5443e08f1fae116085260ed119818fbc3b7 WHIRLPOOL a96fe4000a441be7be5f20b8c80241ecd423fcba015084c70c993b3472523ab1bb49754a8c0ae48abf623e8d09fa83194ce4a699cff969988e8fbc8e658c4006
+EBUILD libcap-ng-0.7.5.ebuild 2157 SHA256 0ba2c564d4c9ca53b6f2a813c62dd19f959c18ec365ec3ef9f088156d23b801d SHA512 1355de2d09f31f3b1d990556e71c64d7a25d8c9de388cd9bce8e843ffa4d700ba7578246c69ce309f111946b7bb5f500b38c0fa2448986d282afd32f83e60d8a WHIRLPOOL 49e44d50a556f359129facb8a125e683b83807366677560f7ca5cd58ddbc0be60cda3a6cf99e8554b85ce4626aeca63ad304d24e46e21c5b5f6afdcd8f03aca5
+MISC ChangeLog 9907 SHA256 8770895cb4123c77a31c9ad0fa78133638280bf79202ef6cab6db0ba418f85d1 SHA512 38f4ebb2c07a8de251414b0b754bb47fcf688c582b74b5128fcab7dd9f6bf56bcfd9ea27a5cc03c11008d8b0bce7e623b84a94746436f51a1ef333656a76b8fd WHIRLPOOL e800e6f7d6e3455fd33b79027dbd9ad539b96575ab2748af9f027a14559e2b0bae06b0559856407180958ce85d400dc8848e4bf5726c8223990783b07429bbc3
 MISC metadata.xml 501 SHA256 2ba6118979e987255eff0de2453eff6e9a76d4e2ffa04e3acbe1bc92fda0a171 SHA512 f974d0009e90640257cab704897db67cc736663313d026ba2092a6aaae004973416e1f649c9d7a0373b1f58d49db8103217e85803faa8c37a7830c9057f2c5e8 WHIRLPOOL 38c2e18fffda49e0b81e47bce317af92b0e992d1371c79e2e8bed04ea69e704902e005af8693735f7bf1fbf8d1cda5bea6ec9e0c20886018103914d11a95ec30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVUH26AAoJEPiazRVxLXTF1yYP/jrVW7Ukwusr969/VUMsPbog
-kW1AOazmRc1z2A5Y7tmLklEeO6TVVdLWUD1z2ng4G6z0P5287uhonNisU9IA4sR4
-LoZ3/tKL5yeqQUeKfSSI8XxVIfQdsC1dMNZIpiMz1A0rSokVU2WRqHnxoSdhKhsa
-BZV6zSGKPd208bXmZORCNQYJkVdcuFjfwO5PiMaWWJniik1DOKvqAu/j18Z4PJGB
-tvQyL5jrm5I+oL+JuoVbyJTBNvJZEG1/jywi+vuMl8DWfmzvLZ4Ry+2H2SsklxLj
-aYl7zZIoLi5jXlY+Wgc03rI9Niw/Lqf5gI1UMqKnjW1u15D2Qpd7U4Tg13PtsY16
-UOIVlBlWnC/V8lH2wSj5Seb9R3BuQvCO/jqykNrC9gfCEzBQItet4fLjEMSaLT6E
-cZd3tSiBOTBkN/IRM63KWrO3PFHLG7n3Y9eKJYOo8zhzAahcuBJfbkWn1urr/xXS
-OPc642eP3YpGpEEX2DsAqMTJTFsLNA017oJ35Q/Mr0Pyge9FDvisHe1aUiCNl+IM
-Ka6gyNCqFe8QL417EQVhbE11IkPKSPKXjPD0eWMm25TXobnkVbfnZk2xHBV63FKE
-wGw8Vv8EK/2HyiyPdj4o2Ih2bwQySPODSsEIcM+aZ6E22CYcUeJj35KD/v7XNF4k
-DO843TDT2pnSxKhy8ZPI
-=Lj1w
+iQIcBAEBCAAGBQJVY2RgAAoJEJOE+m71LUu6ndcQAK+9b37+cjJvG04Kxb/It4+K
+6H5r7yrUzFPJUzHnn8IDMLplnAdDKOO9QMOnAmuT6zDll2+0+yG2C9SMvDIpn+Pr
+ntMxeNY1RM96Uj2ML3fhUwvHW6/XFYpiXS1Po3HyOKvqvAXM5o00Rnvg739Kp7rX
+X3OYtJwIblt0oTq9JTDKt7+ZyB9ZE8n0KhsBuMLsx2UVteC9ACF7REa6rb8yvhbU
+eb/PT1iP0DTKUJKuhNsgE9MWeQ0Vp5txKfxDjdXNlJeweSfMYLbp6PMx6QsFV70B
+QQPUEtQH+fACiZavCzlA7+0GlaZYxbCR4WnwCEPu8BO8CtVAhSUrjSdCTMmR76vr
+jbev5fk3e1pxLeb8/jeudIlL5euW5sHv34YTAQ/EW1iiKk1XUCphX9G8ynWN7BCe
+XSKMiopb+EYMh6NYBVLQ9tKK81b6tBWb7V4h8n+A3DBpGBr6suTP9NiZRI6WrOPx
+DjwPxj1MkQ9QV9+7chdomfEQQ4t/8g0mvTLEyYDySV7P8noFl8jSjkR94BciXI/j
+tdJy81MLB9qPoxRBoqrxHVPMXsXEaXGlARVTkL2NmDn43tN3dPqUgoi7v/45+eNU
+tTVdIIbX3pW2MEtqorUVqbapzmmo1meA/tN9CDD7b5hT9HhfLkeixtFylFLh1He5
+r58JOmURmL+6rd5gbs3y
+=BrHE
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libcap-ng/files/libcap-ng-0.7.5-add-unistd_h.patch b/sys-libs/libcap-ng/files/libcap-ng-0.7.5-add-unistd_h.patch
new file mode 100644
index 000000000000..bfeef6e2da39
--- /dev/null
+++ b/sys-libs/libcap-ng/files/libcap-ng-0.7.5-add-unistd_h.patch
@@ -0,0 +1,20 @@
+utils/proc-llist.c: include <unistd.h>
+
+proc-llist.c references pid_t and uid_t types but does not include <unistd.h>.  This
+works on glibc and uClibc because of the way their headers stack, but on musl (and
+possible other libc) this fails.  POSIX mandates that <unistd.h> provides these.  See
+Issue 6 at http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/unistd.h.html.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+
+diff -Nuar libcap-ng-0.7.5.orig/utils/proc-llist.c libcap-ng-0.7.5/utils/proc-llist.c
+--- libcap-ng-0.7.5.orig/utils/proc-llist.c	2015-02-18 17:13:33.000000000 -0500
++++ libcap-ng-0.7.5/utils/proc-llist.c	2015-05-25 13:39:32.196624248 -0400
+@@ -24,6 +24,7 @@
+ #include "config.h"
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ #include "proc-llist.h"
+ 
+ void list_create(llist *l)
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild
index 6a5abf778854..9532eaa878cf 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild,v 1.1 2015/05/11 10:00:25 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild,v 1.2 2015/05/25 18:04:24 blueness Exp $
 
 EAPI=5
 
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}
 	python? ( >=dev-lang/swig-2 )"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-add-unistd_h.patch
 	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
 
 	autotools-utils_src_prepare