gentoo resync : 10.03.2018

31 files changed, 27 insertions, 798 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 9a9890966f77..6cfa04b2f6ac 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index 4341c4834c9f..58f16d59ddf2 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -1,26 +1,11 @@
 AUX kafka-zookeeper.init.d 506 BLAKE2B f0e6ab4a15a54363fe31e567805b19a1b18d59238f4f4eff4733432ef48ad0d3352c843290e517a195ca89ee39a8c1793d0fac671689cb51946696b3eb62d90e SHA512 96656e81a296c989fa5dcbab4831b6ca12841ef8e902d32b3100196e0dfc1984ba6d4eb426ade14ef8b4299ea9665753a0af22e8e7f4b7947424d5529d2f7010
-AUX kafka.init.d 497 BLAKE2B 34e1b6af2878670c303a3df16120b6721b7e8f7aa88d2cb08ef91dc6c87217376a0350ab87614a178acd41c9f75e81529cb3e476ef2e5723026b6e4ef5fde3d5 SHA512 2e0ff5d5b95e39b08b234b38535a5fa4b3cb1d63ed1af7f107f1babdcded77f296999c0f9fa5e253408f4003b1a9a11a33533502a07fbdb0911314005bb98148
-AUX kafka.init.d.2 668 BLAKE2B bc1672ee04b6776fe4fc94a9a2bbc2d9e5d91e9448336ff48c615cd803fd33ad7ae2f35bf621214b96b6b903b7b261e3e8409deb1ed486834dbcba4235fc7411 SHA512 1a7b0c6ba64ed5b9697776dc49688e53b55846b0f65ae97e3cd551db3fe700f319f78bb2c6f0f4e77102f754f1c2d3a7bbd303e2cbeb17c0ed99ef878313a5f5
-AUX kafka.init.d.3 671 BLAKE2B e83609ee7badbc428c979a15004802a97b57e616ed30031835b67465c8c023b8aa55cd67687e6f260c95dd07c72533f3c347bec52e8ea27c562b0f14742db8d8 SHA512 45478ae4733a498a6bf3604359943f003056dc77f3eb382bd7e7c04a5e9cee34fb07170c67bf306e4b09a49b3e0665fe760d1ceb37a09b174b3e9c3f519bdddc
-DIST kafka_2.11-0.10.0.1.tgz 31831257 BLAKE2B fefff1b30e3cb1ff9abe84c6e4fd05c96d216e97326dc552bd611b914307206dfc8214f6ab2cf7dd8e9f395494e2b44163784cee6c4845486783498b5247f7ae SHA512 ab89c1d0cf4e05e823f45629e7bc5778173fd7420ebfa259f566071c6b474b08abf808508c7fd6fcca2233b20e76cbf6a235563709bfa019455386f80f0b5d71
-DIST kafka_2.11-0.10.1.0.tgz 34373824 BLAKE2B 88b911227052abd572966e9d1c4429d4d6010df43d90a51de5f3c17ba73b4f5fb1144697c893f0a0e7ce723eeb0c451519e9041e61663e2e6f4bbb8e6e8b0442 SHA512 b47a26813395b5bed5bb3f874727d4a1cae13480732aee3014d66afdbe1ec8ed6ed8c9de4feff67d18492088b5e927516a8ce13f355ce985ec0144608509d30b
-DIST kafka_2.11-0.10.1.1.tgz 34424602 BLAKE2B ab49c0721c903d937d5e3d1c83f0f25960f0e246fda21cfd154bb061401d64d4b0c16932af45c3924579a71f49da3d0c3bee6a99def21d7f0640fcdc793a1cec SHA512 6d996946ee5d798f0af8ffa2bddc1dc23632761488556e765ba731acae28e2d65f4ca3f0648caa7bbb14947daf3e1862d9959f271eff5e0625c780a7169c6f72
-DIST kafka_2.11-0.10.2.0.tgz 37630750 BLAKE2B 3ad017c19e9c1c0aaafd902d200fb6d1855549935268f394354444b7ce73f1bfe8dfbdc68bf6c0ba56945107ab44bd2f3cd8806cc31127bcb578ae1d2102f282 SHA512 3d972cdccdbe889b73b8d5ec68e8a0bc5daabed29ec8f1f217e22887534eba8f3127886c07950a673c55d289a9dbd077763141eb883b5f9e2fe8b56b4524941c
+AUX kafka.init.d.4 709 BLAKE2B 3fb3d09fb715b4c01396406574c21a2127cc7c73a92927b9add59123fb5cc2d9f97c2dd2c10c212eb3bb723a05ab7575c2443a71baa6063b85ef21dce9426f75 SHA512 1c96854b6fab044e1b415e6e9f16964d1d06dc4070dabead9a1b391a9ab2a4b64120e175f8199afbc1fd2a4ba7f7d319932e0d2b5fb1ef0e8cfe55c68313d1a3
 DIST kafka_2.12-0.10.2.1.tgz 34046244 BLAKE2B 210ebb9a2994d453e10e7c2f7a789ac33f65adced96032c2cfaff8ec2fceb2c4e4a35d71421a2b9c965c8c6e8b85b6a4e5cabd7cb0b5af0474b5a1c598c3e2f1 SHA512 48884838980ff182fe1bb089b5f8db91aaa190dad9f9cbf24d762ba8afb897546f66d66ce110eef87ad1541e06564e5ea455e4698a23fbd296d971e033953bbc
