gentoo resync : 21.07.2018

3 files changed, 58 insertions, 113 deletions

diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 3846e2069cd4..4bd3234e61f1 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -2,11 +2,9 @@ AUX libnl-1.1-flags.patch 441 BLAKE2B b07df1490a4485468aadbe7dc3aa025fa2514c3611
 AUX libnl-1.1-vlan-header.patch 2378 BLAKE2B c6d72cb5c7437bc6600e2c34eb6f17fd22df4338c37cee53f0112d3824bf2e940c9166f233fe32df3d451ea37fee2c08db27db7f46d7522f5d04169abdecd28c SHA512 ea45d780b16e6045735aaf2e3febf19ddccab4ca0e03710aebfe51655adc50177aefa3bd4d06e0ccce0160f4c6db73cfa4eb7cebe53b3e15c1807c3b00dc1c9c
 AUX libnl-1.1.3-offsetof.patch 320 BLAKE2B 5edb7d935321ae40784d16fdf289470deee86921f2372d200468206ab06cb391a3fce01998d7e4924fd6d235e9292bbbd6134dbc87aa3ebc3dafd16610b4a2a1 SHA512 fe625a9ac6ea8776c8f7ef3d7e3553651c0244e830883587bd7e86490e0ec6e8b29865e172a0e39947e213b910a4279202eabfdd5d7f08e835f5be91d4ff9d6b
 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.4.0.tar.gz 933443 BLAKE2B 735da9f800277c48a5deceb78084f510f56f7017b1184e91b2bb45ba61a2e95355e7a3f5d0a74bdaf7ae003393a6c7556d5b201d0d0052dfc66042aa9e137986 SHA512 6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e
+EBUILD libnl-1.1.4-r1.ebuild 1165 BLAKE2B c53d5fc1b86e016bf89cf590a9bb8f65f9abc45d4a994d9f405a63d35415234dd8501c7bbd948ba10074e2c5e48e08426a1484fdebc95ef82c345e2539edd6f7 SHA512 2c28a5244287710b2b69aabcd210cb09304ba487e2fb35872243adf59c46af6281606b18c0a3a6de3544b04ed952640a7452c2b9681b14b5deae33374e8b0601
 EBUILD libnl-1.1.4.ebuild 1141 BLAKE2B 16521e18a8b986a96540245ed54c5737c1ba8d17d3a492fe34b2e504216ba21186d1eaf4685716894f826186a87dd3b4ad82c87d9a4e439cd984fdf0472b4828 SHA512 1c63d4eabb1268b349918acbdc3cbc7d2fabc09a75e4b07793f1e380309404f460bfc3b90c7426377d57be65f5b679a5d20155003ab589497b225dea2f9c281a
-EBUILD libnl-3.2.28.ebuild 2486 BLAKE2B 2f99ac310c3777c72d36d7eb2ee3ca8d165fcef9385e67385297f384606bdc69675d23e85fb9b4cdadf0dca25639e51d677ce266005a0e9a405f9e069c61e789 SHA512 e6fc4f0076da3a41c6ec89cd52619f42ca5e966f2080e2150b5697612a4edad5c5f47fa34bb3188611fec7f04574db57cbbb1fd94ac3ca992771bd8f8086c30f
 EBUILD libnl-3.4.0.ebuild 2403 BLAKE2B a387a668f1a038addbef80b494d242963ea748e01bf8a3b4c63f605d68c0a1a74d2a54117e8bca8419461a105d8a5851e79c422c57091861987a11ed6e3cddb8 SHA512 c3c0d850a5a0a950222f89efa0d7fe8ca95b130a3d7f97aff6a4f4eae3987aa5af6f5d92ddb21496412975058fae099b3b60de3e7cd814bfcaad96c6b722b6a7
 EBUILD libnl-99999999.ebuild 2196 BLAKE2B aeff1715ffd0c59e7524386f82283e1c41d0aa39548e2f4ebdcfed77624ed64ae975a74bf1796644411c846c32c275b3465f89878cdffe4fa757d54f184136b1 SHA512 65b184e96b140b5e95dc1623175c5b042d8fade476fde6a8f58e462d31e6db4d1fda6d998097f75c6acae0f6ab65fbbce6502a0737e8c051d2358885e5ef54e6
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..2b9928fc0566
--- /dev/null
+++ b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
+HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
+SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )"
+DOCS=( ChangeLog )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
+	"${FILESDIR}"/${PN}-1.1-flags.patch
+	"${FILESDIR}"/${PN}-1.1.3-offsetof.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/@echo/d' \
+		Makefile.rules {lib,src,tests}/Makefile || die
+	sed -i \
+		-e 's|-g ||g' \
+		Makefile.opts.in || die
+
+	if ! use static-libs; then
+		sed -i lib/Makefile -e '/OUT_AR/d' || die
+	fi
+
+	rm -f lib/libnl.a
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+
+	if use doc ; then
+		cd "${S}/doc"
+		emake gendoc || die
+	fi
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		cd "${S}/doc"
+		docinto html
+		dodoc -r html/*
+	fi
+}
diff --git a/dev-libs/libnl/libnl-3.2.28.ebuild b/dev-libs/libnl/libnl-3.2.28.ebuild
deleted file mode 100644
index d623fb202531..000000000000
--- a/dev-libs/libnl/libnl-3.2.28.ebuild
+++ /dev/null
@@ -1,110 +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} )
-"
-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
-}