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

[Aric Belsito]

commit:     7d9cf5d0a435311766b219080c2f8750989ea7cc
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Jul 20 18:42:43 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Jul 20 18:42:43 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=7d9cf5d0

dev-libs/libbsd: version bump to 0.8.6

 dev-libs/libbsd/Manifest                           |  6 +--
 dev-libs/libbsd/files/libbsd-0.8.2-musl.patch      | 39 -------------------
 dev-libs/libbsd/libbsd-0.8.2.ebuild                | 45 ----------------------
 ...{libbsd-0.8.3-r2.ebuild => libbsd-0.8.6.ebuild} |  6 +--
 4 files changed, 3 insertions(+), 93 deletions(-)

diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index b96748d..d099446 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,12 +1,10 @@
-AUX libbsd-0.8.2-musl.patch 1160 SHA256 9960810bd2c2173ef56d3c40bd3c07b88d278fadbce6c533e83d5baffd673174 SHA512 1a5db0e4cb1a46b92d5415562246df66017b0daf3cf7d208c98a4da09e6277ae97ab7783310a410e8d93496a8698a6b279c7a2c48d74e433b494f938f0cd018f WHIRLPOOL 3dfdbb90333dad189335520cbdd698ce071d2a33e5e4a5289edd72d91155e5f75975ffac7f41699a4bd4ce0271f568b4568daa4a71334dc18d8d0e3dad89f7a6
 AUX libbsd-0.8.3-cdefs.patch 6102 SHA256 52c3453e878a7a4aad76977e40bafb82a59ddde217089fcfec9e92e54cdd7572 SHA512 924021930911012441414b077541b18ad68a283568dbc45bd27ab734e868cf1fefb59d8aa2f75bea7c8fe100169426c2c885d8da3e88456e946725897890e5e2 WHIRLPOOL 4ef017c98f6b30207e25bf677c37b7729208393beb9066ca3fd19057b65fd87fc4ed6aee031f578f3482ae536384690d1872f64a9357cafb9b336e43950d8c2e
 AUX libbsd-0.8.3-musl.patch 784 SHA256 9d8955d027719eb9d8209b9ebf3fc142b70d6185d32bb89d28a82b6143b3718e SHA512 7f8147a60c3d5dd62757045df67e13c7a09e9fbc1c96b457adf4efa77f6f3271be72d9f0fe1bfbccd0bc2eaf1502eed039030ef5ad53f2e30a7fa28b4e988d77 WHIRLPOOL 3c27788198ee7ede664ad9b095e15c83bdfe0f26b822a63dd79709837b92eb63929ac184449ec8fc72d71424c7c3fa9eb3371610e922248653b999010151bfe1
 AUX libbsd-0.8.5-cdef-headers.patch 5522 SHA256 6d16cb43913b3a2da21fb63b265a334a4fccc7c3053d62720c3e4a61d9bc8d9e SHA512 95a64bc751fd817a0c3b809d0a5bae696e4b80057a17288f8f6a99e99bd5414379ea0da7050c4dfa89204fadc28d7b0526eb1f4b913499eea03102e6c5117988 WHIRLPOOL 59646b45cb22f5162591fd94d77b84c6067a8a19e1edcc063ae6d717c6c82e0ac00f083f1daa4c5bda25831554c45d75e40f7e5ec7e73dad7cb3a2ebd4a480f7
-DIST libbsd-0.8.2.tar.xz 344292 SHA256 b2f644cae94a6e2fe109449c20ad79a0f6ee4faec2205b07eefa0020565e250a SHA512 2230d51a30a0c3a8518c7e325036d2b578c8c2b47525c2d0d5f530d28d82227ad48b50341e44521db21f99208fe7c0df7313254c90e3c92da1c8664a8cbb87c5 WHIRLPOOL 4f9b09aaa7c0775cd46bf0aaaba9e9a7f07040262739002bf3966aace3bb4d782f96b176e2c489e7d7cbc0840eecc463a414dee1b5c92414c9a821796d739290
 DIST libbsd-0.8.3.tar.xz 356772 SHA256 934b634f4dfd865b6482650b8f522c70ae65c463529de8be907b53c89c3a34a8 SHA512 155b895d6bd62b180718d65a2cda7484946c492d52735a57b51005705dfe4528b6a72e8745acea47b01fe68e3bbbe3c036c5e9998a8d06fc79efe2b96a04767f WHIRLPOOL ab74a85813ea3308e7e4c53b7a46f4b93e4dff4d091964a6347f9960729e8eb4c8a2a0866938de508caf47caf9371f14499fcb0cc4aa30da06f501f4ccad9ef2
 DIST libbsd-0.8.5.tar.xz 370680 SHA256 7647d024f41389305272c263da933a6f2a978213c1801592f47e68d83ac05b28 SHA512 bb122862ce8b789e530e9ca1a777d4219db2066ad89fe6028a833a5dc33ac0cd6b553ef5a0a42962d4a594c1f410304fd553b8fab583db539989ec7cca85baf0 WHIRLPOOL 6a621bf56ec6660cef7663dec62c0623d85931a56239f435e60bff7df8c4150ef378bff03801f67f798d0e640dc1dd061457a3b6df6a2f3f20a03b66fba14ebd