-DIST kafka_2.12-0.11.0.0.tgz 36644420 BLAKE2B 78355e84348bb4e8c09958dddc96023bab7e17dd26a5ae988b50fc82254096f23d5059287aa2e9c0ab4738fcde300e99e5dc093a6613bdb906cbfbc0162cd36b SHA512 60b44930700ab42e4a0e3945b6eb32db422d2e62388b4fee68aef97aea939fd252ebd0be39b36a4e6149aff9dcbd5b0578095d8a8812bd75111a65299aa5af55
-DIST kafka_2.12-0.11.0.1.tgz 37227486 BLAKE2B c4d18aa324f051f7bfd4ac9d967670445dbf96530fa8f896b7377ed8c6cdde06e155a0f4b79281d3d528b89e03ff06cfd1b9766f526b42523d74dea979bba9f7 SHA512 e85b152a0865e068309d3117b874010895389761da43ec62c87e2e4cffa5c8ea0eed6ea6beceae87d437ffabb143d6bc36408b1387985f2b90fe8b9c8201f29e
 DIST kafka_2.12-0.11.0.2.tgz 37282246 BLAKE2B 55485ff6b319b35626e8c93967357eda7099e427b5f1d87ab29bd7c8edd0ded8e271b3973b5d3ee025f09e17d319a0e9f1a9fffcf75c663052ce3b656f2e9b66 SHA512 b1652b53558886a1d407fd82d6ea1c3af5b580752303dcf836c43d76c0fc0773790df4af2d9364f937fac96d197974282e57add488bd592e87cf4c3f52592bb8
 DIST kafka_2.12-1.0.0.tgz 44352403 BLAKE2B 14c536224c2d75ccaa471dfa7dc806f99e17e70663670bbc09fc6150d2ef76f6e31b1a3567b32fdc7caa8a2b440f83734102b1bafebd1df067bad1ab8dcbe9d7 SHA512 1b647b7f392148aa2b9d47550a1502e50be4b005c70c82dae03065b89484e66400528be40ca2d54f35eb2c0e70f35c88a04777c2b625daa5d5546caab4ed6818
