gentoo resync : 05.01.2018

7 files changed, 6 insertions, 73 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f8e09a0c41bf..cd4bd00b117c 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index b91989962f44..f8fe03997fe4 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -3,5 +3,5 @@ DIST libnetfilter_conntrack-1.0.5.tar.bz2 418516 BLAKE2B e887357aa5566b67602f8e9
 DIST libnetfilter_conntrack-1.0.6.tar.bz2 422998 BLAKE2B 7153593e2b6f5e03a5f4579948b0d28e9ab88d39ebe08e97fe8be0eb3f10f64b36d0f85e9e35408019ab22404b3452e4c6d7b2812ea316031f3e0c4367c23019 SHA512 05b3b63928d46ed114048848c48094a762c6a7acc93fcdbe9473e82cc67851ef1a0d33b68b8fd388271b76b519c4d2ac93fd802043fa9a9da46cda5b262a1fc7
 EBUILD libnetfilter_conntrack-1.0.4.ebuild 966 BLAKE2B 82cb97d98d7688949054e07d0d25175f4e766d265f28caef1740b08d4a2e2ad60d04c3f4590f51de344c97131484ec36824af19f0c0ae068001e2c108585bd94 SHA512 360c5bbf5db8dcd6d2ead6373efee752b0a25da8af0a99f3955d45ddf4d83f2ef954eeebde360817b5d7c5931d2c4bc37f019a4c1074f98fb1bd51f1c7a82592
 EBUILD libnetfilter_conntrack-1.0.5.ebuild 979 BLAKE2B b87414a8ebcfc582e36c109da3e9fb8f00e7d0cb4e43286f54dc34a76b4ceaecadbd38f29fed8cd36c9a9c030f28ae14aa418c7a863cd51c5a3ec7da8c82a60c SHA512 872f16047546ca0431a52b391dffaceb6b38503a3bb96900e6c7d38c79b43e5c7b3b4c79b15b468b07de6a5b934c9b088dc0e7ccde61be5b7165939f3a15906e
-EBUILD libnetfilter_conntrack-1.0.6.ebuild 970 BLAKE2B 188aa9e2d09030e6582b2c8a5c4b5c4d0e4896d74de00475d02773eb10502337ddc6dc4be874d203c2ae6319a6c05a4e76663bfc3581351a6b433e9ec74958ed SHA512 38d80f1f0cc87db7308eecbea819cc4d6b6d8e7e9ab553301f9ea0bef7e3d0bd2ce536d3838e888ea506fb5587aa8a8386ade07780a47ebadb1e86920d4a4f87
+EBUILD libnetfilter_conntrack-1.0.6.ebuild 969 BLAKE2B 1d9717e29a1df8c33ee1ef0023eda9f01094538dfd1725b67f82d965641347b14419068e79970f6a415a96af9d67014be6b6add1192a4ac66f55d479661b694a SHA512 47a5704974be39ade144b8558bf5445c60647571dbff0c899e27afd3a98452c79310c83200b1d561238232f8fe0891ecd431bf71deae09abbf369d110847e439
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
index ce9bc635be3f..cb65350e8cee 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 3b7b894ac09a..925e679aa8ac 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -4,6 +4,6 @@ DIST libnftnl-1.0.8.tar.bz2 400496 BLAKE2B d2563f707ceb40b8cd7c4b4fdede64943fabc
 DIST libnftnl-1.0.9.tar.bz2 402296 BLAKE2B 87d1fe9543c1451bf90bd8b2dd442d783649940f38cf10081acac46cd985bd0826f5d2eaab2af65b80ebd4b0a9bfd7dba53ff420fa0f6b901296aa02c746e3ca SHA512 ca4a9402fba8b1354314aed45637026afa4faf880991baf93b2b7e01ca7f44e75ffedc624728bd5a7aa1b30bcbb83b849d2f9aea55be7a18f49036653c08151b
 EBUILD libnftnl-1.0.6.ebuild 1302 BLAKE2B fa3c4d010895f5caf34d442cf18bdd5126835603c9dea570882a45e3940b0a073a60a06ae746ebf0aaa7668f88fc99642f3463d3a5f685d0b6c3593a8b1cdd38 SHA512 11a9d9694a2a01e539d6d81651828efaa4972c6fcfcdfa541ceed13cb4b553f4d9cdc07d23ffdb5c86f239840f970994d1af9c1f742374b0abf998f2e4d4294f
 EBUILD libnftnl-1.0.7.ebuild 1305 BLAKE2B cbe5b1a82d23af02f376c13bae75a58f903bdb26561644a6b0563df97750d952d0423cd332d9d6339f6580cb19563ad514cbee5cc309d75303f685ebdc50e2c7 SHA512 06aee62633e1b83ec9f1a7f484657901f93fac559cea7e7cc7cd53b617615392a63bbdc7989b2f197215c986fca67c7dabde7f12fa494b23f0e7b0788ed35cd1