-EBUILD libbsd-0.8.2.ebuild 1235 SHA256 3bd39fb377334b96185a7b7022eab7e80a5b635ccaebf4a464a6dc020c2dddd6 SHA512 8101da8fb30a3fd3cbbbbb52c2a85c3537f743aba670b4917f2e6e7d29ef946ecabb8031f97b847752a6d48d58dacba0f4aeac1402a271f0b93a32ed05f60f4d WHIRLPOOL ac583480897e075e68d6a076a322792914896b7e00ae4a2e161b47cbe5a26642b4e84fc84ca69219d3d1c6069832bdb89101c65e29a28cdc08d36f0c203ca664
-EBUILD libbsd-0.8.3-r2.ebuild 1367 SHA256 88530ca86520693d45e2ba1f518c5a78ab30e01ea6305e6954e5def7294142f8 SHA512 b103da5c43a6c4ae5b8b9f4448d304fcb34265249af2ee986a6b3e52bb8e587b3aa9b4d5bdcd40871d6e09b703898fb0777748bff084622826743f9f671401c7 WHIRLPOOL 4244b6f7bb3ba49d7163f617bd8577ae2c4081f53420f19b991bfcbf40b33b48f108cb874882700d159fe605027595faddaff88ca07799cc156e5c5927bb06bb
+DIST libbsd-0.8.6.tar.xz 371112 SHA256 467fbf9df1f49af11f7f686691057c8c0a7613ae5a870577bef9155de39f9687 SHA512 ece01ced324f840c2cee6321c7dcf97ff123d55ea9f203c1ce35e1b46643dc7b34ef6dc6c8d128252b36848624850b40823411cc96b99a66a401eb1e9d8cea6b WHIRLPOOL e4f9b84fb9c0953fd1732725b481d04e69b03ceeb35ec708bd4ecf549e01c3787323d18d7d0058c293ea31e6d135e734c73345c5af1dabed36a9551bdf5e3dc5
 EBUILD libbsd-0.8.3.ebuild 1276 SHA256 e2d7c73ffaa1eae5bfee67693183100c346db5adb2841ac63ac30acd114ca104 SHA512 9051d6869bebaad74992aafc54d60551d3829ed9bd8ec59838fc2602138f40361ec92d56f818f7f537f0b90d56c5d4506c96f89d7689f29548d40896910da94a WHIRLPOOL 608370f87e1d265a6fddf65d53c4ca0217b34d5686daecf2bc6eafae35aaa11dad46850ece56567a2107d3818ada680c3c3682c98a86047d6678fb68d18ca725
 EBUILD libbsd-0.8.5.ebuild 1254 SHA256 26ff9dff994376506f36c10e6d2cbd1f6901646f31b1a8396a23aa653a5b3d98 SHA512 b6cb502885001b21c8319eb9d98c53ae42f10d9351689bfd180c47599b934b30128fd2ff6ed8e5434df2e654b4c76b6a9faa504996161cfa1f58646c5c00e4d0 WHIRLPOOL 56de60c7d349267658dd25834842c2e03724ae0c2f8abe95a6ca7dc2e1203feccf265d4eb9ccd06911c074dd3595a68a9edb874d7fb780d58a6d6a2c75212431
