[gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/

[Aric Belsito]

commit:     91fcd69ba7627db9aff64e67799e46fec407df19
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Sep  6 16:08:54 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Sep  6 16:08:54 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=91fcd69b

sys-apps/iproute2: version bump to 4.13.0

 sys-apps/iproute2/Manifest                         |  4 +--
 ...route2-4.12.0.ebuild => iproute2-4.13.0.ebuild} | 36 +++++++++++++---------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 4313b95..c84b697 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -5,8 +5,8 @@ AUX iproute2-4.2.0-no-ipv6.patch 1336 SHA256 
b352b11d22e922038adb2b1ae083b6e47b8
 AUX iproute2-4.3.0-musl-noiptables.patch 1166 SHA256 
1910d28fe0aa89ba71cd30bb38b43119414102ce323dc47eee8bec290e5f52e7 SHA512 
f1b988c5ae5b5d159d1a2bedec678b8680b3358a6ea3a9d581b642cd706cfd1cb31c7cd590e1fe8969c3d3bebb2912fb5fa8011cfc39d2a17a4092617ae15766
 WHIRLPOOL 
87ee199c0f06b8c750412625e204b10261945954c07fade452ea2cf956405d7094d02357e1ed92f1aafcc9d34c7e7109cb10ee1aed31adf0e94989f2701bd877
 AUX iproute2-4.3.0-musl.patch 2989 SHA256 
bf10609ba7dcb04cb134745dd7af4c8c66d6b667400dd30abb3325ebdfd446fb SHA512 
8cf23bca01b111e2dfa26e944de151b35d6278833066276e603cd567f8084c16ee5b0dd527dd0626828f3099ae5907bdef4783672bfe23605f43ce9c3b4c2182
 WHIRLPOOL 
40d5bdb8dcd84e43a6798584aba35a11d1b5a79e54dcf80da0f465041330c5a76c2c4297fd78aa2a272181954407b404030bb9cca4dc74e4f7b36b5f98775cd7
 AUX iproute2-4.4.0-missing-limits_h.patch 385 SHA256 
dbbb3b18da78d6747e67ef922d7fcbceb48877776efa5a6ca25c6facdb3d6d22 SHA512 
a3c2c22c89323dedcfbe79a19fa5e211e8d66d84ada62937b091850e26d5976eedcc3c4ea0eea3372b19e3c15191ee9af696b3683d6f107d43b24a57e601a889
 WHIRLPOOL 
72be26a1f393ac5d7664c6b6a393efdfceb7d66720cafd2c6250e5480ac77033d0abfa0b616413d0f03d0c3cada22e5c7afa33e5ceb4910f41753d6ddf1fb74f
-DIST iproute2-4.12.0.tar.xz 662424 SHA256 
2e0a4c4262d9f6c169885a6e16c4c5c5f1ef6fd57b6a0e7b41f42be5bb6ebd7d SHA512 
275147f71e7c4698654f0d6d0981ab42f6f108066508c15cfcd5d9e0d3aaf8d33291968d9f06cb03f5494d801cfabf8d53308aaf56fc4fa92c52b137e970a3b0
 WHIRLPOOL 
590cc191e96ff0b777373603186e4416f064931d529878ec783759f31fd99e1119bb0604e8a89dc98d350f80eca2bfef05a13bca7ce24302408072002c0b17b2
+DIST iproute2-4.13.0.tar.xz 670340 SHA256 
9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50 SHA512 
f96d2839aec1f439bfac504c8e3881c063dacbf4c67b15f0e3da9882d2fa013cba33c23602de3eab624e0eecbb911a13967d60bddcdf097f47a580a5a77b5e3a
 WHIRLPOOL 
757247f1356eef49b299019f6d1809e5d781471665daedce885201b7034a6138def73c84ba2f0453f2f0f5d55cc2edf778992b3d79d06e01364c511373ea4644
 DIST iproute2-4.4.0.tar.xz 528552 SHA256 
bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512 
48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69
 WHIRLPOOL 
7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013
-EBUILD iproute2-4.12.0.ebuild 3968 SHA256 
e4469ecf058e8d1b1f37b7d3b6a43603771a2b0d00823c4f4cfeede3ea04ec16 SHA512 
4371fd9e5163c18ba45171aa6872e11ab05d6cd5c5d67fb4318eaa385d52fd8315dace35698bce25f4a376c98c25188ac80590c339cb756dbab2bd753e2a5157
 WHIRLPOOL 