-EBUILD libnftnl-1.0.8-r1.ebuild 1367 BLAKE2B 074a26d1ba072eb1788863becf804f0d3c6c7abef785a254c209917819506a2c12454b8acd3bdc4b0a3b9e86dff443320d5dd2e3a06c42b2bc94344a265a4a2c SHA512 88308c1f030dd462b33d1e25d8ee1e4a3fd431fe791819e2f1884b89794e0b61a019506973860c37648a762b9115a329ef7f084a67c1b6e998ac664406e9e1c3
+EBUILD libnftnl-1.0.8-r1.ebuild 1366 BLAKE2B 1e6368b5ec3f56bfed227a8bb6aef2afffe446f9df88f6262a86db5fb4c3a7f68eb6f7e1754af64de9be16381b655a8edf8db0f8be0fa3043e78c977b044872a SHA512 cde7954135a02f37d9b3ce92f7d8b7c99d39346256e4557fca2496025c73802e65cf22acf0c9e9eec62aff17d48bcc63c380d8b2902cfe61afbd4c159183c5af
 EBUILD libnftnl-1.0.9.ebuild 1369 BLAKE2B f04bebcfa121fe3c146be95a50e0d3e64fe0fc6b840ab0e5011d2fcaf08d34687dafcbb87a2f18d757deb69c62028f227ad12cda43301a67928cf4a80e3ffed3 SHA512 c4e8d80ee251f78a9c03e692eb8aaa807b944c5246c97a4cc96c00a4439a377f6adb28072a799d184a45286a449ba875a08ffc22e5a81482f44f2418bf952c9f
 MISC metadata.xml 317 BLAKE2B ec8bdc87d1d0694e81566b611db8e455e851b86a2403ca8ac0c36f774f23b89fb9ee4e55dbc818efba807aec0487dd1956f2fb17393b327500dbe69118d5030b SHA512 bfdf498de4ccd1d1a4f78c7e94a90b2bf203e16b8ddec5949bb88c953279026f95da956ef94b39140d44bbcd8cb4008f9f4b777fd895576da8414051c4487beb
diff --git a/net-libs/libnftnl/libnftnl-1.0.8-r1.ebuild b/net-libs/libnftnl/libnftnl-1.0.8-r1.ebuild
index 6b27f2343360..e4d9f2de9ec6 100644
--- a/net-libs/libnftnl/libnftnl-1.0.8-r1.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/7" # libnftnl.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 x86"
 IUSE="examples json static-libs test threads"
 
 RDEPEND=">=net-libs/libmnl-1.0.0
diff --git a/net-libs/pacparser/Manifest b/net-libs/pacparser/Manifest
index 69cfa8bab5d0..76a96a39fbb3 100644
--- a/net-libs/pacparser/Manifest
+++ b/net-libs/pacparser/Manifest
@@ -1,4 +1,3 @@
-AUX pacparser-1.3.1-makefile.patch 2265 BLAKE2B 285544747dd46d3d0452934c874b8b9c2495a6c48fe0ad1648487ecd95925f71ba369969768aac0b7eebb377e92fc928b616c749c18c76a33930ff81e23c2bed SHA512 6812dc1482554053fedf0f522260cc5da6b5f9bfa9e1ccf51bb5d1ad92c3663122460c6d41f8c3a2318b37e251ec8bf5849f3f4140d2f6fd647d5be61544af51
 DIST pacparser-1.3.7.tar.gz 905596 BLAKE2B 122127b6e1d8f68fde4c5ca98207bf2a0fa2a081dbb60aaf34126700a3de9d861e7b5f881e78d3eefdd2a9af97a9ba677339ca2b2a0b4459d26e60a62226e839 SHA512 979238204cd352ecf502a5a6216a35d7c47e82a173c32c6f0a5166f1fe790c66ac74ec1d9d0a58b54038d19e893f8b365ed868664f84ab9d5e653584bf20130b
 EBUILD pacparser-1.3.7.ebuild 1602 BLAKE2B 24ad579d8dd2ddcee81bd046376afa497e729ef768c7b08ed17c42b8be973acdbc1358befb0fa35cc7e23d88bc3f7f3d3605994d8bf9ea1972dcfd6c70e3c396 SHA512 c40f3ea5279259ff52a05041d870797a23879f3a7a512af64e9f0e26bff9a7a52d7bf47f7e53baeb0c8a7cf5d0b2cbd75238d4892b349fe31117f28014b0a341
 MISC metadata.xml 1156 BLAKE2B 6c4e195b94172823c0dc6bbf426c2d8a31d83a0bb7044efa92b9f07f846fa7a2e0ecd4f49678eb517ddeaca43f18942ca9256bc92909cbd1242ed2cfbdbc39de SHA512 e391221061937896f5f27a4d77f959756afdfd1c58f47f4ac5d27e2f289ca70bd7907c86efc6114ec02d03b6f5a88fd3b8d5755bf97dae6e613d7835f2c71704
