[gentoo-commits] proj/musl:master commit in: dev-libs/libbsd/file/, dev-libs/libbsd/

[gentoo-commits] proj/musl:master commit in: dev-libs/libbsd/file/, dev-libs/libbsd/

[Anthony G. Basile]

commit:     1456dce0b34ed655c74090df144a0e91d53b410e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 11:15:07 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 11:15:07 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=1456dce0

dev-libs/libbsd: fix up several issues

Package-Manager: portage-2.2.26
RepoMan-Options: --force

 dev-libs/libbsd/Manifest                           |   3 +
 .../libbsd/file/libbsd-0.8.2-fix-headers.patch     |  44 +++
 .../libbsd/file/libbsd-0.8.2-remore-funopen.patch  |  33 ++
 .../file/libbsd-0.8.2-replace__BEGIN_DECLS.patch   | 340 +++++++++++++++++++++
 dev-libs/libbsd/libbsd-0.8.2-r99.ebuild            |  47 +++
 dev-libs/libbsd/metadata.xml                       |   8 +
 6 files changed, 475 insertions(+)

diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
new file mode 100644
index 0000000..a455a4b
--- /dev/null
+++ b/dev-libs/libbsd/Manifest
@@ -0,0 +1,3 @@
+DIST libbsd-0.8.2.tar.xz 344292 SHA256 b2f644cae94a6e2fe109449c20ad79a0f6ee4faec2205b07eefa0020565e250a SHA512 2230d51a30a0c3a8518c7e325036d2b578c8c2b47525c2d0d5f530d28d82227ad48b50341e44521db21f99208fe7c0df7313254c90e3c92da1c8664a8cbb87c5 WHIRLPOOL 4f9b09aaa7c0775cd46bf0aaaba9e9a7f07040262739002bf3966aace3bb4d782f96b176e2c489e7d7cbc0840eecc463a414dee1b5c92414c9a821796d739290
+EBUILD libbsd-0.8.2-r99.ebuild 1268 SHA256 a74971fd7df08e64944b25c91fdc951d3d5c9c4297af4650e04385c8da69675c SHA512 0c9cbd722111b40d2260695431175ddc1583a98a6c103d0d048f46a1f36550335dffe604cb0cc73fc9d21887a92d092cc6f1a7bc738708371033d5cdb22b1567 WHIRLPOOL 4002f15ada0f76029b3fd0dd67f586174392a4f1412e855f1c0da6cf0a198f0afae1492637db6404586b062534874a8cc520055e940196299947208983eda8e2
+MISC metadata.xml 276 SHA256 6bb81cdb026b199d78fb2a2327320a915a3bd241a9300bb069bd9c998521f613 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59 WHIRLPOOL d494386e01171fe51879cf968a6cebca04c22477f3b8a52bfdd17b9ee06afd99c3979396f7abf40bee698d6fbb060e2f37e083cb3ed010c018d84211a2bc7cd0

diff --git a/dev-libs/libbsd/file/libbsd-0.8.2-fix-headers.patch b/dev-libs/libbsd/file/libbsd-0.8.2-fix-headers.patch
new file mode 100644
index 0000000..890c690
--- /dev/null
+++ b/dev-libs/libbsd/file/libbsd-0.8.2-fix-headers.patch
@@ -0,0 +1,44 @@
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/sys/cdefs.h libbsd-0.8.2/include/bsd/sys/cdefs.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/sys/cdefs.h	2015-09-23 05:59:27.000000000 +0000
++++ libbsd-0.8.2/include/bsd/sys/cdefs.h	2016-04-04 22:04:30.264000000 +0000
+@@ -24,11 +24,13 @@
+  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++/*
+ #ifdef LIBBSD_OVERLAY
+ #include_next <sys/cdefs.h>
+ #else
+ #include <sys/cdefs.h>
+ #endif
++*/
+ 
+ #ifndef LIBBSD_SYS_CDEFS_H
+ #define LIBBSD_SYS_CDEFS_H
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/src/flopen.c libbsd-0.8.2/src/flopen.c
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/src/flopen.c	2011-07-05 16:56:44.000000000 +0000
++++ libbsd-0.8.2/src/flopen.c	2016-04-04 23:46:26.120000000 +0000
+@@ -35,6 +35,7 @@
+ #include <stdarg.h>
+ #include <unistd.h>
+ #include <libutil.h>
++#include <fcntl.h>
+ 
+ int
+ flopen(const char *path, int flags, ...)
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/src/nlist.c libbsd-0.8.2/src/nlist.c
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/src/nlist.c	2015-09-23 05:59:34.000000000 +0000
++++ libbsd-0.8.2/src/nlist.c	2016-04-05 00:22:48.056000000 +0000
+@@ -39,10 +39,11 @@
+ #include <arpa/inet.h>
+ 
+ #include <errno.h>
+-#include <a.out.h>
++#include <linux/a.out.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <fcntl.h>
+ 
+ #if !defined(__NO_A_OUT_SUPPORT)
+ #define _NLIST_DO_AOUT

