gentoo resync : 15.12.2019

4 files changed, 2 insertions, 92 deletions

diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index c9258531a3d4..7f90c0b4fc87 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,6 +1,3 @@
-AUX libbsd-0.9.1-missing-header.patch 1165 BLAKE2B 03cd6fe04b969a3216300fa9b7d7072610047661e0b41e2dbd1ff2c471ce3c215ae31170ea0f15c775a2c68a000c3ecfa563f76ed854079609648f384615fd4a SHA512 d77b5b631aab66ce71d8170d899a0440e342be5be304719c7f576e6fa5756d432b4ec5a161582f281de00d9a2eb1aad6237e6be1c550284cdc7e30822b51bcb7
 DIST libbsd-0.10.0.tar.xz 393576 BLAKE2B 66005a511dae7fb799322c813b8ea058ab460e3b9044756d6efad5de741d8f70270496f09803bbce8cd0000ff37e998f18e092037c850826c3c8e3f47ddfdb28 SHA512 b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9
-DIST libbsd-0.9.1.tar.xz 387180 BLAKE2B 40dd82ca1088ee7aae8b3d7685e8514eec702bf7ada7ef98f7177cad92b7e0fccc22a953b35f0f27202eb56833b31a81bef1324d43864d1b80887ba7c58684d5 SHA512 435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c
-EBUILD libbsd-0.10.0.ebuild 1248 BLAKE2B 966ec0504283ad8e6a50e956c75f6125820e5c6c4b4e199dd24b0a84889ba9c52131d09464daf651b45dd0e48b82ffd1f5ef78aed9889e645f7e95a39105906e SHA512 ad524116200a19498374b424f0f34c86ee7e82b176d56b1ed0e5e6b91e98c3ce5f5d3c0d00bde1150df8315fb25f39040d37bd0413899b0aa2b29672b25bd636
-EBUILD libbsd-0.9.1.ebuild 1283 BLAKE2B 7ab75ea2173790f66c0910a9bf913a34b51be3d41fc3c4bcc5186053b8cfb9f3259e4bee24af6096b100ff5f6c8742e86676722be24aae1ea0503f0a07819c01 SHA512 2fe38faadbc7f8a14bd26f10cbd312f82343743b6b822a6e2dc3ec3e552abc1a988fb0addcd6a9e81ceca3184a2ac188872f4bf890a2e3d8fa20269f8f4af3b3
+EBUILD libbsd-0.10.0.ebuild 1237 BLAKE2B 77ff730477a4d7d6a0872a12332f385888070e4447fe80c581570afc714b6d4256a1f9a42dbbda5884847c3ae0321043bb94d6df5ec520f1fb856526f344f6e9 SHA512 e9de147aebf18196c966a6e676fbbcbf75e7b9b1a1071f30b254b77bdcfba9a06d5c04c14f20dbb2c17742dbc5ce392011e7810d9a393467c66b1fe59b8a1219
 MISC metadata.xml 362 BLAKE2B 5ffa8ebebcf0fd8d01f49f14b8f6a210a45a057669f88343e77a25907af8b4608f24898f7ad8b0367b1fa162de3ea7f6ae1692d7655ef899f72760d9b156cc1d SHA512 6bf19529af2e728fd1bb249f5f15875726ceeeb98f820c618aa8d8b9db8aebef20019e38486c5490e2808af57e4531f54201083514e6d3e20415ed08dd22e3bc
diff --git a/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch b/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch
deleted file mode 100644
index 7ca2b881a388..000000000000
--- a/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 13c32916b4baab58d93940d57fea9ff0777f1931 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Tue, 5 Jun 2018 19:21:46 +0300
-Subject: flopen: Add missing <fcntl.h> include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 993828d84ee (Add flopenat() function from FreeBSD) dropped the
-fcntl.h header. This breaks the build with musl libc:
-
-flopen.c: In function ‘vflopenat’:
-flopen.c:60:14: error: ‘O_CREAT’ undeclared (first use in this function)
-  if (flags & O_CREAT) {
-              ^~~~~~~
-
-Restore the fcntl.h header include to fix the build.
-
-Fixes: commit 993828d84eed0468c6c15b2818e534e6b134b8e4
-Submitted-also-by: parazyd <parazyd@dyne.org>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-Signed-off-by: Guillem Jover <guillem@hadrons.org>
----
- src/flopen.c | 1 +
- 1 file changed, 1 insertion(+)
-
-(limited to 'src/flopen.c')
-
-diff --git a/src/flopen.c b/src/flopen.c
-index b9972c9..ff20d07 100644
---- a/src/flopen.c
-+++ b/src/flopen.c
-@@ -32,6 +32,7 @@
- #include <sys/stat.h>
- 
- #include <errno.h>
-+#include <fcntl.h>
- #include <stdarg.h>
- #include <unistd.h>
- 
--- 
-cgit v1.1
-
diff --git a/dev-libs/libbsd/libbsd-0.10.0.ebuild b/dev-libs/libbsd/libbsd-0.10.0.ebuild
index 383f350fac24..b2f7f97646f2 100644
--- a/dev-libs/libbsd/libbsd-0.10.0.ebuild
+++ b/dev-libs/libbsd/libbsd-0.10.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="BSD BSD-2 BSD-4 ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=sys-kernel/linux-headers-3.17"
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 858d6676ad1f..000000000000
--- a/dev-libs/libbsd/libbsd-0.9.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 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/ https://gitlab.freedesktop.org/libbsd/libbsd"
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="BSD BSD-2 BSD-4 ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-3.17"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-missing-header.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://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" -name "*.la" -delete || die
-}