-EBUILD kafka-bin-0.10.0.1.ebuild 1440 BLAKE2B 365a8f7926540cfbec713af5b8274c4b770a8be6dd23af88e15c061b108000b929acf9b321b4589e4f1ee8629670173a47174ba519704256ca2d827ec4479f83 SHA512 f2bb54ee5bb241b93c964f0ec2ac8298c86dca304f857194864580bddf65764cb8b27961d4e3b750d6624e1747a4284d69d557a4ba7eba9775400c131cc05829
-EBUILD kafka-bin-0.10.1.0-r1.ebuild 1471 BLAKE2B 7c28e1ee6eec26765b2e86f3023eb2bd9610be8bdd46df674e58e87a0e60ccfcc5295b08c604521a00f0b530986b15ae68731aa121df7b4e0e62c6955a5a8510 SHA512 cca27e43b7dd964699e3de6dc1b69f4a6e102516280656f0c5e171ab49e9ad731bd645001dbda4cf22b9c66202b36e9565ff354056c81b19b97bf71954f6d463
-EBUILD kafka-bin-0.10.1.0.ebuild 1440 BLAKE2B 365a8f7926540cfbec713af5b8274c4b770a8be6dd23af88e15c061b108000b929acf9b321b4589e4f1ee8629670173a47174ba519704256ca2d827ec4479f83 SHA512 f2bb54ee5bb241b93c964f0ec2ac8298c86dca304f857194864580bddf65764cb8b27961d4e3b750d6624e1747a4284d69d557a4ba7eba9775400c131cc05829
-EBUILD kafka-bin-0.10.1.1.ebuild 1471 BLAKE2B 7c28e1ee6eec26765b2e86f3023eb2bd9610be8bdd46df674e58e87a0e60ccfcc5295b08c604521a00f0b530986b15ae68731aa121df7b4e0e62c6955a5a8510 SHA512 cca27e43b7dd964699e3de6dc1b69f4a6e102516280656f0c5e171ab49e9ad731bd645001dbda4cf22b9c66202b36e9565ff354056c81b19b97bf71954f6d463
-EBUILD kafka-bin-0.10.2.0.ebuild 1471 BLAKE2B 82b4790cb01bee746eb55e71ad0a1b583207aaab39b569abdcc43203e965e4d1604c5dbbd24c9fe9530268f1b424c1ac6dfe3f08189cf3c7bb99770cd5cb5710 SHA512 0bb15ebc348ae68a0eee243ea3102779e6a00a3357afae770e3cdd8346e42508052b58fbe2e495b37d234c3d258dfb10e76e0b792d6002f4425ef0914a91c228
-EBUILD kafka-bin-0.10.2.1-r1.ebuild 1473 BLAKE2B a4d14eb7921b00d35613be2db0211787ccdb3859f4ed5a3716d0e2d25cd468730bbdb25ecab5ad854a1cc087db429cec1e1c7d6d9c74063ab28a5e97248b6c85 SHA512 00004f94903a431797858689d162545e57c40d3e62e7c9ed3250338744b2c5c48433d5c1184d731663d156650ad08676030cb6066188a15eafbd038818a425fb
-EBUILD kafka-bin-0.10.2.1.ebuild 1471 BLAKE2B d22ca7e5b2a2592e7d93885ff934a69b43e47ff3dbe85b2c44abecb419a058313e92e525b5de3fe44efce5c0680accfdbf6c758049144b343aaa79be2c22e166 SHA512 202e2f909043c380ef42bab813749490ab7ec57d738eaad6cf79e5cb7ceb8f2e0baf285a63ccaf3e12f00cc22d325f9aa7d421a5662d0f472249bd06e933b493
-EBUILD kafka-bin-0.11.0.0-r1.ebuild 1473 BLAKE2B a4d14eb7921b00d35613be2db0211787ccdb3859f4ed5a3716d0e2d25cd468730bbdb25ecab5ad854a1cc087db429cec1e1c7d6d9c74063ab28a5e97248b6c85 SHA512 00004f94903a431797858689d162545e57c40d3e62e7c9ed3250338744b2c5c48433d5c1184d731663d156650ad08676030cb6066188a15eafbd038818a425fb
-EBUILD kafka-bin-0.11.0.0.ebuild 1471 BLAKE2B d22ca7e5b2a2592e7d93885ff934a69b43e47ff3dbe85b2c44abecb419a058313e92e525b5de3fe44efce5c0680accfdbf6c758049144b343aaa79be2c22e166 SHA512 202e2f909043c380ef42bab813749490ab7ec57d738eaad6cf79e5cb7ceb8f2e0baf285a63ccaf3e12f00cc22d325f9aa7d421a5662d0f472249bd06e933b493
-EBUILD kafka-bin-0.11.0.1.ebuild 1492 BLAKE2B a4b7e264a0f77fc4878f2bd3f06f74826fe030ff26eb354d28d4ebe640e80877fd56d102505e853288193c1e2d6c91c8ff7098e861445d035c4899e037a7fe1b SHA512 5920701379370edde973a049a47a95e7ba261fa8cca6d9fca6f5de27b340c7cd2df9cbceb950fe0cc373ca66f087bdf6eca0e7a82fc1f3422a6d18c5aae8cc81
-EBUILD kafka-bin-0.11.0.2.ebuild 1492 BLAKE2B a4b7e264a0f77fc4878f2bd3f06f74826fe030ff26eb354d28d4ebe640e80877fd56d102505e853288193c1e2d6c91c8ff7098e861445d035c4899e037a7fe1b SHA512 5920701379370edde973a049a47a95e7ba261fa8cca6d9fca6f5de27b340c7cd2df9cbceb950fe0cc373ca66f087bdf6eca0e7a82fc1f3422a6d18c5aae8cc81
-EBUILD kafka-bin-1.0.0.ebuild 1473 BLAKE2B 8a3f184fdba0bbea5419b2d6a6c73733b797692b0c5354cf2c08c73300224a212048cf339f971dc02d2bbcbcf87785c74953dd5f18d56e875896253217d36d3b SHA512 c4c99f4f2cd3519002d12b0fa59ed79470896e6bacfae6147bae6079338f3b8c850a80f19945ba272f08818440d7726c4bf51a2f744d0ee8314002ff9cb04977
+DIST kafka_2.12-1.0.1.tgz 44474706 BLAKE2B 59aaa2bb2f1940b4d581882eaedbba091149cecadca970762b7ba83aff41da165526e5d69a65212de2f25c28ad5c2327befa4d9d01bd04e7fa8b9d882e832dd8 SHA512 935c0df1cf742405c40d9248cfdd1578038b595b59ec5a350543a7fe67b6be26ff6c4426f7c0c072ff4aa006b701502a55fcf7e2ced1fdc64330e3383035078c
+EBUILD kafka-bin-0.10.2.1-r2.ebuild 1473 BLAKE2B a81a81398ba9740a7a63d371ee95e49d85b955da7213ce76e6f79af1dfdd5cb82f435d84e485f175daab0f3bd42a65b0723d26b53f0b96524eb2d61857c5a5c0 SHA512 09183d60d03861587177d48157da6d368a9d6b2e37140021380697decdb5504db39efe9b1b42fe6c372e2f6640fe2d70ba516bb3145db11949e4b6b5c66f753e
+EBUILD kafka-bin-0.11.0.2-r1.ebuild 1492 BLAKE2B bf1ef604907033196656a8b3892fa1c267bfbbbe5faab963b20c1ddbb832c48bc9cb9f254d7a03417635ac9ba82e7be37a33fd005499b7b3137a5dbea299770c SHA512 ba1374b720a1fa8178ba2557d98a4bfe8b9bee0c6ecc598a4ad90d02d5fe16d8b77c24ad3f76382e3bce30a9da979a5d1090667b5889aa2d4dd36873b3f13b88
+EBUILD kafka-bin-1.0.0-r1.ebuild 1473 BLAKE2B a81a81398ba9740a7a63d371ee95e49d85b955da7213ce76e6f79af1dfdd5cb82f435d84e485f175daab0f3bd42a65b0723d26b53f0b96524eb2d61857c5a5c0 SHA512 09183d60d03861587177d48157da6d368a9d6b2e37140021380697decdb5504db39efe9b1b42fe6c372e2f6640fe2d70ba516bb3145db11949e4b6b5c66f753e
+EBUILD kafka-bin-1.0.1.ebuild 1473 BLAKE2B a81a81398ba9740a7a63d371ee95e49d85b955da7213ce76e6f79af1dfdd5cb82f435d84e485f175daab0f3bd42a65b0723d26b53f0b96524eb2d61857c5a5c0 SHA512 09183d60d03861587177d48157da6d368a9d6b2e37140021380697decdb5504db39efe9b1b42fe6c372e2f6640fe2d70ba516bb3145db11949e4b6b5c66f753e
 MISC metadata.xml 311 BLAKE2B 9fa7db32894e010ccdfb89bae2807b359d0e82ee6937427b6bdbce2554a02367b6e66b689fd7f74ba05e3a701bf4cfd7bdc20b15a96b645b03d6ecc34826fbd0 SHA512 9221b0e14820c3217378e26fe5bb82d03fca4ff3c98cb3fe5a95d688df8b7c792f8a97bfdb0f47874dc36b13dce3bae1a14db073586bde3a46e2fda434859af6