+EBUILD libbsd-0.8.6.ebuild 1261 SHA256 6b873903f426032b654c47e966fdc3c0225b7bdc596d7fe0bed20d00229f5a4c SHA512 431e8f54123b6f0f9eb45c07ecfb6dd6e1d367ebf9f85c6e0f7cce8cbb29fe033551b11094b89ff5a556f990953d95b421b45440ba00346145cd313e50642929 WHIRLPOOL 021bd84c702b43979aaab88d926c1db8ecc57e53b0f8a720e11bc34dbd9dcf8a256c2e040cf340cc6fd96742cf26bdcb10de39ad12c753e5c4efbb9e7f0c8102
 MISC metadata.xml 276 SHA256 6bb81cdb026b199d78fb2a2327320a915a3bd241a9300bb069bd9c998521f613 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59 WHIRLPOOL d494386e01171fe51879cf968a6cebca04c22477f3b8a52bfdd17b9ee06afd99c3979396f7abf40bee698d6fbb060e2f37e083cb3ed010c018d84211a2bc7cd0

diff --git a/dev-libs/libbsd/files/libbsd-0.8.2-musl.patch b/dev-libs/libbsd/files/libbsd-0.8.2-musl.patch
deleted file mode 100644
index bc1f1e7..0000000
--- a/dev-libs/libbsd/files/libbsd-0.8.2-musl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur libbsd-0.8.2.orig/src/flopen.c libbsd-0.8.2/src/flopen.c
---- libbsd-0.8.2.orig/src/flopen.c	2011-07-05 09:56:44.000000000 -0700
-+++ libbsd-0.8.2/src/flopen.c	2016-02-06 17:45:19.491982943 -0800
-@@ -32,6 +32,7 @@
- #include <sys/stat.h>
- 
- #include <errno.h>
-+#include <fcntl.h>
- #include <stdarg.h>
- #include <unistd.h>
- #include <libutil.h>
-diff -Naur libbsd-0.8.2.orig/src/funopen.c libbsd-0.8.2/src/funopen.c
---- libbsd-0.8.2.orig/src/funopen.c	2015-09-22 10:56:09.000000000 -0700
-+++ libbsd-0.8.2/src/funopen.c	2016-02-06 17:45:38.954982595 -0800
-@@ -137,6 +137,4 @@
- 
- 	return fopencookie(cookiewrap, mode, funcswrap);
- }
--#else
--#error "Function funopen() needs to be ported."
- #endif
-diff -Naur libbsd-0.8.2.orig/src/nlist.c libbsd-0.8.2/src/nlist.c
---- libbsd-0.8.2.orig/src/nlist.c	2015-09-22 22:59:34.000000000 -0700
-+++ libbsd-0.8.2/src/nlist.c	2016-02-06 17:46:01.065982199 -0800
-@@ -39,11 +39,13 @@
- #include <arpa/inet.h>
- 
- #include <errno.h>
--#include <a.out.h>
-+#include <fcntl.h>
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
- 
-+#include "nlist.h"
-+
- #if !defined(__NO_A_OUT_SUPPORT)
- #define _NLIST_DO_AOUT
- #endif

diff --git a/dev-libs/libbsd/libbsd-0.8.2.ebuild b/dev-libs/libbsd/libbsd-0.8.2.ebuild
deleted file mode 100644
index 4204854..0000000
--- a/dev-libs/libbsd/libbsd-0.8.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils 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="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-3.17"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8.3-cdefs.patch
-	epatch "${FILESDIR}"/${P}-musl.patch
-}
-
-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
-}
-
-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
-	prune_libtool_files
-}

diff --git a/dev-libs/libbsd/libbsd-0.8.3-r2.ebuild b/dev-libs/libbsd/libbsd-0.8.6.ebuild
similarity index 88%
rename from dev-libs/libbsd/libbsd-0.8.3-r2.ebuild
rename to dev-libs/libbsd/libbsd-0.8.6.ebuild
index 9c34599..f9cfbc6 100644
--- a/dev-libs/libbsd/libbsd-0.8.3-r2.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.6.ebuild
@@ -17,9 +17,7 @@ DEPEND=">=sys-kernel/linux-headers-3.17"
 RDEPEND=""
 
 src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8.3-musl.patch
-	eapply "${FILESDIR}"/${PN}-0.8.3-cdefs.patch
-
+	eapply "${FILESDIR}"/${PN}-0.8.5-cdef-headers.patch
 	default
 }
 
@@ -44,6 +42,4 @@ multilib_src_configure() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 	find "${ED}" -name "*.la" -delete || die
-
-	rm "${ED%/}"/usr/share/man/man3/explicit_bzero.3 || die # 617462
 }