commit: 9a7ee351497e9b61bb12053a359cd984c15c77f1
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 23:58:09 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Feb 12 23:58:30 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9a7ee351
dev-libs/libbsd: fix is in the tree
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
dev-libs/libbsd/Manifest | 3 -
.../libbsd/files/libbsd-0.8.5-cdef-headers.patch | 180 ---------------------
dev-libs/libbsd/files/libbsd-0.8.7-musl.patch | 26 ---
.../files/libbsd-0.9.1-missing-fcntl_h.patch | 11 --
dev-libs/libbsd/libbsd-0.8.6.ebuild | 45 ------
dev-libs/libbsd/libbsd-0.8.7.ebuild | 46 ------
dev-libs/libbsd/libbsd-0.9.1.ebuild | 42 -----
dev-libs/libbsd/metadata.xml | 8 -
8 files changed, 361 deletions(-)
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
deleted file mode 100644
index 0979330..0000000
--- a/dev-libs/libbsd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libbsd-0.8.6.tar.xz 371112 BLAKE2B
adab6c17267e0cff128351efccf5c1225b7dd85dc61dd8168bf212ba5aff8d726fa5be687c041821af9a427ddad9dfcd3630cac9134b9e81c86ab2599e43aef9
SHA512
ece01ced324f840c2cee6321c7dcf97ff123d55ea9f203c1ce35e1b46643dc7b34ef6dc6c8d128252b36848624850b40823411cc96b99a66a401eb1e9d8cea6b
-DIST libbsd-0.8.7.tar.xz 371772 BLAKE2B
aa4aa1c19872edf9e7e6ed270275199366345531a48ee28c25e209f17c5403a22269b91ab1c806cb1b54ba33a8464f4b035fe7ee2bc5dddd0a4fda09c540b058
SHA512
605a14eb5d33c0e45c3bd29e585ebc15832e2ed1efa9356291a0562622168da96db1a20766e9dae8910ea0c1516429f43905edc8d4f2a40a5a341a689d08fcc3
-DIST libbsd-0.9.1.tar.xz 387180 BLAKE2B
40dd82ca1088ee7aae8b3d7685e8514eec702bf7ada7ef98f7177cad92b7e0fccc22a953b35f0f27202eb56833b31a81bef1324d43864d1b80887ba7c58684d5
SHA512
435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c
diff --git a/dev-libs/libbsd/files/libbsd-0.8.5-cdef-headers.patch
b/dev-libs/libbsd/files/libbsd-0.8.5-cdef-headers.patch
deleted file mode 100644
index 1e633ad..0000000
--- a/dev-libs/libbsd/files/libbsd-0.8.5-cdef-headers.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -Naur libbsd-0.8.5.orig/include/bsd/libutil.h
libbsd-0.8.5/include/bsd/libutil.h
---- libbsd-0.8.5.orig/include/bsd/libutil.h 2017-07-06 16:08:04.619303082
-0700
-+++ libbsd-0.8.5/include/bsd/libutil.h 2017-07-06 16:12:50.818328308 -0700
-@@ -40,7 +40,11 @@
- #define LIBBSD_LIBUTIL_H
-
- #include <features.h>
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
- #include <stdint.h>
- #include <stdio.h>
-diff -Naur libbsd-0.8.5.orig/include/bsd/md5.h libbsd-0.8.5/include/bsd/md5.h
---- libbsd-0.8.5.orig/include/bsd/md5.h 2017-07-06 16:08:04.619303082
-0700
-+++ libbsd-0.8.5/include/bsd/md5.h 2017-07-06 16:13:04.431483349 -0700
-@@ -27,7 +27,11 @@
- uint8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */
- } MD5_CTX;
-
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
-
- __BEGIN_DECLS
-diff -Naur libbsd-0.8.5.orig/include/bsd/nlist.h
libbsd-0.8.5/include/bsd/nlist.h
---- libbsd-0.8.5.orig/include/bsd/nlist.h 2017-07-06 16:08:04.618303071
-0700
-+++ libbsd-0.8.5/include/bsd/nlist.h 2017-07-06 16:09:48.534486197 -0700
-@@ -27,7 +27,11 @@
- #ifndef LIBBSD_NLIST_H
- #define LIBBSD_NLIST_H
-
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
-
- struct nlist {
- union {
-diff -Naur libbsd-0.8.5.orig/include/bsd/readpassphrase.h
libbsd-0.8.5/include/bsd/readpassphrase.h
---- libbsd-0.8.5.orig/include/bsd/readpassphrase.h 2017-07-06
16:08:04.619303082 -0700
-+++ libbsd-0.8.5/include/bsd/readpassphrase.h 2017-07-06 16:09:03.248970623
-0700
-@@ -31,7 +31,11 @@
- #define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */
- #define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */
-
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
-
- __BEGIN_DECLS
-diff -Naur libbsd-0.8.5.orig/include/bsd/stdlib.h
libbsd-0.8.5/include/bsd/stdlib.h
---- libbsd-0.8.5.orig/include/bsd/stdlib.h 2017-07-06 16:08:04.619303082
-0700
-+++ libbsd-0.8.5/include/bsd/stdlib.h 2017-07-06 16:12:34.317140374 -0700
-@@ -42,7 +42,11 @@
- #ifndef LIBBSD_STDLIB_H
- #define LIBBSD_STDLIB_H
-
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/stat.h>
- #include <stdint.h>
-
-diff -Naur libbsd-0.8.5.orig/include/bsd/string.h
libbsd-0.8.5/include/bsd/string.h
---- libbsd-0.8.5.orig/include/bsd/string.h 2017-07-06 16:08:04.616303048
-0700
-+++ libbsd-0.8.5/include/bsd/string.h 2017-07-06 16:11:30.373645631 -0700
-@@ -33,7 +33,11 @@
- #ifndef LIBBSD_STRING_H
- #define LIBBSD_STRING_H
-
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
-
- __BEGIN_DECLS
-diff -Naur libbsd-0.8.5.orig/include/bsd/stringlist.h
libbsd-0.8.5/include/bsd/stringlist.h
---- libbsd-0.8.5.orig/include/bsd/stringlist.h 2017-07-06 16:08:04.618303071
-0700
-+++ libbsd-0.8.5/include/bsd/stringlist.h 2017-07-06 16:10:04.714670407
-0700
-@@ -31,7 +31,11 @@
-
- #ifndef LIBBSD_STRINGLIST_H
- #define LIBBSD_STRINGLIST_H
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
-
- /*
-diff -Naur libbsd-0.8.5.orig/include/bsd/sys/queue.h
libbsd-0.8.5/include/bsd/sys/queue.h
---- libbsd-0.8.5.orig/include/bsd/sys/queue.h 2017-07-06 16:08:04.617303059
-0700
-+++ libbsd-0.8.5/include/bsd/sys/queue.h 2017-07-06 16:10:50.413190683
-0700
-@@ -33,7 +33,11 @@
- #ifndef LIBBSD_SYS_QUEUE_H
- #define LIBBSD_SYS_QUEUE_H
-
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
-
- /*
- * This file defines four types of data structures: singly-linked lists,
-diff -Naur libbsd-0.8.5.orig/include/bsd/sys/tree.h
libbsd-0.8.5/include/bsd/sys/tree.h
---- libbsd-0.8.5.orig/include/bsd/sys/tree.h 2017-07-06 16:08:04.616303048
-0700
-+++ libbsd-0.8.5/include/bsd/sys/tree.h 2017-07-06 16:10:36.518032487
-0700
-@@ -30,7 +30,11 @@
- #ifndef LIBBSD_SYS_TREE_H
- #define LIBBSD_SYS_TREE_H
-
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
-
- /*
- * This file defines data structures for different types of trees:
-diff -Naur libbsd-0.8.5.orig/include/bsd/timeconv.h
libbsd-0.8.5/include/bsd/timeconv.h
---- libbsd-0.8.5.orig/include/bsd/timeconv.h 2017-07-06 16:08:04.618303071
-0700
-+++ libbsd-0.8.5/include/bsd/timeconv.h 2017-07-06 16:09:22.051184685
-0700
-@@ -41,7 +41,11 @@
- #ifndef LIBBSD_TIMECONV_H
- #define LIBBSD_TIMECONV_H
-
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <stdint.h>
- #include <time.h>
-
-diff -Naur libbsd-0.8.5.orig/include/bsd/vis.h libbsd-0.8.5/include/bsd/vis.h
---- libbsd-0.8.5.orig/include/bsd/vis.h 2017-07-06 16:08:04.618303071
-0700
-+++ libbsd-0.8.5/include/bsd/vis.h 2017-07-06 16:11:53.812912487 -0700
-@@ -72,7 +72,11 @@
- */
- #define UNVIS_END 1 /* no more characters */
-
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
-
- __BEGIN_DECLS
- char *vis(char *, int, int, int);
-diff -Naur libbsd-0.8.5.orig/include/bsd/wchar.h
libbsd-0.8.5/include/bsd/wchar.h
---- libbsd-0.8.5.orig/include/bsd/wchar.h 2017-07-06 16:08:04.617303059
-0700
-+++ libbsd-0.8.5/include/bsd/wchar.h 2017-07-06 16:12:15.509834163 -0700
-@@ -40,7 +40,11 @@
- #define LIBBSD_WCHAR_H
-
- #include <stddef.h>
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
-
- __BEGIN_DECLS
diff --git a/dev-libs/libbsd/files/libbsd-0.8.7-musl.patch
b/dev-libs/libbsd/files/libbsd-0.8.7-musl.patch
deleted file mode 100644
index b541ff4..0000000
--- a/dev-libs/libbsd/files/libbsd-0.8.7-musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur libbsd-0.8.7.orig/include/bsd/stdlib.h
libbsd-0.8.7/include/bsd/stdlib.h
---- libbsd-0.8.7.orig/include/bsd/stdlib.h 2018-01-30 13:28:46.240353330
-0800
-+++ libbsd-0.8.7/include/bsd/stdlib.h 2018-01-30 13:39:33.539341738 -0800
-@@ -67,9 +67,7 @@
- const unsigned char *table, unsigned endbyte);
-
- void *reallocf(void *ptr, size_t size);
--#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26)
- void *reallocarray(void *ptr, size_t nmemb, size_t size);
--#endif
-
- long long strtonum(const char *nptr, long long minval, long long maxval,
- const char **errstr);
-diff -Naur libbsd-0.8.7.orig/include/bsd/string.h
libbsd-0.8.7/include/bsd/string.h
---- libbsd-0.8.7.orig/include/bsd/string.h 2018-01-30 13:28:46.239353330
-0800
-+++ libbsd-0.8.7/include/bsd/string.h 2018-01-30 13:39:27.108341853 -0800
-@@ -42,9 +42,7 @@
- char *strnstr(const char *str, const char *find, size_t str_len);
- void strmode(mode_t mode, char *str);
-
--#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25)
- void explicit_bzero(void *buf, size_t len);
--#endif
- __END_DECLS
-
- #endif
diff --git a/dev-libs/libbsd/files/libbsd-0.9.1-missing-fcntl_h.patch
b/dev-libs/libbsd/files/libbsd-0.9.1-missing-fcntl_h.patch
deleted file mode 100644
index 1cfad0e..0000000
--- a/dev-libs/libbsd/files/libbsd-0.9.1-missing-fcntl_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur libbsd-0.9.1.orig/src/flopen.c libbsd-0.9.1/src/flopen.c
---- libbsd-0.9.1.orig/src/flopen.c 2018-06-06 17:42:53.453839087 -0700
-+++ libbsd-0.9.1/src/flopen.c 2018-06-06 17:43:04.478838890 -0700
-@@ -32,6 +32,7 @@
- #include <sys/stat.h>
-
- #include <errno.h>
-+#include <fcntl.h>
- #include <stdarg.h>
- #include <unistd.h>
-
diff --git a/dev-libs/libbsd/libbsd-0.8.6.ebuild
b/dev-libs/libbsd/libbsd-0.8.6.ebuild
deleted file mode 100644
index db7bd48..0000000
--- a/dev-libs/libbsd/libbsd-0.8.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="An library to provide useful functions commonly found on BSD
systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/";
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz";
-
-LICENSE="BSD BSD-2 BSD-4 ISC"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-3.17"
-RDEPEND=""
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-0.8.5-cdef-headers.patch
- default
-}
-
-pkg_setup() {
- local f="${EROOT}/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
-}
-
-multilib_src_configure() {
- # The build system will install libbsd-ctor.a despite of
USE="-static-libs"
- # which is correct, see:
- #
https://cgit.freedesktop.org/libbsd/commit/?id=c5b959028734ca2281250c85773d9b5e1d259bc8
- ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libbsd/libbsd-0.8.7.ebuild
b/dev-libs/libbsd/libbsd-0.8.7.ebuild
deleted file mode 100644
index cff3987..0000000
--- a/dev-libs/libbsd/libbsd-0.8.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="An library to provide useful functions commonly found on BSD
systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/";
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz";
-
-LICENSE="BSD BSD-2 BSD-4 ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-3.17"
-RDEPEND=""
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-0.8.5-cdef-headers.patch
- eapply "${FILESDIR}"/${PN}-0.8.7-musl.patch
- default
-}
-
-pkg_setup() {
- local f="${EROOT}/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
-}
-
-multilib_src_configure() {
- # The build system will install libbsd-ctor.a despite of
USE="-static-libs"
- # which is correct, see:
- #
https://cgit.freedesktop.org/libbsd/commit/?id=c5b959028734ca2281250c85773d9b5e1d259bc8
- ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libbsd/libbsd-0.9.1.ebuild
b/dev-libs/libbsd/libbsd-0.9.1.ebuild
deleted file mode 100644
index 1356361..0000000
--- a/dev-libs/libbsd/libbsd-0.9.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="An library to provide useful functions commonly found on BSD
systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/";
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz";
-
-LICENSE="BSD BSD-2 BSD-4 ISC"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc x86"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-3.17"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${P}-missing-fcntl_h.patch" )
-
-pkg_setup() {
- local f="${EROOT}/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
-}
-
-multilib_src_configure() {
- # The build system will install libbsd-ctor.a despite of
USE="-static-libs"
- # which is correct, see:
- #
https://cgit.freedesktop.org/libbsd/commit/?id=c5b959028734ca2281250c85773d9b5e1d259bc8
- ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libbsd/metadata.xml b/dev-libs/libbsd/metadata.xml
deleted file mode 100644
index 0f6db56..0000000
--- a/dev-libs/libbsd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>[email protected]</email>
- <name>Gentoo Freedesktop Project</name>
- </maintainer>
-</pkgmetadata>
