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

[Anthony G. Basile]

commit:     1bd0e06b172fc824cff65ea0663f2a4b39e3b35e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 11:35:02 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 11:35:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=1bd0e06b

dev-libs/libbsd: fix double hunk

 dev-libs/libbsd/Manifest                                |  4 ++--
 .../files/libbsd-0.8.2-replace__BEGIN_DECLS.patch       | 17 -----------------
 dev-libs/libbsd/libbsd-0.8.2-r99.ebuild                 |  2 +-
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index bd4bc79..559bea3 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,6 +1,6 @@
 AUX libbsd-0.8.2-fix-headers.patch 1525 SHA256 
3b23e44da0958b88eb6c6e510d8c2955380eb5d1029a8bbfd75d112aa411d96c SHA512 
9f536ea8a528947069415b9208f7b573152d155bbd6dc180babdb9ec885f81e5d6dea2a04e4e47865fd66d37a1242ac801add077be364f0c0fccedefefe8f798
 WHIRLPOOL 
778293a18d2219d752759815b2abd5566c2aea470956432f09d61efb12d79d3895b93402865bf882f9bdc1ed549c387eeed916207ba59af42d5a02a8d773f510
 AUX libbsd-0.8.2-remore-funopen.patch 1243 SHA256 
87271accf42ad6ea0f8d4c1a96ffc8bc6f55d0f73f0a6605738b270b35afd08b SHA512 
2c593fbbe7f164c1b0d197cbad18a1d6645165cbd34064aebaf2c8c930dbe2aafbb15a6b7240d26eaae84606fef3ec672d1cefbc65c6f4d7d6a39971306becc9
 WHIRLPOOL 
f35dd53c6c3a2f74b6e2ed9980e3f3795d29f2f5f5df0fae5c7d40df75d003e880263dc940ee1abdfa159c4d98fce1cbee7dcb57ebb6bb3b11227b7eb57494e9
-AUX libbsd-0.8.2-replace__BEGIN_DECLS.patch 10322 SHA256 
0cfde7e7e9d1176401a6b50f8c88563254ddda892d112060be842fa0fe642f0f SHA512 
76121459de632b176a53782f2635bc2182b800cf948435044bf8b2380a61b76f657e5fe7c095504851d762f98fe7b56fd52cdf71ea5406509fff0804ff8564a4
 WHIRLPOOL 
cc52c8c5a3e49e6ece7caae6bcc626b9d63c2330acf04ab13f516512b7d529519f9ab8aeead4567320ff3ebf637cb9d84d8bf51d6a2c52d7de8cb5cf7acdc324
+AUX libbsd-0.8.2-replace__BEGIN_DECLS.patch 9764 SHA256 
afbb8973809150cdcbe3482fb71c99621c16347b293e590d36a4104391397809 SHA512 
6afdad87ca30c624382223b1891b9073e5b65e791a85eeb9d1620e37106b4822bcf42a247184be3ead6576685cb74db23b2ce2c4965d272cb371a799eaf604f3
 WHIRLPOOL 
6ee85e38e9d7d40f2d650da250d99e99d82d340d768417cd0d0d6f6c77d85e49991d6903701bdb25fd83a9b161770177c2af218fe598f7b02665489181fec14e
 DIST libbsd-0.8.2.tar.xz 344292 SHA256 
b2f644cae94a6e2fe109449c20ad79a0f6ee4faec2205b07eefa0020565e250a SHA512 
2230d51a30a0c3a8518c7e325036d2b578c8c2b47525c2d0d5f530d28d82227ad48b50341e44521db21f99208fe7c0df7313254c90e3c92da1c8664a8cbb87c5
 WHIRLPOOL 
4f9b09aaa7c0775cd46bf0aaaba9e9a7f07040262739002bf3966aace3bb4d782f96b176e2c489e7d7cbc0840eecc463a414dee1b5c92414c9a821796d739290
-EBUILD libbsd-0.8.2-r99.ebuild 1269 SHA256 
02c536da398a7a9c9f901f6861a35c42408d2d84dbc08b23cb6c09e654b87342 SHA512 
2dce95648650532f984cbacd317db7147b640b8b9f25a8174e573ec09fb6ff7f1c5dccc4cd526e76b59ab64f703c64c0705248854ccc37ce37d321fcadfef827
 WHIRLPOOL 
8e91b23a7e23acd209659c3755c640d22573e9b2f135da7bf112c458e8d6b6eaa109e5c62f6d550cd9d8c9858b6a9e5f5cab7c074d2eb997aba031b824dcf5f6
+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/files/libbsd-0.8.2-replace__BEGIN_DECLS.patch 
b/dev-libs/libbsd/files/libbsd-0.8.2-replace__BEGIN_DECLS.patch
index 1512da8..38fcb45 100644
--- a/dev-libs/libbsd/files/libbsd-0.8.2-replace__BEGIN_DECLS.patch
+++ b/dev-libs/libbsd/files/libbsd-0.8.2-replace__BEGIN_DECLS.patch
@@ -219,23 +219,6 @@ diff -Naur 
/var/tmp/portage/dev-libs/libbsd-0.8.2/work/libbsd-0.8.2/include/bsd/
 +/* __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

diff --git a/dev-libs/libbsd/libbsd-0.8.2-r99.ebuild 
b/dev-libs/libbsd/libbsd-0.8.2-r99.ebuild
index 1bd7b5d..48e4677 100644
--- a/dev-libs/libbsd/libbsd-0.8.2-r99.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.2-r99.ebuild
@@ -27,7 +27,7 @@ pkg_setup() {
 
 src_prepare() {
        epatch "${FILESDIR}"/${P}-replace__BEGIN_DECLS.patch
-       #epatch "${FILESDIR}"/${P}-fix-headers.patch
+       epatch "${FILESDIR}"/${P}-fix-headers.patch
 
        /* This requires autoconf */
        epatch "${FILESDIR}"/${P}-remore-funopen.patch