gentoo resync : 17.10.2017

2 files changed, 27 insertions, 23 deletions

diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index e5952cc6bcba..eeecbfd43c40 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,9 +1,9 @@
-DIST libnftnl-1.0.5.tar.bz2 367016 SHA256 f6d4f5a702e38bc7987f2363f9fcd65930e8b702595c221a497e2f3a359be497 SHA512 85c71aaaeeafdffe09f2591f26d49d41e9f511a53ed313fe642b4968eae8aac1246a53d5908fc737c6eb9cc4f5f3ef2a4eaa17fe33db453a1fd60f2f9d5c5a1d WHIRLPOOL 15fb25aa9e23bfdcb19ab21ea1d6eadd22e5acc0c38e761e4637a06136c809f5a5827ac58643515432e1394e3e8d4575df11e52b5f16ca787157317e5e2ae463
 DIST libnftnl-1.0.6.tar.bz2 381897 SHA256 ad3b932a39a1e567308e91b683b32239a5e1aea9b4582dfffe2288c3400ab07e SHA512 d813c9d0dbdeaffc30695fb0b5dbf987849339d119774c4f0e219db835f2ad9111a7436fd474ffa96b07e288d537cb4a1be153afcca23dabce0c264e1c4a3c62 WHIRLPOOL c4221c99ee437125c1b10d1d47db7586b979e0ce8e7187a2a9fd5ad3b866e0e6b451aba0956c9a48cec9fb7fc411f523c5f35cd9ef2cd1a939aaab7cb7570728
 DIST libnftnl-1.0.7.tar.bz2 384969 SHA256 9bb66ecbc64b8508249402f0093829f44177770ad99f6042b86b3a467d963982 SHA512 a220c6a2857b4ff7325bfa4fbf537c5afeb66232a7e190b50c3077f01b86f0fb1842055ccc719280b36820ac7103cbe8168944ffe10c55444830ff77449fa6a5 WHIRLPOOL 400edc3bf8268e6c7d4a6804fe36eaca271144019c2220b27865e755466318fe18e1ee5be583d63fc3cfcb1c6819ab557e17fefcba4b96c74e918d024012aadc
-EBUILD libnftnl-1.0.5.ebuild 1241 SHA256 6486443fe61c326e7f83f5d6006a76b3c4b58496e3ea827e2fa8db2e3fab7ea0 SHA512 fb6a9a2c52589f525041f51d0d3eded69e23f253036c0c8fd26b372683799605554473813f0801170d54c00b1c955c059575578e5b41d179fcafc52423fe86e1 WHIRLPOOL 1673c764d2e0ae2fbe0cd61f10c69b0a21d8d56b6081237fb546c329069f3874f6c51731a329508793d8fbd4abc7bac502e2f1886e8e8c690f767a9aa354019e
+DIST libnftnl-1.0.8.tar.bz2 400496 SHA256 e6bdd799ef9c59fc247954aba9f2c6469d8e04cfaee73526728011eaa3632038 SHA512 df9f5967908ce5e6a6a85fe4328bdf6e7501ce6b0e42239b750782aeb76c30b1aae80dd07f73a06fb077d072b1269c4e0c5fd525feed1055400201567d215ef9 WHIRLPOOL f56667a5b385414d620e33c17e2fe2daafee3770cb61bdad89d7b3d5396677ed8ad8cf9f3bd6a5dbf6ce92c031bdf451727e70e0054f8d971c2dc76fb63aa120
 EBUILD libnftnl-1.0.6.ebuild 1302 SHA256 18fd375302a2e9ee606c89fb2a57e3fb6e74e31b8ffb195910ac8b6106b4b83e SHA512 11a9d9694a2a01e539d6d81651828efaa4972c6fcfcdfa541ceed13cb4b553f4d9cdc07d23ffdb5c86f239840f970994d1af9c1f742374b0abf998f2e4d4294f WHIRLPOOL 09b51f49fec9a7603a0b7c57832c641919f6d70184c9f3526e974ae8c6acff31be908a85dc32841d51313dee579b9c7140a08f983f5800a3e018ec90a6bae9f2
 EBUILD libnftnl-1.0.7.ebuild 1305 SHA256 546e7c5254d3660511a5edae0483b0fe05d1bbba680e9d1bc23610bd40b63b3c SHA512 06aee62633e1b83ec9f1a7f484657901f93fac559cea7e7cc7cd53b617615392a63bbdc7989b2f197215c986fca67c7dabde7f12fa494b23f0e7b0788ed35cd1 WHIRLPOOL e7d6440e2654e76257273acd7ce831b7bb7c7a3282e5fc4b99d6b82adb94049ad3bab70a7a23873f2880adfb7088fc59741a6a1c40b87c9884594cce15dd5ff8
