gentoo resync : 11.07.2019

4 files changed, 18 insertions, 174 deletions

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 122b92732c41..8f24beb75708 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -8,14 +8,12 @@ AUX iproute2-5.1.0-portability.patch 1117 BLAKE2B 8e3a2f275ffb774a30165f46d85ad0
 DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
 DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
 DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8
-DIST iproute2-4.20.0.tar.xz 707016 BLAKE2B d62c6b995c4c1f79617e2f8149ff2ed297d741965e81bffebfa475514f5e96f0c9300e65d12bdd14ab492ce66675677eb41af6816876d5e1360218e4f32f4bc8 SHA512 ed29638c864062e199152c7b3b24b6495987ca6f79cc9ab1b529dab37a8a840fa2b5858d5db2b94eeefa1c0d72ff666a790107e27d11a597b189bfb7a01a4b8b
-DIST iproute2-5.0.0.tar.xz 710656 BLAKE2B 0adf7554c4d3d16821297158e025894efdb72834b93caa89521e200c70e287e7d1ebebd22dd91593483ed4e2f3274b370bbb786b9c249263c84b2345a1f5b358 SHA512 4b1649ccdfefbb5eace9d444843492db9d1357b9b3ee1567d6241283cde00ad3c9dbee6b8e507c4e9a5ca0a6378b71ca0c5fbf1e2ed2a9c7d479daf5d49eaed0
 DIST iproute2-5.1.0.tar.xz 722412 BLAKE2B 06330b636d661df5e2128a87bb63455bcbb5c8cda0faab96928e2068bb23b3bc3b2e5a0daa68d2d112e66fa58d7b3360791c7d5a0d679fc01cecb3ca9ad8ea4d SHA512 5c8319b040bd0ba98cf1225b2a77efafc662741344c53877ee38cf108ca01906b03328e4f9b00b7557e301c6e64bca4e42e92af477b4d657bcbff5120c0c4e87
+DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1
 EBUILD iproute2-4.14.1-r2.ebuild 4089 BLAKE2B 3359fdc7790d6594289a96597b54e92d74a81f39324f889664a7a105aaa068a07b175daff59c2d31e8e044f1f940ca3763253def15703b9b84fdf563fe5b2659 SHA512 0b6e6205f05dd1be2fb878a42868073592705f365d002a7c8ddf1ec5a983b22671da41b927a4823476860cb3a079c4868b2d7d5e80063563589f096981e33110
 EBUILD iproute2-4.17.0-r1.ebuild 4265 BLAKE2B 4901efc39bb2dfa1b6bb100dd0166b7e4009495c1269785127137dbd76a45d650af3467679e036465d929c592edd4b7f57a60f9ca42860e5152ae634b9752473 SHA512 ccad26410eb1b10be609a991a62123be23b5b1791833ca9203f3365d03acbb03a02086e060db6426845eb2c311b352082faeab594383556553853a61d99ba38c
-EBUILD iproute2-4.19.0-r1.ebuild 4278 BLAKE2B dd66602187e934c6624dca792e055ff00f335fd052f2d2846c8369db4a3fd4cdc7a7cab77a50d11305831dc70217297f059a1ca456a8626d612813f8812ac262 SHA512 e39cb5832b545fc6ebc58bad755f000e7e5969aff4eacc123ada7602c44282bb136462482bd56b89aad24d6c00de81d555d97a62eb4d8d00e1358c82b6bb3978
-EBUILD iproute2-4.20.0.ebuild 4314 BLAKE2B 628a1567d00b724e2596865f54b6aa01fb1731b37b0c3d25220a3fe55d58271734a78a03f70196d991010a0fb0c8b25105fee34123b53301f495376d7f2d8d27 SHA512 31e49b08b2db47d7ac675140d761abe469c4b679ae2c3a9dee54a16f4c1400ee09fc24d0380374e81e0db0f1778cfcbd4807be4bc9a39f7998aa7e312f2a4de0
-EBUILD iproute2-5.0.0.ebuild 4352 BLAKE2B e3dea0581dc026282b8222751c178051e9b58dbe70887d3b709608b19941294afc6c720d25cffa763b8293cf31924029f6fea99013745c14998e6d5d9431f715 SHA512 7d967eb53cc0a05fc7a341a0c62150c39fbe7cdf7780ddd10441365f0c7ede15c508242aa6c5da451758b71f8d64c9afc9250f667675e32c09f369e61ba9d75c
+EBUILD iproute2-4.19.0-r1.ebuild 4274 BLAKE2B 0c5f2803e8563f03c8e4af02842d07495a09605e5d2429bbe9e895e438d67a60646d8a053474e348d91136d2346132b62122ddfdf6a5a455ee4d52a9f6b293b7 SHA512 612bada13fc54dd915bcad15880602b01ce2b3743a006f3d340f1e63021e749243171293084ca781d484a4ce2aad5365617c6b8623ef434c328e4d02e0d61e6e
 EBUILD iproute2-5.1.0.ebuild 4317 BLAKE2B bb2e521f2186d87fd740d9ebdc5a1ca107eea739c00b606de308fa60ff183163aec782a3fdc1a3666642b43d36f8ec4836a7133fb4a4907cb3c8aed2f8f79193 SHA512 3109ff8309215f1801eeb49bb73b079f28d2ef73634188123a7e06169cc13154f0eeefcb88f8abcc3c56e3ed7482f362eab71fad4bfe1eb5e255244f83d55a1b
