gentoo resync : 20.12.2017

5 files changed, 4 insertions, 228 deletions

diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 08100956672f..a023028ebf7c 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -4,13 +4,9 @@ AUX libnl-1.1.3-offsetof.patch 320 BLAKE2B 5edb7d935321ae40784d16fdf289470deee86
 DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4
 DIST libnl-3.2.28-in6.patch.xz 6368 BLAKE2B cafea9217a9aaee7a8d1a33598279a717cd96e08f326d003ebb833d501a4c9e3be3546fc4570aad137c579e88d82d3e2501546875d260fb4c2ec6c69544d2edd SHA512 de14f7540e514871db2058236a339192443423e56f2f5bd52e02ff06873c9e411029b12f3119e57eb01201ce3643ce78ca3e8d9ada4f6ba318df96288304bead
 DIST libnl-3.2.28.tar.gz 941954 BLAKE2B c36817832f36ef2f3e32af8703024c92c874a85f898fc02673c6f3ee983757ffa8c7c3340942dd47880d94da7d907f4a867a99fa252628d816705dd4318a85a0 SHA512 b5f145ecafb2625ed1c42594afd6063f112a601077de5c35884b3c3bc8c562b29b52a006ccebd795c127fe69692a82def425c8605afed7e6d441582943e803d9
-DIST libnl-3.2.29.tar.gz 963681 BLAKE2B 031f10fd655637f1b41f7fa951c34ad0c53d7175ebdb027dcad234acca637ed2b6f763a0490a8be37eb31407b20a7ae11eb646ac4a37b2ea66e7730492febba2 SHA512 45e22b02368c479e01db7160345a0d3c73abf345e7b49bf350811243a17f307f5c6c3df639ec1e0c456707578aca8d69aad8afa697ac21449f521a3e39712670
-DIST libnl-3.3.0.tar.gz 933390 BLAKE2B d97e9658dd6fbe90cd6608a578d9fadeb02ff24e64d92c203ed9280902f17b382a8e080f92707696f4115225dec916945428ff7d72bc2fdcbee6df47004aa7ff SHA512 3fc5d95b875605ab6378d2d454020c1276a6772205fa11bbd22eba9fd9ef1deb8c75347e5d4602f0ab7bf13bd66b418f5ef73ed05f18134f08638ce06eef622c
 DIST libnl-3.4.0.tar.gz 933443 BLAKE2B 735da9f800277c48a5deceb78084f510f56f7017b1184e91b2bb45ba61a2e95355e7a3f5d0a74bdaf7ae003393a6c7556d5b201d0d0052dfc66042aa9e137986 SHA512 6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e
 EBUILD libnl-1.1.4.ebuild 1141 BLAKE2B 16521e18a8b986a96540245ed54c5737c1ba8d17d3a492fe34b2e504216ba21186d1eaf4685716894f826186a87dd3b4ad82c87d9a4e439cd984fdf0472b4828 SHA512 1c63d4eabb1268b349918acbdc3cbc7d2fabc09a75e4b07793f1e380309404f460bfc3b90c7426377d57be65f5b679a5d20155003ab589497b225dea2f9c281a
 EBUILD libnl-3.2.28.ebuild 2616 BLAKE2B 94fb42c36071b2d42c0626dd6a23b52221534507bbd46407f0cbeb64ebe2f572f5ca34f3c5c8c8ed5b88802408f21dce3d55b73d1876c5a74d3a7543a5634ea3 SHA512 ec622b8862df56d20e79cd5a979fbc0a33c88f4bf97aad49f61864570df9fec448c1cfa7d1f462535ce3dc06ebec59a939b35ab4a2155b6be6e27e7467dcbb8e