diff --git a/net-misc/kafka-bin/files/kafka.init.d b/net-misc/kafka-bin/files/kafka.init.d
deleted file mode 100644
index 3b23a7fac7c9..000000000000
--- a/net-misc/kafka-bin/files/kafka.init.d
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Kafka distributed messaging system"
-
-logfile="/var/log/kafka/kafka.log"
-
-command="/opt/kafka/bin/kafka-server-start.sh"
-command_args="/etc/kafka/server.properties"
-start_stop_daemon_args="--user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile"
-
-command_background=yes
-pidfile=/run/kafka.pid
-
-depend() {
-       after zookeeper kafka-zookeeper
-}
diff --git a/net-misc/kafka-bin/files/kafka.init.d.2 b/net-misc/kafka-bin/files/kafka.init.d.2
deleted file mode 100755
index 87b4b47a4469..000000000000
--- a/net-misc/kafka-bin/files/kafka.init.d.2
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Kafka distributed messaging system"
-
-logfile="/var/log/kafka/kafka.log"
-
-command="/opt/kafka/bin/kafka-server-start.sh"
-command_args="/etc/kafka/server.properties"
-
-command_background=yes
-pidfile=/run/kafka.pid
-
-start() {
-	start-stop-daemon --start --background --user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile \
-	--env KAFKA_HEAP_OPTS="${KAFKA_HEAP_OPTS}" \
-	--pidfile $pidfile --exec /opt/kafka/bin/kafka-server-start.sh -- /etc/kafka/server.properties
-}
-depend() {
-       after zookeeper kafka-zookeeper
-}
diff --git a/net-misc/kafka-bin/files/kafka.init.d.3 b/net-misc/kafka-bin/files/kafka.init.d.4
index c355f21612ca..064821f669de 100644
--- a/net-misc/kafka-bin/files/kafka.init.d.3
+++ b/net-misc/kafka-bin/files/kafka.init.d.4
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Kafka distributed messaging system"
@@ -13,9 +13,11 @@ command_background=yes
 pidfile=/run/kafka.pid
 
 start() {
+	ebegin "Starting kafka ..."
 	start-stop-daemon --start --background --user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile \
 	-m --env KAFKA_HEAP_OPTS="${KAFKA_HEAP_OPTS}" \
 	--pidfile $pidfile --exec /opt/kafka/bin/kafka-server-start.sh -- /etc/kafka/server.properties
+	eend $?
 }
 depend() {
        after zookeeper kafka-zookeeper
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild
deleted file mode 100644
index f4a9a59a79ec..000000000000
--- a/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.11
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.1.0-r1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.1.0-r1.ebuild
deleted file mode 100644
index 819491ebdd47..000000000000
--- a/net-misc/kafka-bin/kafka-bin-0.10.1.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.11
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.1.0.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.1.0.ebuild
deleted file mode 100644
index f4a9a59a79ec..000000000000
--- a/net-misc/kafka-bin/kafka-bin-0.10.1.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.11
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.1.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.1.1.ebuild
deleted file mode 100644
index 819491ebdd47..000000000000
--- a/net-misc/kafka-bin/kafka-bin-0.10.1.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.11
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.2.0.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.2.0.ebuild
deleted file mode 100644
index e75d073295aa..000000000000
--- a/net-misc/kafka-bin/kafka-bin-0.10.2.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.11
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.2.1-r1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.2.1-r1.ebuild
deleted file mode 100644
index 36e9ed9e938d..000000000000
--- a/net-misc/kafka-bin/kafka-bin-0.10.2.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d.2" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.2.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.2.1-r2.ebuild
index e5705a4e5401..ae63ac0018b8 100644
--- a/net-misc/kafka-bin/kafka-bin-0.10.2.1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-0.10.2.1-r2.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=5
@@ -53,7 +53,7 @@ src_install() {
 	keepdir /var/log/kafka
 	fowners -R kafka:kafka /var/log/kafka
 
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
 
 	dodir "${INSTALL_DIR}"
 	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.11.0.2-r1.ebuild
index 1699e37e95fe..e16e10cae84f 100644
--- a/net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-0.11.0.2-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=5
@@ -53,7 +53,7 @@ src_install() {
 	keepdir /var/log/kafka
 	fowners -R kafka:kafka /var/log/kafka
 
-	newinitd "${FILESDIR}/${MY_PN}.init.d.3" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
 
 	dodir "${INSTALL_DIR}"
 	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.2.ebuild b/net-misc/kafka-bin/kafka-bin-0.11.0.2.ebuild
deleted file mode 100644
index 1699e37e95fe..000000000000
--- a/net-misc/kafka-bin/kafka-bin-0.11.0.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="https://archive.apache.org/dist/${MY_PN}/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d.3" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.0-r1.ebuild b/net-misc/kafka-bin/kafka-bin-1.0.0-r1.ebuild
index 36e9ed9e938d..ae63ac0018b8 100644
--- a/net-misc/kafka-bin/kafka-bin-0.11.0.0-r1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-1.0.0-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=5
@@ -53,7 +53,7 @@ src_install() {
 	keepdir /var/log/kafka
 	fowners -R kafka:kafka /var/log/kafka
 
-	newinitd "${FILESDIR}/${MY_PN}.init.d.2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
 
 	dodir "${INSTALL_DIR}"
 	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
diff --git a/net-misc/kafka-bin/kafka-bin-1.0.0.ebuild b/net-misc/kafka-bin/kafka-bin-1.0.0.ebuild
deleted file mode 100644
index a3d76ba672ca..000000000000
--- a/net-misc/kafka-bin/kafka-bin-1.0.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d.3" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.0.ebuild b/net-misc/kafka-bin/kafka-bin-1.0.1.ebuild
index e5705a4e5401..ae63ac0018b8 100644
--- a/net-misc/kafka-bin/kafka-bin-0.11.0.0.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-1.0.1.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=5
@@ -53,7 +53,7 @@ src_install() {
 	keepdir /var/log/kafka
 	fowners -R kafka:kafka /var/log/kafka
 
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
 
 	dodir "${INSTALL_DIR}"
 	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
diff --git a/net-misc/networkmanager-openconnect/Manifest b/net-misc/networkmanager-openconnect/Manifest
index 7c9fa3f79e71..b3e50cf7194b 100644
--- a/net-misc/networkmanager-openconnect/Manifest
+++ b/net-misc/networkmanager-openconnect/Manifest
@@ -1,4 +1,3 @@
 DIST NetworkManager-openconnect-1.2.4.tar.xz 647944 BLAKE2B a2a096224a42e5ab55743e46d9030eb036cb0d8d43a957c2b7f056f7de8763ec8d2de84701ac59951540aceefd0329614eb50aa5c57600b3e72fbce0118fe431 SHA512 203652a468525c3f6d374ce7fbf2f5b904a13b5e74fb3898dbfeec863c64a60fd9826fc5d9edb52c3e75b9871f49cb78580914e37a3522e4676ca1c29102d0a2
 EBUILD networkmanager-openconnect-1.2.4-r1.ebuild 1117 BLAKE2B 3136341ae3273fd520157539ef83d6a852219fe586c4b8eb62cdfa84beb388b06a8d8e6bfeffbfc5d9a2b41c9a534dfba277df7fa6e4e0676c78dc575f15b890 SHA512 2795ddf0c86284e0071a0f8c5b9a9c56aab5a41565a124f13dc5d326d6250b86cc18bc954e8c86c86c91f0cfeb2637e5d0d7b25077bc1ca46f51a6aa46e80581
-EBUILD networkmanager-openconnect-1.2.4.ebuild 926 BLAKE2B dc8b744eec592bead2a709dd6e1daf806d50e6fc01eda666ab64f63291a12bffabf0a7b7464c863c1a7107b01a5f0b934b874fd102b04c4839243208d40bcafe SHA512 915eb881bb06bab4d2ec5fad2664e61088939685e2422d301de80916a7f8c384a1d99651389e89100b9684621f47013a7135f416f12bfcccbcd15bb6d6b8c97e
-MISC metadata.xml 364 BLAKE2B 5ad394f27dbdfbc904fc2d854bdf5f29ee37f5a7b6a9abf05b622d16a5333f3b2a44c328cf4ce41b77438774b4d8c4489f4053e27523cd0c5629f2be5d1d887f SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-openconnect/metadata.xml b/net-misc/networkmanager-openconnect/metadata.xml
index 30c8deabf55b..996e7cacd217 100644
--- a/net-misc/networkmanager-openconnect/metadata.xml
+++ b/net-misc/networkmanager-openconnect/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-		<email>steev@gentoo.org</email>
-		<name>Stephen Klimaszewski</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4.ebuild
deleted file mode 100644
index d8c3b6555b58..000000000000
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenConnect plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-1.2:=
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/dbus-glib-0.74
-	dev-libs/libxml2:2
-	>=net-vpn/openconnect-3.02:=
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=x11-libs/gtk+-3.4:3 )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--without-libnm-glib \
-		$(use_with gtk gnome) \
-		$(use_with gtk authdlg)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	enewgroup nm-openconnect
-	enewuser nm-openconnect -1 -1 -1 nm-openconnect
-}
diff --git a/net-misc/networkmanager-openswan/Manifest b/net-misc/networkmanager-openswan/Manifest
index 9365c21a0e75..d0ba1c3356f0 100644
--- a/net-misc/networkmanager-openswan/Manifest
+++ b/net-misc/networkmanager-openswan/Manifest
@@ -1,5 +1,3 @@
-DIST NetworkManager-openswan-1.0.6.tar.xz 306648 BLAKE2B a21f415bceab5edd9932e887e3aaa5da0819f025babccfd58fcefb207d2c222aa4630b145d78e9befc09409f7f74aa596bce779c4034b9c3a5cf0765bc71c57f SHA512 e1f4fd9fe6e535fa717deb862cbf08e73e5f66a7a3d8ca328f653f009229a3a811de5157f641588a884528a8c9e2d63b22759864fa4d02276b1cf0721c8932ce
 DIST NetworkManager-openswan-1.0.8.tar.xz 318672 BLAKE2B f0a277de4bf58c9d15f329ce8e0ba00ff80dde205fde19d9cd0b6feea4796cd0d84da6934713ee9b958c286c96a565f53d430b4105e6a963ab1ae8f7755e202f SHA512 66a3948493dd51def3d0afd57ccbb2e38a2f1b3c37df85b47059a0c06457093d574aed4165710080b9cfcc914e4459a60d6946170199dd3f75482c6350e9ed6a
-EBUILD networkmanager-openswan-1.0.6.ebuild 844 BLAKE2B 1a4fae4ecbb449df83df81ed2a9f57c43fd0ecfb0d6588f99c1b56643824cd8f6279287c528f7139906b5ece1b6dbc32217efb560514fd72d22ca5d46ad8b905 SHA512 8cfb84d687f2a2cc34f70dc0e9d79525b2b3f4c265084f5ede3e2918e7952d1d89b89a83e713cc2c8cd07cc95546925e1c3c409d93cf8f8e0583a9fc514e8c73
 EBUILD networkmanager-openswan-1.0.8.ebuild 844 BLAKE2B 1a4fae4ecbb449df83df81ed2a9f57c43fd0ecfb0d6588f99c1b56643824cd8f6279287c528f7139906b5ece1b6dbc32217efb560514fd72d22ca5d46ad8b905 SHA512 8cfb84d687f2a2cc34f70dc0e9d79525b2b3f4c265084f5ede3e2918e7952d1d89b89a83e713cc2c8cd07cc95546925e1c3c409d93cf8f8e0583a9fc514e8c73
-MISC metadata.xml 364 BLAKE2B 5ad394f27dbdfbc904fc2d854bdf5f29ee37f5a7b6a9abf05b622d16a5333f3b2a44c328cf4ce41b77438774b4d8c4489f4053e27523cd0c5629f2be5d1d887f SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-openswan/metadata.xml b/net-misc/networkmanager-openswan/metadata.xml
index 30c8deabf55b..996e7cacd217 100644
--- a/net-misc/networkmanager-openswan/metadata.xml
+++ b/net-misc/networkmanager-openswan/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-		<email>steev@gentoo.org</email>
-		<name>Stephen Klimaszewski</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
deleted file mode 100644
index dcd10236ee5c..000000000000
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager Openswan plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libnl-3.2.8:3
-	>=net-misc/networkmanager-0.9.10:=
-	>=dev-libs/dbus-glib-0.74
-	|| ( net-misc/openswan net-vpn/libreswan )
-	gtk? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.10
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index f96f1fd30959..f201fd5edec1 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,8 +1,5 @@
 AUX networkmanager-openvpn-1.8.0-static-key.patch 1273 BLAKE2B 311b87ac48595b3276ce9c5651f813d13c4d39f7355903220a0d2149a52b6ed9e7c8c405a5aa0ef30aae5bd2c8b9f6c13211a68503dcd53ea3c981acdbf676d7 SHA512 2b91e6bdf0994ee276a201c277020e9dc12ef3e9d1f55e9d06d0eebb2599760a0810dc1f8a59e63d2b57c974f81b1dd55d12bfa243f81410d785f5516f91de18
 AUX networkmanager-openvpn-1.8.0-user_cert.patch 1037 BLAKE2B 4034034aa8c983d6a362f342fbb1639e9a691b2abee686ad916c888936eaad39c1bde0a6475a155a2f8d45cf3b34ddcfaa18850b9a93057b00bb4acfbd9be7f2 SHA512 86424821c47925492186a950bb16548a1d57745cb2ca462223d1944a71e8bb4cd330b88e8b60e60014a716505a1bcc80afae0aea2b2987a8e3b304c0064b8480
-DIST NetworkManager-openvpn-1.2.10.tar.xz 509148 BLAKE2B 956b9e32028e2b0b3dc2cf20b25a737f240c002b6271f4d64f23fa8f4a8c72f37fb32069daa8f5fdb77947a2b81a0a42d5656747c048096dd98c3c895893d79c SHA512 d597e8b3d2935c6874a283d2a036c511e1f3625aed7f5e6fbf5c77d3c3f5f6d170b19fe69202d74b2b1ac6d47d3704d3177598fd1889a19003fed98416ea6521
 DIST NetworkManager-openvpn-1.8.0.tar.xz 530112 BLAKE2B f26901d83ca22d3c3979ce61a558981c3e533a9376785014ecd99c932e9929dbc4b564d980785acb880ab027c2b98fe7fea242215122960025eba93ec423b58e SHA512 fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c
-EBUILD networkmanager-openvpn-1.2.10.ebuild 1243 BLAKE2B 23cfbb7e850d57957aa93fa71df13ba3454dfdc92ab100d04036cfa58fcce1b573d0635b453a6d12597ff42f20de30dc95599b68966172d44834dfd23caf6ddc SHA512 955a3cd12fff958a92408723971c478a3ff170171975cee1eec74c0c13bc551603286f96c5c0005705f563f56e28fa3a7c9b4d866ff3f9dbb9474b62d1f7dc33
 EBUILD networkmanager-openvpn-1.8.0-r1.ebuild 1442 BLAKE2B fe7fe98d03e869b1e1c643300c44bfa6514b6a2d487362477eed8204fe91c250f80e96822b8b487dfb0ee76c371c503723f51923f6e55acff4f39a288ebd5732 SHA512 7b769a310afa02e0a4aed20d3ff43fff4e67c452ecf325dfd0a25ad938c6d4e9f1e5d8873a150c66d0277aa88b5018a9c15307ab43095302a8e98781f7a89f20
-EBUILD networkmanager-openvpn-1.8.0.ebuild 1239 BLAKE2B a7b4a022a382f1c79a7fc174950834d8637daa5af6a4e70546b21ffec59bd3b571092fc6ab420d11223aa27a1964145c001d6bb4b059101605540f7a984ea075 SHA512 68094ec0ee4d0094560a49e8c6abc41675f78edcdb72cf1f88b4945ef0a6a32c81f42560952b83b19e9e5106c9d7f366b0c3162e8ebadca2694f1351b4ad30a8
-MISC metadata.xml 364 BLAKE2B 5ad394f27dbdfbc904fc2d854bdf5f29ee37f5a7b6a9abf05b622d16a5333f3b2a44c328cf4ce41b77438774b4d8c4489f4053e27523cd0c5629f2be5d1d887f SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-openvpn/metadata.xml b/net-misc/networkmanager-openvpn/metadata.xml
index 30c8deabf55b..996e7cacd217 100644
--- a/net-misc/networkmanager-openvpn/metadata.xml
+++ b/net-misc/networkmanager-openvpn/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-		<email>steev@gentoo.org</email>
-		<name>Stephen Klimaszewski</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.10.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.10.ebuild
deleted file mode 100644
index 2d450d056704..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-1.2.0:=
-	>=net-vpn/openvpn-2.1_rc9
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	enewgroup nm-openvpn
-	enewuser nm-openvpn -1 -1 -1 nm-openvpn
-}
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild
deleted file mode 100644
index 0f52e0906d8e..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-1.7.0:=
-	>=net-vpn/openvpn-2.1
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.7.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	enewgroup nm-openvpn
-	enewuser nm-openvpn -1 -1 -1 nm-openvpn
-}
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest
index 06b99f75521e..86f58016cf4b 100644
--- a/net-misc/networkmanager-pptp/Manifest
+++ b/net-misc/networkmanager-pptp/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-pptp-1.2.4.tar.xz 382512 BLAKE2B 94e0bcfa3d3574bad016cec571e134d713bf4df48480a3fd71d3313a7c90c76ab7e3b9c8def60ceed9fcf4e3035425e5fe9a1924694535970d6458e0d202acea SHA512 b8983c6a6415e2f8757e91dfdeba66a7ba1264c01569f39b6da830def86d2c09d1084f4b561ca5ff48511b48f83d94fa004342efd54862d235ab75a49e4e7b33
 EBUILD networkmanager-pptp-1.2.4.ebuild 1164 BLAKE2B b8109adb694a84b150b8e7ecf693e41cc1ff7accc49417068c0c80d447f93b7e79806571c995338ce864c97286adde5ca4ef3fb51f97cb58ac4dafc9c9c15b9e SHA512 1d7bfc257fe3927bf5591cdfa1e57c57fac968e56f28b6abd67ea284ed02aa8865aa662c1bd18a4979b90d41e6cf41d2d22d170ef2e46aba446ddd4d7726860b
-MISC metadata.xml 364 BLAKE2B 5ad394f27dbdfbc904fc2d854bdf5f29ee37f5a7b6a9abf05b622d16a5333f3b2a44c328cf4ce41b77438774b4d8c4489f4053e27523cd0c5629f2be5d1d887f SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-pptp/metadata.xml b/net-misc/networkmanager-pptp/metadata.xml
index 30c8deabf55b..996e7cacd217 100644
--- a/net-misc/networkmanager-pptp/metadata.xml
+++ b/net-misc/networkmanager-pptp/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-		<email>steev@gentoo.org</email>
-		<name>Stephen Klimaszewski</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
diff --git a/net-misc/networkmanager-vpnc/Manifest b/net-misc/networkmanager-vpnc/Manifest
index 73f570e4f26a..17223b646702 100644
--- a/net-misc/networkmanager-vpnc/Manifest
+++ b/net-misc/networkmanager-vpnc/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-vpnc-1.2.4.tar.xz 402428 BLAKE2B 64d4241e2d8339f0b92a2d56dac4d8fd53575c4ebd7767bb1aeaf3dd1028bf563410d9c323e118b1ac64a0dfbc54162e88f50061ee657f846c2aa679c2f4abd0 SHA512 313fec1b054870d14908df3eba6db28eaf4b3c45cdd745ddea682870a6eb058971bbc1dccbd399b2270ab63c6e8ceeeded12bf7b9c7eb283ea591b2c0715ecbc
 EBUILD networkmanager-vpnc-1.2.4.ebuild 1067 BLAKE2B c1cfe5a2e5cbf8b18270453a58d0d71d3b55d71ad8fb6799a0f990515df6b537fd8bae0db9ab250c1275bcc39adcf7203feb80c11dbbc02b3cddcd80f7166569 SHA512 685f946d3082aad04e2b03d834a52b669dcc02382fe994cf80c965ffdbbd650090c0c26c5ab18972b02f273eac82d38c7c9c6bb224bcf20165e161b8f5dc86e6
-MISC metadata.xml 364 BLAKE2B 5ad394f27dbdfbc904fc2d854bdf5f29ee37f5a7b6a9abf05b622d16a5333f3b2a44c328cf4ce41b77438774b4d8c4489f4053e27523cd0c5629f2be5d1d887f SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-vpnc/metadata.xml b/net-misc/networkmanager-vpnc/metadata.xml
index 30c8deabf55b..996e7cacd217 100644
--- a/net-misc/networkmanager-vpnc/metadata.xml
+++ b/net-misc/networkmanager-vpnc/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-		<email>steev@gentoo.org</email>
-		<name>Stephen Klimaszewski</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>