fd6b4acf3f505a90d96b9710c6bd904c4dee1487fc79e1c4fe638a3262cd98a000f01519fb7f5b294029076347fd87045a0126b6686b98ba20f909c51c35fda1
+EBUILD iproute2-4.13.0.ebuild 4191 SHA256 
91f34dd029d1492c66f210edb8c1fea0b6b8a203379601a378dc7be14a526a79 SHA512 
8f5f74183153c6ea7d812d1efd8b053d0592eb8a0f9ab1d3eb6421fd62354ca6b43b599b6a3fe7a01b022c511865b3ec09e18f4ca23b790df51eae98ec723d5f
 WHIRLPOOL 
53d5e3f495248958cae0ac3939672ad2d406c4024d62927d92abb9beeaa3009c76346a7be044cd919d9a3a57f15b2f479b0d995d904e30a9fc03afbc307b982e
 EBUILD iproute2-4.4.0.ebuild 3970 SHA256 
8bacd413dcba29e38c745a676751d54cf22b59a625af45e440983a9442583484 SHA512 
98ab9c6418a2ff22625c9c86d02681262e2ec581bd974eeac062e55963f211c46ecff42f4275d53befe4d5f94da1280b7525c0e9158225fef3a3be9f23fe72e8
 WHIRLPOOL 
b5476358ab6dfebfd7a70a822f3998521d83e729df226dfa7007a58cb2788035a0f6ec2663f462e89b8e1f9b1fd6567c53356cf76bbefc768fecf72ec32995fa
 MISC metadata.xml 467 SHA256 
54932243a153c9130ca1862f0dce70ac6fff517e9b5c22f10e6d044ac3679e86 SHA512 
34c134b1a8ee152382b9fe9872df3d15d32ec3822ba215c8b21e948b8313e2e3d045468b873b7958681e92265d57ce25455e03f4d8e6be4e882943e54331cd7c
 WHIRLPOOL 
188528c73a6a8b90a0e69bab32d24a05e41c6695f559da91ead84be331769f47864ca6e88a7f1a31619da51e53b7fdd8a23735ff576098998eac6f1a9d24feb1

diff --git a/sys-apps/iproute2/iproute2-4.12.0.ebuild 
b/sys-apps/iproute2/iproute2-4.13.0.ebuild
similarity index 81%
rename from sys-apps/iproute2/iproute2-4.12.0.ebuild
rename to sys-apps/iproute2/iproute2-4.13.0.ebuild
index 0d9b891..53a6289 100644
--- a/sys-apps/iproute2/iproute2-4.12.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.13.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs flag-o-matic multilib
+inherit toolchain-funcs flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
        
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-       inherit git-2
+       inherit git-r3
 else
        SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86"
@@ -52,7 +52,15 @@ src_prepare() {
                )
        fi
 
-       epatch "${PATCHES[@]}"
+       # Local uclibc-ng compat fix until uclibc-ng upstream can sync
+       # netinet/in.h with glibc.  Resolves #626546.
+       if use elibc_uclibc ; then
+               PATCHES+=(
+                       
"${FILESDIR}"/${PN}-4.12.0-uclibc-ng-add-ipproto_mh.patch
+               )
+       fi
+
+       default
 
        sed -i \
                -e '/^CC :=/d' \
@@ -113,18 +121,18 @@ src_install() {
 
        emake \
                DESTDIR="${D}" \
-               LIBDIR="${EPREFIX}"/$(get_libdir) \
-               SBINDIR="${EPREFIX}"/sbin \
-               CONFDIR="${EPREFIX}"/etc/iproute2 \
-               DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-               MANDIR="${EPREFIX}"/usr/share/man \
-               ARPDDIR="${EPREFIX}"/var/lib/arpd \
+               LIBDIR="${EPREFIX%/}"/$(get_libdir) \
+               SBINDIR="${EPREFIX%/}"/sbin \
+               CONFDIR="${EPREFIX%/}"/etc/iproute2 \
+               DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
+               MANDIR="${EPREFIX%/}"/usr/share/man \
+               ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
                install
 
-       rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
+       rm "${ED%/}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
 
        dodir /bin
-       mv "${ED}"/{s,}bin/ip || die #330115
+       mv "${ED%/}"/{s,}bin/ip || die #330115
 
        dolib.a lib/libnetlink.a
        insinto /usr/include
@@ -132,12 +140,12 @@ src_install() {
        # This local header pulls in a lot of linux headers it
        # doesn't directly need.  Delete this header that requires
        # linux-headers-3.8 until that goes stable.  #467716
-       sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
+       sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
 
        if use berkdb ; then
                dodir /var/lib/arpd
                # bug 47482, arpd doesn't need to be in /sbin
                dodir /usr/bin
-               mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+               mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
        fi
 }