-EBUILD libnl-3.2.29.ebuild 2626 BLAKE2B 28ba864e619bf751509f7f12b121486715aea49b0cba7df358606c11b7badc49b0cbfb4ee3edb67fc90826268caaa710b2e2cf916e3bd2a729cf8e7cb1ec2b45 SHA512 dd09123c9847bbb5772a48afc17927b70b3c8ea5688492f4532b5f307482516f165eb4b4fbbea75d36836cfbb4086b4180193e3dfc58fc138a7744175e836d68
-EBUILD libnl-3.3.0.ebuild 2476 BLAKE2B 81ef9e2df6284a612b3ec2cddf5ed0e952c1cf557c8645933966f7d7047462ed83636306ba56aa115cb2a95aaa430f20b2a436439b354b264055382aadd95ef3 SHA512 5c7e28b62ba07fd4e09c163a9dbf73f49d2da550c49b3ed067fe6e61bf6e69a7bdf2dc7e64e8004482fd25ec4283989b6da248abc959d17702e9d8ea2f5da99d
-EBUILD libnl-3.4.0.ebuild 2476 BLAKE2B 81ef9e2df6284a612b3ec2cddf5ed0e952c1cf557c8645933966f7d7047462ed83636306ba56aa115cb2a95aaa430f20b2a436439b354b264055382aadd95ef3 SHA512 5c7e28b62ba07fd4e09c163a9dbf73f49d2da550c49b3ed067fe6e61bf6e69a7bdf2dc7e64e8004482fd25ec4283989b6da248abc959d17702e9d8ea2f5da99d
-EBUILD libnl-99999999.ebuild 2258 BLAKE2B 032dc13532cde04fc0dc24f6e7b203378f1bc95e060c598f3852bc1d6ac1c930ad0ee6915e683b6f1cc25dba0ef39f8ffa12bc014b9e2adb413b10739740e98e SHA512 4dad53165011effbd92f359ac24d7f135e14c73059956d167fdacfdd47dbf8c86e1a2f6fa1ca69144d1e281230410c7e6e77c10740295a04787d1830c6d5c69f
+EBUILD libnl-3.4.0.ebuild 2478 BLAKE2B 67fb03c62b224eb4225e1c1a30aeea066d4574b8e20fce242742512bcdb5a521246fb1e0a033061a05c664fc523c4b2246531b20b7ab2bd19430c107ed2e7b0d SHA512 a0d9e4dded31b64c1e92a056ba3cf86a1da568843824a08cace342801c94b0b603422f500f183abb7ce35d3fee94fffef91fc003c210c1bb78d35d37dd573c27
+EBUILD libnl-99999999.ebuild 2260 BLAKE2B 5cb52f23d72b456998d03dee05f814665ff38d38ddfd881953bb48b7c2374b05298eb4eba5fe063e85a21e9b0577fce7319088d7f267bf09211047110a9bd1d0 SHA512 09fb2d9f09ba5db84b1bb1ea15586c75586880b2cd740857ccecb2342d6f87eb7cf63e90140e18cf9f86599a622e5a30d9fe4e90efb39c083ec6f7989720ca5c
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-3.2.29.ebuild b/dev-libs/libnl/libnl-3.2.29.ebuild
deleted file mode 100644
index 55886ce41b3e..000000000000
--- a/dev-libs/libnl/libnl-3.2.29.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-DISTUTILS_OPTIONAL=1
-inherit distutils-r1 eutils libtool multilib multilib-minimal
-
-LIBNL_P=${P/_/-}
-LIBNL_DIR=${PV/_/}
-LIBNL_DIR=${LIBNL_DIR//./_}
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
-SRC_URI="
-	https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz
-	https://dev.gentoo.org/~jer/libnl-3.2.28-in6.patch.xz
-"
-LICENSE="LGPL-2.1 utils? ( GPL-2 )"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs python utils"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-	sys-devel/bison
-	sys-devel/flex
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-DOCS=(
-	ChangeLog
-)
-
-S=${WORKDIR}/${LIBNL_P}
-
-MULTILIB_WRAPPED_HEADERS=(
-	# we do not install CLI stuff for non-native
-	/usr/include/libnl3/netlink/cli/addr.h
-	/usr/include/libnl3/netlink/cli/class.h
-	/usr/include/libnl3/netlink/cli/cls.h
-	/usr/include/libnl3/netlink/cli/ct.h
-	/usr/include/libnl3/netlink/cli/exp.h
-	/usr/include/libnl3/netlink/cli/link.h
-	/usr/include/libnl3/netlink/cli/neigh.h
-	/usr/include/libnl3/netlink/cli/qdisc.h
-	/usr/include/libnl3/netlink/cli/route.h
-	/usr/include/libnl3/netlink/cli/rule.h
-	/usr/include/libnl3/netlink/cli/tc.h
-	/usr/include/libnl3/netlink/cli/utils.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${WORKDIR}"/${PN}-3.2.28-in6.patch
-)
-
-src_prepare() {
-	default
-
-	elibtoolize
-
-	if use python; then
-		cd "${S}"/python || die
-		distutils-r1_src_prepare
-	fi
-
-	# out-of-source build broken
-	# https://github.com/thom311/libnl/pull/58
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		--disable-silent-rules \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable utils cli)
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		# Unset DOCS= since distutils-r1.eclass interferes
-		local DOCS=()
-		cd python || die
-		distutils-r1_src_install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/dev-libs/libnl/libnl-3.3.0.ebuild b/dev-libs/libnl/libnl-3.3.0.ebuild
deleted file mode 100644
index 64aedbef471b..000000000000
--- a/dev-libs/libnl/libnl-3.3.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-DISTUTILS_OPTIONAL=1
-inherit distutils-r1 eutils libtool multilib multilib-minimal
-
-LIBNL_P=${P/_/-}
-LIBNL_DIR=${PV/_/}
-LIBNL_DIR=${LIBNL_DIR//./_}
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
-SRC_URI="
-	https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz
-"
-LICENSE="LGPL-2.1 utils? ( GPL-2 )"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs python utils"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-	sys-devel/bison
-	sys-devel/flex
-"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-DOCS=(
-	ChangeLog
-)
-
-S=${WORKDIR}/${LIBNL_P}
-
-MULTILIB_WRAPPED_HEADERS=(
-	# we do not install CLI stuff for non-native
-	/usr/include/libnl3/netlink/cli/addr.h
-	/usr/include/libnl3/netlink/cli/class.h
-	/usr/include/libnl3/netlink/cli/cls.h
-	/usr/include/libnl3/netlink/cli/ct.h
-	/usr/include/libnl3/netlink/cli/exp.h
-	/usr/include/libnl3/netlink/cli/link.h
-	/usr/include/libnl3/netlink/cli/neigh.h
-	/usr/include/libnl3/netlink/cli/qdisc.h
-	/usr/include/libnl3/netlink/cli/route.h
-	/usr/include/libnl3/netlink/cli/rule.h
-	/usr/include/libnl3/netlink/cli/tc.h
-	/usr/include/libnl3/netlink/cli/utils.h
-)
-
-src_prepare() {
-	default
-
-	elibtoolize
-
-	if use python; then
-		cd "${S}"/python || die
-		distutils-r1_src_prepare
-	fi
-
-	# out-of-source build broken
-	# https://github.com/thom311/libnl/pull/58
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		--disable-silent-rules \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable utils cli)
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		# Unset DOCS= since distutils-r1.eclass interferes
-		local DOCS=()
-		cd python || die
-		distutils-r1_src_install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/dev-libs/libnl/libnl-3.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild
index 64aedbef471b..ccd0aac9e390 100644
--- a/dev-libs/libnl/libnl-3.4.0.ebuild
+++ b/dev-libs/libnl/libnl-3.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 DISTUTILS_OPTIONAL=1
 inherit distutils-r1 eutils libtool multilib multilib-minimal
 
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index f65e3012a6a4..ebe525ac9df0 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 DISTUTILS_OPTIONAL=1
 inherit autotools distutils-r1 eutils git-r3 libtool multilib multilib-minimal