diff --git a/dev-libs/libbsd/file/libbsd-0.8.2-remore-funopen.patch b/dev-libs/libbsd/file/libbsd-0.8.2-remore-funopen.patch
new file mode 100644
index 0000000..0da444d
--- /dev/null
+++ b/dev-libs/libbsd/file/libbsd-0.8.2-remore-funopen.patch
@@ -0,0 +1,33 @@
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/man/Makefile.am libbsd-0.8.2/man/Makefile.am
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/man/Makefile.am	2015-11-30 22:48:50.000000000 +0000
++++ libbsd-0.8.2/man/Makefile.am	2016-04-05 00:23:52.848000000 +0000
+@@ -29,7 +29,6 @@
+ 	flopen.3 \
+ 	fmtcheck.3 \
+ 	fparseln.3 \
+-	funopen.3bsd \
+ 	getbsize.3 \
+ 	getmode.3 \
+ 	getpeereid.3 \
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/src/Makefile.am libbsd-0.8.2/src/Makefile.am
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/src/Makefile.am	2015-12-14 02:34:40.000000000 +0000
++++ libbsd-0.8.2/src/Makefile.am	2016-04-05 00:14:59.360000000 +0000
+@@ -74,7 +74,6 @@
+ 	fmtcheck.c \
+ 	fparseln.c \
+ 	fpurge.c \
+-	funopen.c \
+ 	getbsize.c \
+ 	getpeereid.c \
+ 	hash/md5.c \
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/test/Makefile.am libbsd-0.8.2/test/Makefile.am
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/test/Makefile.am	2015-12-14 02:34:40.000000000 +0000
++++ libbsd-0.8.2/test/Makefile.am	2016-04-05 00:24:03.592000000 +0000
+@@ -36,7 +36,6 @@
+ 	endian \
+ 	humanize \
+ 	fgetln \
+-	funopen \
+ 	fparseln \
+ 	fpurge \
+ 	proctitle-init \

