| 1 |
commit: 092ce9df92fe7fe921298b8a9d67212df36e6eec |
| 2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
| 3 |
AuthorDate: Sat Oct 27 17:00:03 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 29 11:38:04 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=092ce9df |
| 7 |
|
| 8 |
sys-apps/iproute2: remove old |
| 9 |
|
| 10 |
sys-apps/iproute2/Manifest | 1 - |
| 11 |
sys-apps/iproute2/iproute2-4.15.0.ebuild | 152 ------------------------------- |
| 12 |
2 files changed, 153 deletions(-) |
| 13 |
|
| 14 |
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest |
| 15 |
index 74ab904..8df37a8 100644 |
| 16 |
--- a/sys-apps/iproute2/Manifest |
| 17 |
+++ b/sys-apps/iproute2/Manifest |
| 18 |
@@ -1,4 +1,3 @@ |
| 19 |
DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c |
| 20 |
-DIST iproute2-4.15.0.tar.xz 648836 BLAKE2B e7f3a027ec88de7c6ac82c5529b37fdf22311bc9290e71662bc3b1e32d4cb6a1845e2badb961a21b50b5ed1b9d23130e512a011767183f7df1b33eb05101044b SHA512 bcc54b8dc83d7b0e759a2de77eb38fed483d7f7f82698f482e0259000f2f55ba79c556b721730eb999e85c865ad136fd7549304ebe936545e02e848ba7f698bc |
| 21 |
DIST iproute2-4.16.0.tar.xz 661336 BLAKE2B 4efb08c88a60b1bbbeef807c0731e610032bfb11d022562c1df052d324eb43cb25b9523f49730d22a3f92eb06bd5037c70d8ed0b58276a0cf0854a0f82800b64 SHA512 a8fbc92665a8d4ca6ee1e894bfb27373cf6b16dac9e2ab3831e418fcc9b895acc7d6fc64efa0b0e37b3affd4ef8eacf4dae5715536138d6a05c65ad49a2becad |
| 22 |
DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5 |
| 23 |
|
| 24 |
diff --git a/sys-apps/iproute2/iproute2-4.15.0.ebuild b/sys-apps/iproute2/iproute2-4.15.0.ebuild |
| 25 |
deleted file mode 100644 |
| 26 |
index 89b5e4d..0000000 |
| 27 |
--- a/sys-apps/iproute2/iproute2-4.15.0.ebuild |
| 28 |
+++ /dev/null |
| 29 |
@@ -1,152 +0,0 @@ |
| 30 |
-# Copyright 1999-2018 Gentoo Foundation |
| 31 |
-# Distributed under the terms of the GNU General Public License v2 |
| 32 |
- |
| 33 |
-EAPI=6 |
| 34 |
- |
| 35 |
-inherit toolchain-funcs flag-o-matic multilib |
| 36 |
- |
| 37 |
-if [[ ${PV} == "9999" ]] ; then |
| 38 |
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
| 39 |
- inherit git-r3 |
| 40 |
-else |
| 41 |
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" |
| 42 |
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86" |
| 43 |
-fi |
| 44 |
- |
| 45 |
-DESCRIPTION="kernel routing and traffic control utilities" |
| 46 |
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" |
| 47 |
- |
| 48 |
-LICENSE="GPL-2" |
| 49 |
-SLOT="0" |
| 50 |
-IUSE="atm berkdb elf +iptables ipv6 minimal selinux" |
| 51 |
- |
| 52 |
-# We could make libmnl optional, but it's tiny, so eh |
| 53 |
-RDEPEND=" |
| 54 |
- !net-misc/arpd |
| 55 |
- !minimal? ( net-libs/libmnl ) |
| 56 |
- elf? ( virtual/libelf ) |
| 57 |
- iptables? ( >=net-firewall/iptables-1.4.20:= ) |
| 58 |
- berkdb? ( sys-libs/db:= ) |
| 59 |
- atm? ( net-dialup/linux-atm ) |
| 60 |
- selinux? ( sys-libs/libselinux ) |
| 61 |
-" |
| 62 |
-# We require newer linux-headers for ipset support #549948 and some defines #553876 |
| 63 |
-DEPEND=" |
| 64 |
- ${RDEPEND} |
| 65 |
- app-arch/xz-utils |
| 66 |
- iptables? ( virtual/pkgconfig ) |
| 67 |
- >=sys-devel/bison-2.4 |
| 68 |
- sys-devel/flex |
| 69 |
- >=sys-kernel/linux-headers-3.16 |
| 70 |
- elibc_glibc? ( >=sys-libs/glibc-2.7 ) |
| 71 |
-" |
| 72 |
- |
| 73 |
-PATCHES=( |
| 74 |
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
| 75 |
- "${FILESDIR}"/${PN}-4.14.1-configure-nomagic.patch # bug 643722 |
| 76 |
- "${FILESDIR}"/${PN}-4.15.0-musl.patch |
| 77 |
-) |
| 78 |
- |
| 79 |
-src_prepare() { |
| 80 |
- if ! use ipv6 ; then |
| 81 |
- PATCHES+=( |
| 82 |
- "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 |
| 83 |
- ) |
| 84 |
- fi |
| 85 |
- |
| 86 |
- default |
| 87 |
- |
| 88 |
- sed -i \ |
| 89 |
- -e '/^CC :\?=/d' \ |
| 90 |
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
| 91 |
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ |
| 92 |
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
| 93 |
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ |
| 94 |
- Makefile || die |
| 95 |
- |
| 96 |
- # Use /run instead of /var/run. |
| 97 |
- sed -i \ |
| 98 |
- -e 's:/var/run:/run:g' \ |
| 99 |
- include/namespace.h \ |
| 100 |
- man/man8/ip-netns.8 || die |
| 101 |
- |
| 102 |
- # build against system headers |
| 103 |
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
| 104 |
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
| 105 |
- |
| 106 |
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile |
| 107 |
-} |
| 108 |
- |
| 109 |
-src_configure() { |
| 110 |
- tc-export AR CC PKG_CONFIG |
| 111 |
- |
| 112 |
- # This sure is ugly. Should probably move into toolchain-funcs at some point. |
| 113 |
- local setns |
| 114 |
- pushd "${T}" >/dev/null |
| 115 |
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c |
| 116 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n |
| 117 |
- echo 'int main(){return 0;}' > test.c |
| 118 |
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
| 119 |
- popd >/dev/null |
| 120 |
- |
| 121 |
- # run "configure" script first which will create "config.mk"... |
| 122 |
- econf |
| 123 |
- |
| 124 |
- # ...now switch on/off requested features via USE flags |
| 125 |
- # this is only useful if the test did not set other things, per bug #643722 |
| 126 |
- cat <<-EOF >> config.mk |
| 127 |
- TC_CONFIG_ATM := $(usex atm y n) |
| 128 |
- TC_CONFIG_XT := $(usex iptables y n) |
| 129 |
- TC_CONFIG_NO_XT := $(usex iptables n y) |
| 130 |
- # We've locked in recent enough kernel headers #549948 |
| 131 |
- TC_CONFIG_IPSET := y |
| 132 |
- HAVE_BERKELEY_DB := $(usex berkdb y n) |
| 133 |
- HAVE_MNL := $(usex minimal n y) |
| 134 |
- HAVE_ELF := $(usex elf y n) |
| 135 |
- HAVE_SELINUX := $(usex selinux y n) |
| 136 |
- IP_CONFIG_SETNS := ${setns} |
| 137 |
- # Use correct iptables dir, #144265 #293709 |
| 138 |
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
| 139 |
- EOF |
| 140 |
-} |
| 141 |
- |
| 142 |
-src_compile() { |
| 143 |
- emake V=1 |
| 144 |
-} |
| 145 |
- |
| 146 |
-src_install() { |
| 147 |
- if use minimal ; then |
| 148 |
- into / |
| 149 |
- dosbin tc/tc |
| 150 |
- dobin ip/ip |
| 151 |
- return 0 |
| 152 |
- fi |
| 153 |
- |
| 154 |
- emake \ |
| 155 |
- DESTDIR="${D}" \ |
| 156 |
- LIBDIR="${EPREFIX%/}"/$(get_libdir) \ |
| 157 |
- SBINDIR="${EPREFIX%/}"/sbin \ |
| 158 |
- CONFDIR="${EPREFIX%/}"/etc/iproute2 \ |
| 159 |
- DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ |
| 160 |
- MANDIR="${EPREFIX%/}"/usr/share/man \ |
| 161 |
- ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ |
| 162 |
- install |
| 163 |
- |
| 164 |
- dodir /bin |
| 165 |
- mv "${ED%/}"/{s,}bin/ip || die #330115 |
| 166 |
- |
| 167 |
- dolib.a lib/libnetlink.a |
| 168 |
- insinto /usr/include |
| 169 |
- doins include/libnetlink.h |
| 170 |
- # This local header pulls in a lot of linux headers it |
| 171 |
- # doesn't directly need. Delete this header that requires |
| 172 |
- # linux-headers-3.8 until that goes stable. #467716 |
| 173 |
- sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die |
| 174 |
- |
| 175 |
- if use berkdb ; then |
| 176 |
- dodir /var/lib/arpd |
| 177 |
- # bug 47482, arpd doesn't need to be in /sbin |
| 178 |
- dodir /usr/bin |
| 179 |
- mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die |
| 180 |
- fi |
| 181 |
-} |
Archives