+EBUILD libnftnl-1.0.8.ebuild 1347 SHA256 60a89aa6ed919e7cca01458662c5c374de98dd8946af7d2798f9b54daf1810aa SHA512 96d37c31c76df6ae63ae870d43ad450aec088a2cdb67cef87bec5acef35afa4f1719697f2746869a706cc87dad214641373d12fa65d1957880c1f76a091906f1 WHIRLPOOL f3b7a83ddc229eaa7bc5bafebfb75708463adc15b6c75af2448444c8fa48fffd2efec6a8cc2f0c3ce6639691219451b9b6d93d8c8d77f17158179b93dca2e7bf
 MISC ChangeLog 4504 SHA256 b3a85750687dc6beff070b8fefd9307d1b7b5759894c34534fde17eca4a6e56f SHA512 b067d05881eea93e6c4da941ea542e1350cc6f6553f138de01a981f9738763554668e317c0159dd2a4659bd71f46fa19353b6c2c76e05803126351207b2d5105 WHIRLPOOL ea66000f5d372511130733255d10215ac358ac4ef6a4768e200468eeccd38b5bc2e56577dcb9f30e33c7e57fba45241bec074cf6bab833eab93d0b5acb020695
 MISC ChangeLog-2015 1730 SHA256 787f672eccae45f586a44c4a72c8457836f67af7f78fe5415c9c711b88866101 SHA512 46f4a9f4f1f6556d0b33c4a55ff3531857a0806f1ec8970df7d2b00172c54789e6b406041119e62636bdee3f25956b7a0e82daa4d081ff9aec278b2811bfd6cb WHIRLPOOL 21ac9d47fc9c5397d9ae0a7cbbc4ade36611d3a88d1230ab5d356ef4d1fb9caa84fdadb27bcc5bdbea981ca9fc794ba6ea4f9802af63a966b1094051fffba807
 MISC metadata.xml 317 SHA256 f4ad1fedcbebe8c51c0dbcac6dce2901ffb8b4a5ff4bdb4d67d94e8085e2915b SHA512 bfdf498de4ccd1d1a4f78c7e94a90b2bf203e16b8ddec5949bb88c953279026f95da956ef94b39140d44bbcd8cb4008f9f4b777fd895576da8414051c4487beb WHIRLPOOL 1a8c37ba113795d9e123cc5016ac4644e50981409f6ae5dae6a6e28134bc116966721dde550688e2f63f51fcd32767695577d983287fc8a66649386afb2b31d8
diff --git a/net-libs/libnftnl/libnftnl-1.0.5.ebuild b/net-libs/libnftnl/libnftnl-1.0.8.ebuild
index d581d38d35d9..e3b959e4f8a9 100644
--- a/net-libs/libnftnl/libnftnl-1.0.5.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.0.8.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit base linux-info toolchain-funcs eutils
+inherit autotools linux-info toolchain-funcs
 
 DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="http://netfilter.org/projects/nftables/"
-SRC_URI="http://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="examples json static-libs test xml"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="examples json static-libs test threads"
 
 RDEPEND=">=net-libs/libmnl-1.0.0
-	xml? ( >=dev-libs/mini-xml-2.6 )
 	json? ( >=dev-libs/jansson-2.3 )"
 DEPEND="virtual/pkgconfig
 	${RDEPEND}"
 
-REQUIRED_USE="test? ( json xml )"
+REQUIRED_USE="test? ( json )"
 
 pkg_setup() {
 	if kernel_is ge 3 13; then
@@ -30,28 +29,33 @@ pkg_setup() {
 		eerror "This package requires kernel version 3.13 or newer to work properly."
 	fi
 }
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with xml xml-parsing) \
+	local myeconfargs=(
+		$(use_enable static-libs static)
 		$(use_with json json-parsing)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	default
+	cd tests || die
+	./test-script.sh || die
 }
 
 src_install() {
 	default
 	gen_usr_ldscript -a nftnl
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die "Could not rm libtool files"
 
 	if use examples; then
-		find examples/ -name 'Makefile*' -delete
-		dodoc -r examples/
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
-
-src_test() {
-	default
-	cd tests || die
-	./test-script.sh || die
-}