+EBUILD iproute2-5.2.0.ebuild 4317 BLAKE2B bb2e521f2186d87fd740d9ebdc5a1ca107eea739c00b606de308fa60ff183163aec782a3fdc1a3666642b43d36f8ec4836a7133fb4a4907cb3c8aed2f8f79193 SHA512 3109ff8309215f1801eeb49bb73b079f28d2ef73634188123a7e06169cc13154f0eeefcb88f8abcc3c56e3ed7482f362eab71fad4bfe1eb5e255244f83d55a1b
 EBUILD iproute2-9999.ebuild 4272 BLAKE2B 80001911770e432d9a603ba4626e544e9ae5b417ffa52a7033e178b0fb7d836e5c52f46220889e236f0dace23e5dffb1716e2e193ad3e02428584413ba75bb3f SHA512 9b44b8f9dd6ef6a8d2ee6db92ba359e2895710ce1a8491a2f7ac099504eb5f44e1f7cd4a813e39948632c48a713d83230fbdc3321ef0b7b3a52c7219e0668df9
 MISC metadata.xml 581 BLAKE2B b63c391d8d9ba608c12ea74f0cdf0d4d762d18e5b62ab1e2489f34140def1691bc295d8d252ab984b313b6fb037cd4d5a74d992db7ca670557bd8458501f8c04 SHA512 607dd3006049664a4c780a65b187fb938cbf7c5e79b445eb4a69c3115af8fe6718ea227a68cfcf4b42fd92c3e760579a92b49a58415d01ccb0715fdf9c052a97
diff --git a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
index bc6d40709395..6cbbcb63537d 100644
--- a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	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"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-4.20.0.ebuild b/sys-apps/iproute2/iproute2-4.20.0.ebuild
deleted file mode 100644
index be77ce0b659b..000000000000
--- a/sys-apps/iproute2/iproute2-4.20.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-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"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
-	!net-misc/arpd
-	dev-libs/libbsd
-	!minimal? ( net-libs/libmnl )
-	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	berkdb? ( sys-libs/db:= )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	iptables? ( virtual/pkgconfig )
-	>=sys-devel/bison-2.4
-	sys-devel/flex
-	>=sys-kernel/linux-headers-3.16
-	virtual/pkgconfig
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
-)
-
-src_prepare() {
-	if ! use ipv6 ; then
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e '/^CC :\?=/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'int main(){return 0;}' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	# run "configure" script first which will create "config.mk"...
-	econf
-
-	# ...now switch on/off requested features via USE flags
-	# this is only useful if the test did not set other things, per bug #643722
-	cat <<-EOF >> config.mk
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	TC_CONFIG_NO_XT := $(usex iptables n y)
-	# We've locked in recent enough kernel headers #549948
-	TC_CONFIG_IPSET := y
-	HAVE_BERKELEY_DB := $(usex berkdb y n)
-	HAVE_CAP      := $(usex caps y n)
-	HAVE_MNL      := $(usex minimal n y)
-	HAVE_ELF      := $(usex elf y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	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 \
-		install
-
-	dodir /bin
-	mv "${ED%/}"/{s,}bin/ip || die #330115
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# 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
-
-	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
-	fi
-}
diff --git a/sys-apps/iproute2/iproute2-5.0.0.ebuild b/sys-apps/iproute2/iproute2-5.2.0.ebuild
index f6ee223d9e1c..f2771e5b49e4 100644
--- a/sys-apps/iproute2/iproute2-5.0.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs flag-o-matic multilib
 
@@ -35,18 +35,19 @@ RDEPEND="
 # We require newer linux-headers for ipset support #549948 and some defines #553876
 DEPEND="
 	${RDEPEND}
+	>=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
 	app-arch/xz-utils
-	iptables? ( virtual/pkgconfig )
 	>=sys-devel/bison-2.4
 	sys-devel/flex
-	>=sys-kernel/linux-headers-3.16
 	virtual/pkgconfig
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )
 "
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
 	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
+	"${FILESDIR}"/${PN}-5.1.0-portability.patch
 )
 
 src_prepare() {
@@ -129,16 +130,16 @@ 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
 
 	dodir /bin
-	mv "${ED%/}"/{s,}bin/ip || die #330115
+	mv "${ED}"/{s,}bin/ip || die #330115
 
 	dolib.a lib/libnetlink.a
 	insinto /usr/include
@@ -146,12 +147,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
 		keepdir /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
 }