diff --git a/net-libs/pacparser/files/pacparser-1.3.1-makefile.patch b/net-libs/pacparser/files/pacparser-1.3.1-makefile.patch
deleted file mode 100644
index a1434075d18a..000000000000
--- a/net-libs/pacparser/files/pacparser-1.3.1-makefile.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Nur pacparser-1.3.1.orig/src/Makefile pacparser-1.3.1/src/Makefile
---- pacparser-1.3.1.orig/src/Makefile	2013-11-26 04:21:24.000000000 +0000
-+++ pacparser-1.3.1/src/Makefile	2013-11-26 04:27:11.000000000 +0000
-@@ -55,7 +55,7 @@
-   endif
- endif
- 
--CFLAGS = -g -DXP_UNIX -Wall -DVERSION=$(VERSION)
-+CFLAGS := $(CFLAGS) -g -DXP_UNIX -Wall -DVERSION=$(VERSION)
- 
- ifndef PYTHON
-   PYTHON = python
-@@ -67,13 +67,14 @@
- 
- LIBRARY_LINK = $(LIBRARY_NAME).$(SO_SUFFIX)
- PREFIX := $(DESTDIR)$(PREFIX)
--LIB_PREFIX = $(PREFIX)/lib
--INC_PREFIX = $(PREFIX)/include
--BIN_PREFIX = $(PREFIX)/bin
--MAN_PREFIX = $(PREFIX)/share/man
-+LIB_PREFIX := $(PREFIX)/lib
-+INC_PREFIX := $(PREFIX)/include
-+BIN_PREFIX := $(PREFIX)/bin
-+MAN_PREFIX := $(PREFIX)/share/man
-+DOC_PREFIX := $(PREFIX)/share/doc/pacparser
- 
- .PHONY: clean pymod install-pymod
--all: testpactester
-+all: pactester
- 
- spidermonkey/js/src: spidermonkey/js-?.?.?.tar.gz
- 	tar xzvf spidermonkey/js-?.?.?.tar.gz -C spidermonkey
-@@ -97,7 +98,7 @@
- 	ln -sf $(LIBRARY) $(LIBRARY_LINK)
- 
- pactester: pactester.c pacparser.h $(LIBRARY_LINK)
--	$(CC) pactester.c -o pactester -lpacparser -L. -I.
-+	$(CC) $(CFLAGS) $(LDFLAGS) pactester.c -o pactester -lpacparser -L. -I.
- 
- testpactester: pactester
- 	echo "Running tests for pactester."
-@@ -118,16 +119,20 @@
- 	# install pacparser manpages
- 	install -d $(MAN_PREFIX)/man3/
- 	(test -d ../docs && install -m 644 ../docs/man/man3/*.3 $(MAN_PREFIX)/man3/) || true
-+
-+install-docs:
- 	# install html docs
--	install -d $(PREFIX)/share/doc/pacparser/html/
--	(test -d ../docs/html && install -m 644 ../docs/html/* $(PREFIX)/share/doc/pacparser/html/) || true
-+	install -d $(DOC_PREFIX)/html/
-+	(test -d ../docs/html && install -m 644 ../docs/html/* $(DOC_PREFIX)/html/) || true
- 	# install examples
--	install -d $(PREFIX)/share/doc/pacparser/examples/
--	(test -d ../examples && install -m 644 ../examples/* $(PREFIX)/share/doc//pacparser/examples/) || true
-+	install -d $(DOC_PREFIX)/examples/
-+	(test -d ../examples && install -m 644 ../examples/* $(DOC_PREFIX)/examples/) || true
- 
- # Targets to build python module
- pymod: pacparser.o pacparser.h libjs.a
- 	cd pymod && ARCHFLAGS="" $(PYTHON) setup.py build
-+
-+test-pymod: pymod
- 	$(PYTHON) ../tests/runtests.py
- 
- install-pymod: pymod