diff --git a/dev-libs/libbsd/file/libbsd-0.8.2-replace__BEGIN_DECLS.patch b/dev-libs/libbsd/file/libbsd-0.8.2-replace__BEGIN_DECLS.patch
new file mode 100644
index 0000000..1512da8
--- /dev/null
+++ b/dev-libs/libbsd/file/libbsd-0.8.2-replace__BEGIN_DECLS.patch
@@ -0,0 +1,340 @@
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/err.h libbsd-0.8.2/include/bsd/err.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/err.h	2015-12-13 23:58:51.000000000 +0000
++++ libbsd-0.8.2/include/bsd/err.h	2016-04-04 23:37:30.448000000 +0000
+@@ -42,7 +42,10 @@
+ 
+ #include <stdarg.h>
+ 
+-__BEGIN_DECLS
++/* __BEGIN_DECLS */
++#ifdef __cplusplus
++extern "C" {
++#endif
+ void warnc(int code, const char *format, ...)
+ 	__printflike(2, 3);
+ void vwarnc(int code, const char *format, va_list ap)
+@@ -51,6 +54,9 @@
+ 	__printflike(3, 4);
+ void verrc(int status, int code, const char *format, va_list ap)
+ 	__printflike(3, 0);
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++/* __END_DECLS */
+ 
+ #endif
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/libutil.h libbsd-0.8.2/include/bsd/libutil.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/libutil.h	2015-09-22 17:56:09.000000000 +0000
++++ libbsd-0.8.2/include/bsd/libutil.h	2016-04-04 23:37:42.336000000 +0000
+@@ -53,7 +53,10 @@
+ 	ino_t	pf_ino;
+ };
+ 
+-__BEGIN_DECLS
++/* __BEGIN_DECLS */
++#ifdef __cplusplus
++extern "C" {
++#endif
+ int humanize_number(char *buf, size_t len, int64_t bytes,
+     const char *suffix, int scale, int flags);
+ int expand_number(const char *_buf, uint64_t *_num);
+@@ -66,7 +69,10 @@
+ int pidfile_remove(struct pidfh *pfh);
+ 
+ char   *fparseln(FILE *, size_t *, size_t *, const char[3], int);
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++/* __END_DECLS */
+ 
+ /* humanize_number(3) */
+ #define HN_DECIMAL              0x01
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/md5.h libbsd-0.8.2/include/bsd/md5.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/md5.h	2015-12-13 23:58:59.000000000 +0000
++++ libbsd-0.8.2/include/bsd/md5.h	2016-04-04 23:37:50.496000000 +0000
+@@ -30,7 +30,10 @@
+ #include <sys/cdefs.h>
+ #include <sys/types.h>
+ 
+-__BEGIN_DECLS
++/* __BEGIN_DECLS */
++#ifdef __cplusplus
++extern "C" {
++#endif
+ void	 MD5Init(MD5_CTX *);
+ void	 MD5Update(MD5_CTX *, const uint8_t *, size_t)
+ 		__attribute__((__bounded__(__string__,2,3)));
+@@ -49,6 +52,9 @@
+ char	*MD5Data(const uint8_t *, size_t, char *)
+ 		__attribute__((__bounded__(__string__,1,2)))
+ 		__attribute__((__bounded__(__minbytes__,3,MD5_DIGEST_STRING_LENGTH)));
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++/* __END_DECLS */
+ 
+ #endif /* _MD5_H_ */
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/nlist.h libbsd-0.8.2/include/bsd/nlist.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/nlist.h	2015-09-22 17:56:09.000000000 +0000
++++ libbsd-0.8.2/include/bsd/nlist.h	2016-04-04 22:47:44.656000000 +0000
+@@ -30,8 +30,14 @@
+ #include <sys/cdefs.h>
+ #include <a.out.h>
+ 
+-__BEGIN_DECLS
++/* __BEGIN_DECLS */
++#ifdef __cplusplus
++extern "C" {
++#endif
+ extern int nlist(const char *filename, struct nlist *list);
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++/* __END_DECLS */
+ 
+ #endif
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/readpassphrase.h libbsd-0.8.2/include/bsd/readpassphrase.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/readpassphrase.h	2011-07-05 18:58:44.000000000 +0000
++++ libbsd-0.8.2/include/bsd/readpassphrase.h	2016-04-04 23:38:19.276000000 +0000
+@@ -34,8 +34,14 @@
+ #include <sys/cdefs.h>
+ #include <sys/types.h>
+ 
+-__BEGIN_DECLS
++/* __BEGIN_DECLS */
++#ifdef __cplusplus
++extern "C" {
++#endif
+ char * readpassphrase(const char *, char *, size_t, int);
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++/* __END_DECLS */
+ 
+ #endif /* !_READPASSPHRASE_H_ */
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/stdio.h libbsd-0.8.2/include/bsd/stdio.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/stdio.h	2015-09-23 05:59:34.000000000 +0000
++++ libbsd-0.8.2/include/bsd/stdio.h	2016-04-04 23:38:34.016000000 +0000
+@@ -41,7 +41,10 @@
+ #include <sys/cdefs.h>
+ #include <sys/types.h>
+ 
+-__BEGIN_DECLS
++/* __BEGIN_DECLS */
++#ifdef __cplusplus
++extern "C" {
++#endif
+ const char *fmtcheck(const char *, const char *);
+ 
+ /* XXX: The function requires cooperation from the system libc to store the
+@@ -69,7 +72,10 @@
+ #define fwopen(cookie, fn) funopen(cookie, NULL, fn, NULL, NULL)
+ 
+ int fpurge(FILE *fp);
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++/* __END_DECLS */
+ 
+ #endif
+ #endif
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/stdlib.h libbsd-0.8.2/include/bsd/stdlib.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/stdlib.h	2015-09-23 05:14:21.000000000 +0000
++++ libbsd-0.8.2/include/bsd/stdlib.h	2016-04-04 23:38:46.384000000 +0000
+@@ -46,7 +46,10 @@
+ #include <sys/stat.h>
+ #include <stdint.h>
+ 
+-__BEGIN_DECLS
++/* __BEGIN_DECLS */
++#ifdef __cplusplus
++extern "C" {
++#endif
+ uint32_t arc4random(void);
+ void arc4random_stir(void);
+ void arc4random_addrandom(u_char *dat, int datlen);
+@@ -73,6 +76,9 @@
+                    const char **errstr);
+ 
+ char *getbsize(int *headerlenp, long *blocksizep);
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++/* __END_DECLS */
+ 
+ #endif
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/string.h libbsd-0.8.2/include/bsd/string.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/string.h	2015-09-24 03:30:23.000000000 +0000
++++ libbsd-0.8.2/include/bsd/string.h	2016-04-04 23:39:00.040000000 +0000
+@@ -36,13 +36,19 @@
+ #include <sys/cdefs.h>
+ #include <sys/types.h>
+ 
+-__BEGIN_DECLS
++/* __BEGIN_DECLS */
++#ifdef __cplusplus
++extern "C" {
++#endif
+ size_t strlcpy(char *dst, const char *src, size_t siz);
+ size_t strlcat(char *dst, const char *src, size_t siz);
+ char *strnstr(const char *str, const char *find, size_t str_len);
+ void strmode(mode_t mode, char *str);
+ 
+ void explicit_bzero(void *buf, size_t len);
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++/* __END_DECLS */
+ 
+ #endif
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/stringlist.h libbsd-0.8.2/include/bsd/stringlist.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/stringlist.h	2015-09-22 17:56:09.000000000 +0000
++++ libbsd-0.8.2/include/bsd/stringlist.h	2016-04-04 23:39:08.168000000 +0000
+@@ -43,12 +43,18 @@
+ 	size_t	  sl_cur;
+ } StringList;
+ 
+-__BEGIN_DECLS
++/* __BEGIN_DECLS */
++#ifdef __cplusplus
++extern "C" {
++#endif
+ StringList	*sl_init(void);
+ int		 sl_add(StringList *, char *);
+ void		 sl_free(StringList *, int);
+ char		*sl_find(StringList *, const char *);
+ int		 sl_delete(StringList *, const char *, int);
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++/* __END_DECLS */
+ 
+ #endif /* _STRINGLIST_H */
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/sys/cdefs.h libbsd-0.8.2/include/bsd/sys/cdefs.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/sys/cdefs.h	2015-09-23 05:59:27.000000000 +0000
++++ libbsd-0.8.2/include/bsd/sys/cdefs.h	2016-04-04 22:04:30.264000000 +0000
+@@ -24,11 +24,13 @@
+  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++/*
+ #ifdef LIBBSD_OVERLAY
+ #include_next <sys/cdefs.h>
+ #else
+ #include <sys/cdefs.h>
+ #endif
++*/
+ 
+ #ifndef LIBBSD_SYS_CDEFS_H
+ #define LIBBSD_SYS_CDEFS_H
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/unistd.h libbsd-0.8.2/include/bsd/unistd.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/unistd.h	2015-12-13 23:58:51.000000000 +0000
++++ libbsd-0.8.2/include/bsd/unistd.h	2016-04-04 23:39:19.816000000 +0000
+@@ -45,7 +45,10 @@
+ #define S_ISTXT S_ISVTX
+ #endif
+ 
+-__BEGIN_DECLS
++/* __BEGIN_DECLS */
++#ifdef __cplusplus
++extern "C" {
++#endif
+ extern int optreset;
+ 
+ #ifdef LIBBSD_OVERLAY
+@@ -68,6 +71,9 @@
+ 	__printflike(1, 2);
+ 
+ int getpeereid(int s, uid_t *euid, gid_t *egid);
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++/* __END_DECLS */
+ 
+ #endif
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/vis.h libbsd-0.8.2/include/bsd/vis.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/vis.h	2011-07-05 18:58:44.000000000 +0000
++++ libbsd-0.8.2/include/bsd/vis.h	2016-04-04 23:39:28.360000000 +0000
+@@ -74,7 +74,10 @@
+ 
+ #include <sys/cdefs.h>
+ 
+-__BEGIN_DECLS
++/* __BEGIN_DECLS */
++#ifdef __cplusplus
++extern "C" {
++#endif
+ char	*vis(char *, int, int, int);
+ int	strvis(char *, const char *, int);
+ int	strvisx(char *, const char *, size_t, int);
+@@ -83,6 +86,9 @@
+ int	strunvisx(char *, const char *, int);
+ ssize_t strnunvis(char *, const char *, size_t);
+ int	unvis(char *, int, int *, int);
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++/* __END_DECLS */
+ 
+ #endif /* !_VIS_H_ */
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/wchar.h libbsd-0.8.2/include/bsd/wchar.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/wchar.h	2015-09-22 17:56:09.000000000 +0000
++++ libbsd-0.8.2/include/bsd/wchar.h	2016-04-04 23:39:35.656000000 +0000
+@@ -43,12 +43,18 @@
+ #include <sys/cdefs.h>
+ #include <sys/types.h>
+ 
+-__BEGIN_DECLS
++/* __BEGIN_DECLS */
++#ifdef __cplusplus
++extern "C" {
++#endif
+ wchar_t *fgetwln(FILE *stream, size_t *len);
+ 
+ size_t wcslcat(wchar_t *dst, const wchar_t *src, size_t size);
+ size_t wcslcpy(wchar_t *dst, const wchar_t *src, size_t size);
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++/* __END_DECLS */
+ 
+ #endif
+ #endif
+diff -Naur /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/src/hash/sha512.h libbsd-0.8.2/src/hash/sha512.h
+--- /var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/src/hash/sha512.h	2015-12-01 02:35:17.000000000 +0000
++++ libbsd-0.8.2/src/hash/sha512.h	2016-04-05 00:17:13.576000000 +0000
+@@ -39,7 +39,10 @@
+ 	unsigned char buf[128];
+ } SHA512_CTX;
+ 
+-__BEGIN_DECLS
++/* __BEGIN_DECLS */
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ void	SHA512_Init(SHA512_CTX *);
+ void	SHA512_Update(SHA512_CTX *, const void *, size_t);
+@@ -48,6 +51,9 @@
+ char   *SHA512_File(const char *, char *);
+ char   *SHA512_FileChunk(const char *, char *, off_t, off_t);
+ char   *SHA512_Data(const void *, unsigned int, char *);
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++/* __END_DECLS */
+ 
+ #endif /* !_SHA512_H_ */

diff --git a/dev-libs/libbsd/libbsd-0.8.2-r99.ebuild b/dev-libs/libbsd/libbsd-0.8.2-r99.ebuild
new file mode 100644
index 0000000..48e4677
--- /dev/null
+++ b/dev-libs/libbsd/libbsd-0.8.2-r99.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
+HOMEPAGE="http://libbsd.freedesktop.org/wiki/"
+SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz"
+
+LICENSE="BSD BSD-2 BSD-4 ISC"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc x86"
+IUSE="static-libs"
+
+pkg_setup() {
+	local f="${ROOT}/usr/$(get_libdir)/${PN}.a"
+	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
+	if ! has_version ${CATEGORY}/${PN}; then
+		if [[ -e ${f} ]]; then
+			eerror "${m}"
+			die "${m}"
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-replace__BEGIN_DECLS.patch
+	epatch "${FILESDIR}"/${P}-fix-headers.patch
+
+	/* This requires autoconf */
+	epatch "${FILESDIR}"/${P}-remore-funopen.patch
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
+	# which is correct, see:
+	# http://cgit.freedesktop.org/libbsd/commit/?id=c5b959028734ca2281250c85773d9b5e1d259bc8
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+}

diff --git a/dev-libs/libbsd/metadata.xml b/dev-libs/libbsd/metadata.xml
new file mode 100644
index 0000000..0f6db56
--- /dev/null
+++ b/dev-libs/libbsd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>freedesktop-bugs@gentoo.org</email>
+    <name>Gentoo Freedesktop Project</name>
+  </maintainer>
+</pkgmetadata>