Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

35 files changed, 62 insertions, 404 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 701aec407a52..51096f95fa30 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aggregate/Manifest b/net-misc/aggregate/Manifest
index ed68fd908fcf..5fd95728f583 100644
--- a/net-misc/aggregate/Manifest
+++ b/net-misc/aggregate/Manifest
@@ -1,4 +1,4 @@
-AUX aggregate-1.6-build-fixup.patch 193 BLAKE2B 99a4266726eb7ef36cb58c5f3ace8c36bc1f923f453acb003f3f59af179ab88e5ef641b387c03912f476a8bb29a46fada6ce5b4b6382d7328fd06752134ba186 SHA512 6c7508f88da5f287b5dbf7e12bf5891722300d11d0c167659c816a28dd38e2cf46de928b4cda48ee8ff6b6201b01cc6a41bc22345eb478ab255b5c1dc2713b11
+AUX aggregate-1.6-build-fixup.patch 362 BLAKE2B 242d2f560b5d9d6c2c3e27453bc7ce7df63a9f3df127f5f52e3613a6bc1e0efd3288c05ca30998c169860bd44258129104bb2048dab9ec4d2861d9df95b96f39 SHA512 15fbcd2681187543ff0475cf08ff33ff3cf0cb74653229424209d931adf70f3b67c30434b62ae5a395252e579b45dcd51c68a80fcf5dc7ec4c1420370d246340
 DIST aggregate-1.6.tar.gz 20566 BLAKE2B 8d7c9b16063da1481a1be57e1de8e73d5ee54ab8fe539b116263582b951bc84396b174388ce6ea1ee8126a1b1ac49e4e69dcfad8ded37f32edd429d620c4971f SHA512 b6c48540a6905c5b0c2195c91c6b19fa537f1a746adb7e173642c3f0bd894cbbd8f4ab7203f1c6b904538c4b0f1ce13138c5e00e6f05567992bfc51b8b459f84
-EBUILD aggregate-1.6.ebuild 616 BLAKE2B 88fd060b446858374ffc23b39e1593a8a71f78cfa389364256fb7518c7e4481721952736b3188ac4a0204822420d31a5d63569ecbea20580e0443f34c7f1b77f SHA512 9c75a996a410ce1db0d75d996df706bf8a0034918f8a338cc1d046bea1b4431bbf594523d874d01d38b044f5e7e73884f95d4a1a7e63b5e9ce0eea34cb3ef7f6
+EBUILD aggregate-1.6.ebuild 651 BLAKE2B 228bfee5009dc4499261425636f9214225f46072af5369d6e36ed817474ea4b8d7eaa2b519a401e98393e601f8687f3ce9856bfc83faf763ac83e5974c837943 SHA512 5862c00f51063af12cb5b4a1b68c5b4e032c5f71223ea8c75c8ae64f31bd1113ae5d58dd62d70a5ad2bb75a098a8b325ca8bed00fa867b3150aa744c8b4970dd
 MISC metadata.xml 975 BLAKE2B 5478f76eb90bbdb4daee5ccc930312d6b1e6fa162e20824b1c6ee7c9371183ca3436fe000ba9b7c66d4b991ace6109b5ff4d0bd0453a7c055105e2d3007fc124 SHA512 f192380066542eb7a770edc78e4804f06b41bdc65dcd70a9a69618789220c220c7d97e9ba979e3cebb2d9813bf26664bfb7536d4c51e01071964561d72dac054
diff --git a/net-misc/aggregate/aggregate-1.6.ebuild b/net-misc/aggregate/aggregate-1.6.ebuild
index 8df22ac51199..a8700cfabbd5 100644
--- a/net-misc/aggregate/aggregate-1.6.ebuild
+++ b/net-misc/aggregate/aggregate-1.6.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit toolchain-funcs
+EAPI=2
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Take a list of prefixes and perform two optimisations to reduce the length of the prefix list"
 HOMEPAGE="http://dist.automagic.org/"
@@ -17,7 +16,9 @@ IUSE=""
 RDEPEND="dev-lang/perl"
 DEPEND=""
 
-PATCHES=( "${FILESDIR}/${P}-build-fixup.patch" )
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build-fixup.patch
+}
 
 src_configure() {
 	tc-export CC
@@ -25,7 +26,7 @@ src_configure() {
 }
 
 src_install() {
-	dobin aggregate{,-ios}
+	dobin aggregate aggregate-ios || die
 	doman aggregate{,-ios}.1
-	einstalldocs
+	dodoc HISTORY
 }
diff --git a/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch b/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch
index d16b62e12edb..51c9f9f96128 100644
--- a/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch
+++ b/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch
@@ -1,5 +1,6 @@
---- a/Makefile.in
-+++ b/Makefile.in
+diff -Nuar aggregate-1.6.orig/Makefile.in aggregate-1.6/Makefile.in
+--- aggregate-1.6.orig/Makefile.in	2002-03-06 08:59:37.000000000 -0800
++++ aggregate-1.6/Makefile.in	2008-10-10 01:31:42.613937925 -0700
 @@ -25,8 +25,8 @@
  INSTALL = @INSTALL@
  DEFS = @DEFS@
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index d4d2755638cb..704ca456567a 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,8 +1,7 @@
-AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec6925b7c8a1a0ef1ccd1a17f812d6289b2aa62a0cac5e12daeff442124a8eae7ceaafcaa9ea6420873d1fef060ae4263e3a0 SHA512 f49ae23e698acbc13c4455efa6edff4fb7f467b94711ed10ad34e8898d96985f401295d5402d66a410ad8e946a39d586f6d082f5393884963ddaf8fa10601af0
 DIST aria2-1.30.0.tar.xz 1497124 BLAKE2B 99bce103f1bd89b94e202cb7b2d9dc427398e0dec3517b25a3870515433b7be35fe2841b5ace049771181e6ce44acb82f8715c72347e7069acd6b003e33522ac SHA512 8c3deb4b58b9db9e8de52f48f6e863e07743ae4af14e2b2d64ddcac94b6aec16ff8d4f27e7d6076426d597af9e6e0988289f3a1c156796c9d79ee7f60f5edc38
 DIST aria2-1.33.1.tar.xz 1505208 BLAKE2B fb74add042d0cda81ca1b9c9d9b27b559ba859829c681520d6ece6322411f139667a1eaddc6f8aef23931e301ba4aab599ab17595df8d6ef477000f5e8fa83f0 SHA512 5379768a0960e46ed616a2540508d0dda4172c8d1a05021e50243241adb64448f5fa01878868ea206ec6b462fea39fa82284bb0f78ceec299eb289f94815b94a
 DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc
 EBUILD aria2-1.30.0.ebuild 4270 BLAKE2B a3dd69cd5a6dce0c86e48c3abad321d16223834508778e2a850aa89fdfc2871b8f6b7d21ed15af9fd0572f4875119f23766e8fb4844f8ceb4008e551afcfc975 SHA512 308fffeca540ccef4f9b2c86c895d1783e73ef138274b8d4a3d9f4eec7a921c7dd51ec6e0e0fdd1f08a4b988e1a8bc3edfa11c3ab3499d8009980c29ebe7af9a
 EBUILD aria2-1.33.1.ebuild 4277 BLAKE2B 8fe6f7b2df6988e9e89ae3da97d7d6561b28ac0fe4d3891147c04915158acfa806706fbb3152edb21a92ab6b7c6eb1413cdb36b03512ec45e4477e93591fc44d SHA512 5b79fa4264165da13935a75b20edb66edf315e7cb37180e0f02723209190d1c455b950844464557b7d5461d3048559a30835a8d7d067ab37cbf62d4227f221f3
-EBUILD aria2-1.34.0.ebuild 4324 BLAKE2B 9893b39ea8e7a7445ddcba77896f123ea076ef2a716e113da6dece94b0a83618b21e12c2c0733c1015dc389606b38245294ccf98f30d35c2245b433fe5becb9e SHA512 7a38eeb6f2017a5a2a18720f27ffdaeda028221f71f88cfe4074fb32962a8f4cf9c12290610788e614e8013b56acc1606b32f57e669ae9a45c2a2b3aa978b265
+EBUILD aria2-1.34.0.ebuild 4279 BLAKE2B 9cf69f77d7c677d9e16e4df5cd996b9b890442458942f9233b012570118e45d5bc62f1b912e5f3eac2d803c9d330300d9f0ee95e6920622265ef97a86acbf2b4 SHA512 19294b11d91156db6aaea36fea044b40f76687d1fd25f6b5271a6984f441e0ab463b3e8af7ea6b9e51d000b8247a96f133da6a9e101bfbc616f99f1e88016902
 MISC metadata.xml 1325 BLAKE2B 83433182337142e2aa760993e9b259c375158d834537052c816fdf81543aec6bb1786e3fe88dcc5d9f2fa9939ee357e470de2043998b30ffc5864d46e8cb5c86 SHA512 2fd19122ed71fd5bb2a50285bfa022f6f69fb0b5f610536d7fb71da5ef923c97743c0e2d228ba8712b818da526abe0bc60cb6829bb564d33d2cbe0b8aa93613f
diff --git a/net-misc/aria2/aria2-1.34.0.ebuild b/net-misc/aria2/aria2-1.34.0.ebuild
index aa58515c9fb6..330ad0add544 100644
--- a/net-misc/aria2/aria2-1.34.0.ebuild
+++ b/net-misc/aria2/aria2-1.34.0.ebuild
@@ -63,7 +63,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply "${FILESDIR}"/${P}-make_unique.patch
 	default
 	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
 }
diff --git a/net-misc/aria2/files/aria2-1.34.0-make_unique.patch b/net-misc/aria2/files/aria2-1.34.0-make_unique.patch
deleted file mode 100644
index 448d6cfe7753..000000000000
--- a/net-misc/aria2/files/aria2-1.34.0-make_unique.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From e8e04d6f22a507e8374651d3d2343cd9fb986993 Mon Sep 17 00:00:00 2001
-From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-Date: Thu, 17 May 2018 18:39:44 +0900
-Subject: [PATCH] Fix build failure when InternalDHKeyExchange is used
-
----
- src/bignum.h | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/bignum.h b/src/bignum.h
-index e59ab6bbf..5fb4402bc 100644
---- a/src/bignum.h
-+++ b/src/bignum.h
-@@ -19,6 +19,8 @@
- #include <memory>
- #include <stdint.h>
- 
-+#include "a2functional.h"
-+
- namespace bignum {
- 
- template <size_t dim> class ulong {
-@@ -31,17 +33,17 @@ template <size_t dim> class ulong {
-   std::unique_ptr<char_t[]> buf_;
- 
- public:
--  inline ulong() : buf_(make_unique<char_t[]>(dim)) {}
--  inline ulong(size_t t) : buf_(make_unique<char_t[]>(dim))
-+  inline ulong() : buf_(aria2::make_unique<char_t[]>(dim)) {}
-+  inline ulong(size_t t) : buf_(aria2::make_unique<char_t[]>(dim))
-   {
-     memcpy(buf_.get(), (char_t*)&t, sizeof(t));
-   }
--  inline ulong(const ulong<dim>& rhs) : buf_(make_unique<char_t[]>(dim))
-+  inline ulong(const ulong<dim>& rhs) : buf_(aria2::make_unique<char_t[]>(dim))
-   {
-     memcpy(buf_.get(), rhs.buf_.get(), dim);
-   }
-   explicit inline ulong(const char_t* data, size_t size)
--      : buf_(make_unique<char_t[]>(dim))
-+      : buf_(aria2::make_unique<char_t[]>(dim))
-   {
-     if (size > dim) {
-       throw std::bad_alloc();
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index e87396e2e511..7ee8175bdaf5 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -13,6 +13,6 @@ DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 564abd6289f0c9d3947b9074111ade8c2e
 EBUILD freerdp-1.2.1_pre20150326-r1.ebuild 2786 BLAKE2B fe5e87301c14a9f29b33ca4994abd5deeded6938631ed184139d452b49b98b957f03c57e709a4df6cda2627a773e6cc0bb7699bcba522aba7aa8548b4cafade9 SHA512 57788c008c8d32a69ae90ce741cca7b12d7b8d0808fd4e151bd99febb70b7d7d016dc6d586eaf9dfc3ef888cec0b752c0eb9805610ac6910dbd0808914bb5900
 EBUILD freerdp-2.0.0_rc0.ebuild 2907 BLAKE2B 1c4ff670b1e7db50ca56af231ce54a080095f8fce142bcb96cabf2908ff71ff11159e691a7e21fab5fd7e436f28ad644af6f710958c92a1908b77dfc7deb9407 SHA512 dc9b9e146822c84ed51e2221f10ba500ec51392f21f9d75fa3c10f1408c6f3fc266fdbc5f11bbf5dde566699e0e01ffd7bb0e85c072baa774e2933338fd2e9f2
 EBUILD freerdp-2.0.0_rc1-r1.ebuild 2892 BLAKE2B db7a01064767e64c2a7a70da24f61c41a02f0eb471f0f54092401a8b15865fcea61e9cde7e92e811a38e91ac90442523fc507ebb12a5df49c3fc82d94442fde1 SHA512 20910eaf36b9a4eb38231f96dc30443e760eae0f794d28a98f3187e424500e651f715ff79edb05400fea962a9d99cbc4c2ac32955391ac762e822eec666452fa
-EBUILD freerdp-2.0.0_rc2-r1.ebuild 2664 BLAKE2B 8612caa8fd82f99e1e6369ea991dd25270b9d7d104825038d6f0bc11983d43b84ac0ca15b02ad112072ab654b10f68372bd949b171ca0f9282dd0971be6b6389 SHA512 0c17d9a07ef8a13bfa8462eac1b3f19c3741e156e1dfd4e5fad41158cbd65bd18403b55cef9a04d0f3f5fb4c53a75c1f34b3405e86210823916eb2a10d6510be
+EBUILD freerdp-2.0.0_rc2-r1.ebuild 2666 BLAKE2B 09b3dd67234a155cb325a4f37b05e8963c3c6e2e13d5c4a83958333fd0a57110ea72c183ca8beb9e976172a6f5aab9fe929e8c86e6e56fcff8bf951c3629aae5 SHA512 4ca42234d7fcbd5312f8f5edb7b66203f41a2625d5ed8df022c789cd95097408658942e54ab86ee39fc5fe94678b5fb2221d69d9846521168f0e5c0dcd44f13f
 EBUILD freerdp-9999.ebuild 2615 BLAKE2B 6987e6d5cb42d17359e6403b61bd44417da1e61be7fe4495e6aec26306a75f1d53faad0f89a2ffe632a63c486988c4e8991196dc7ddb28dcf936870e6b289259 SHA512 e5215b3905e2cfc280d9b6f44a026b65df7cafdb9d50611dd857e09c796556eafeebeb1f38c582c6afa9083508ef571887dc8c9668b9d69ceb59cda86169518f
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
index 9b4af99905b1..c1097f2e6c22 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} != 9999 ]]; then
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ppc ppc64 x86"
+	KEYWORDS="alpha amd64 arm ~ppc ~ppc64 x86"
 else
 	inherit git-r3
 	SRC_URI=""
diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index 42c85f9ec89c..12ab0c200197 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -4,11 +4,11 @@ DIST grive-0.5.1_pre20160114.tar.gz 162888 BLAKE2B 49c163625c8c7fff33e66f823ff4f
 DIST grive-0.5.1_pre20160706.tar.gz 163646 BLAKE2B 04a9352c33fe713dbbc2b5f9381b0982a6cc3b9e3f5ef6dd36ccec25878e317ed8bb214e449ff0161962cba1318dc4641187ae605844c749bcfcc164f5afc2d5 SHA512 05496c9d38b13804b5839cf6a5d64a588e670b0e6d2796fe7f7a66267ade34f22bde28cf34210a4f2d36f12671ba38c963b3fc3fa6f8f80ff8b143aace648b52
 DIST grive-0.5.1_pre20161004.tar.gz 163085 BLAKE2B a9f450a4e32f3299922f5e26456370f7f3fd8e4922d7dba5d58e6076ed8bfc0152427510d33c58d90ab2427b534b4f4fbbf913061fac937f2c8af1e0b2367c40 SHA512 1de5c2956d898d0a67e28469d7cf054e83b63f6dca736a60f875fbaac3197bc425432c43db2472e87113df2fa5da49eff9e17cd33610ccda7ba5bf0c2d4966c0
 DIST grive-0.5.1_pre20171005.tar.gz 164450 BLAKE2B e8fde261ec419c1284575032ce326de4953ecf7b4824a70aec07b41f6013b4d26532ba0eae3897c910bd5bb51949dcc13fcb699013557f24c38c75fb251e868c SHA512 d1f2b3bb5206aef3afeebd48f198a287f97a016f5da00f954fbdcf366ea7178c0e2c6e48250cdb0869bc850380ed09790b5bbdc1ecf3cdd7b484fcf9b85c793c
-EBUILD grive-0.4.0_pre20150905-r1.ebuild 757 BLAKE2B 6cde3a7107cb87b4f83bbef9cdfdfe0ef4b546d702d8bb090c01351e4e7945df1e0922fe3dcdc1eac24ec787049c65312f964d19b920190cb862a1fd1fa238f2 SHA512 04405f22f6fd0974e06911f807cb9b2d07f026cdca49efbdae6f382507a802a665da8e7892fb0b0d51120849bf55e3e28ccb1046a4234a2e4a7c0dda4da1ef91
-EBUILD grive-0.4.0_pre20150905.ebuild 730 BLAKE2B a8d2d3bb89eab9fc25b183ff795f42820071094d154d2b2166525db8442b9f360185ee718db995fbe4d891fcd617da31b4268442bf388fe795c4018944e145a2 SHA512 56614f95a73bbaa3fbd9e16eba3d0acc06a9afeda7c8b30501183c5fd44fbf1b16c7ba6236fc4f580bfdae8da182f55e2d50b1d95b0374a4626b7401a1c9e3a3
-EBUILD grive-0.4.0_pre20151011.ebuild 757 BLAKE2B 0dc7861261e2226f53b16d4733a6e8e7ba2dce39348a826519d6c1b33ab5ead0f5b75cab2974f31e202f79c83276e3f00a391ab7cae9022bc5d6bad4e05dd25d SHA512 9c82af5c69d2e668e7a00b9142d867ae32dba67de5f300acaf649ffd6662fd3707c08cad579feb111c997f7d87a0af41d39f73998aebdcc43ae3cc351ace8d52
-EBUILD grive-0.5.1_pre20160114.ebuild 757 BLAKE2B 845a649df6946c8cb6f5df6b8d56a8567cb1ff5e0571bf62445ad338b5594c44eaa7a9efcfdc99efc047d950e866257d1a2e103ec67cd7cd32b9e0cab19e9272 SHA512 6df633cbbf8619c06bdfac65865ef8a1f210cfa38de358cae55d2920ce7bb48821976cfaf04f080a280916d52e55f214e76f378c292a02c50bb40ed06a2780ce
-EBUILD grive-0.5.1_pre20160706.ebuild 813 BLAKE2B c929879692b6d64a9ba94a86328e13177fcf9832f7964d848c1889fc0c19b18807c35e8b054b3d614918e4017031ec2bed9beca70dc633e7660d6790b1c56acb SHA512 be0fcedbe5843d13a696024822b1ae0b54d7c1e0779f66f366ea7700b5cead43a97feb7e31c5ad7773319cde1a9d513e7b7e2398a10857b680393042f7fe14f9
-EBUILD grive-0.5.1_pre20161004.ebuild 813 BLAKE2B ae45cdb3667199e44e7daf883011849549ab5970f2c70901bb7280d9161cb8bcb36cf08e65853cf0352253ee861e56ac0e722dedfbb481dbd48cd7c00c21aeb2 SHA512 e6dc360c9891f239b5e51db71b16079989f9300a961b43f8d897f01ce8024523a5ff32785a643694ca85b6b6b31ef724851b97c211a1566d39ea410572499f49
+EBUILD grive-0.4.0_pre20150905-r1.ebuild 756 BLAKE2B fc81fb971c8db7e61400c782e0ee6cd88be6061df059892133f225e8bdd7c1a127eae0b2d96f4cb950deb1a9711567308a793770d272e274c3d3428f541f3274 SHA512 42f1338b6ff0290c6f2c3ff2c415790dbef5200edfdf11e349a1a4113375c1a59aa270a22d86c449c6fecccf5ca2b066557c733b418816a79ec3a78e59ba34d6
+EBUILD grive-0.4.0_pre20150905.ebuild 729 BLAKE2B 136dd90da79b8aed26bfd0d02cfd5946ca6036b05be1fbe1c6cdecb805ae8bca5fc76e29279fd8aa956ef92fcb90e18deef0789c92fe4de2fe8216aed904ea75 SHA512 2bb48709a5ef707789bb8ee82eb146c467b11569b55fb420ee5fb6bb1227e306ad8a443c8ba69065e6e645d81b7457d61cf1ba4d0f8c7b55965db962a095854f
+EBUILD grive-0.4.0_pre20151011.ebuild 756 BLAKE2B 8b230e348ff9b312579d947e87e0d3ee961e5886283c92cc6ac066658706fad4ca84b92edd1e0ca053fb1a6fdb8001240eb51f8b0603491bd30b2eb2229b7b23 SHA512 e5a8a365d6df018fb8d17b86becf6a00816518a81ead442148d49b6f937b3fac96f9dc5865846dba788b662f104142278312f88e4e4be72084700150451223ab
+EBUILD grive-0.5.1_pre20160114.ebuild 756 BLAKE2B 153f8c6993eb041c53ad54bc1aee77418b6855953014592f5d2a6d58d108bf4ef687e575409d432d5b2b4b0acdba619e7eefd9e36615ce62ceb5191fbf3886ca SHA512 93784b777dfbd9614856b9ead55cedf7dc3ef216cdf6533a22b82b9b9e28d634a173f33482a929e42c303d13e1390c9468007110a5dc7aa5c51dd30308a396c6
+EBUILD grive-0.5.1_pre20160706.ebuild 812 BLAKE2B 032fab05b513ed69625ef23be2eee0a086fe7ba452cf3fdf512c9a734b880bf60c7cb7174c03aa555e77a3a03c161603ffdc632d8f5133f8d9769d8563328bb8 SHA512 c352c56b885251e3e7d0243ebfa23dd5945dd57b010e277c595f9ac93657cde1ccddcc3cddabf9356433cedc47b47b861906133fea3a3b5985c8d6125cffd161
+EBUILD grive-0.5.1_pre20161004.ebuild 812 BLAKE2B 2c277402936d52ae18951526ca66760acfd834795e026cc64bb4a9c5d00d08cef4bbc716759839f5cc5407b1cced4c017523b8e36423c405ca3961cc7e0d12db SHA512 7b0dab16186ed93f95dfedf9f9ab04aef9bb0a259843e178fc8d83f47f8cbae0d45fa98d246cd39394a4612ce9a47b7e6e53de5cef31209d67feb144eb1496cf
 EBUILD grive-0.5.1_pre20171005.ebuild 813 BLAKE2B 9de64618d8ca394c204334c603befa1b74338d61247c16820c21af0685cfd8ed8439942d857c7e878c404a3fbb55594cfb8effcb7f4cf1bd97f388ee3e9140a3 SHA512 8efff2dace77362f70f1c5c1ff9d51ac23da448301bca844b670183982f733c599a2ff9e1f09f2f0be0f86894e8458f3efa05c9e49a1843031153cde8e01bb7d
 MISC metadata.xml 329 BLAKE2B 29317b0c9304da834a9876bf09262b2e6d8664978ec04973bfcb6b196efa71d3405f758176662a2af32b780f5819cf4980a4ed21f079609ed8b50109a176a438 SHA512 532fad0c5d87182dc633286d564f01cfe82a455b8514e2147de1bcc366d3d6655917936bedfb5ef8182266cd9a270efbe0e77fcab654b1472c244b260d2b3997
diff --git a/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild b/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild
index a371012753c7..3aa16d50332e 100644
--- a/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild
+++ b/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 if [[ ${PV} = *9999 ]]; then
+	inherit git-2
 	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
 else
 	inherit vcs-snapshot
 	COMMIT="5dc7028c8aebb26d35ed31c4b07ac180cc1887c9"
diff --git a/net-misc/grive/grive-0.4.0_pre20150905.ebuild b/net-misc/grive/grive-0.4.0_pre20150905.ebuild
index 0c2271c2d939..941ca8119a87 100644
--- a/net-misc/grive/grive-0.4.0_pre20150905.ebuild
+++ b/net-misc/grive/grive-0.4.0_pre20150905.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 if [[ ${PV} = *9999 ]]; then
+	inherit git-2
 	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
 else
 	inherit vcs-snapshot
 	COMMIT="5dc7028c8aebb26d35ed31c4b07ac180cc1887c9"
diff --git a/net-misc/grive/grive-0.4.0_pre20151011.ebuild b/net-misc/grive/grive-0.4.0_pre20151011.ebuild
index 53516923c8b6..1546398dab75 100644
--- a/net-misc/grive/grive-0.4.0_pre20151011.ebuild
+++ b/net-misc/grive/grive-0.4.0_pre20151011.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 if [[ ${PV} = *9999 ]]; then
+	inherit git-2
 	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
 else
 	inherit vcs-snapshot
 	COMMIT="44cb91f94e67bcdad77ca564b4d8083cedf72251"
diff --git a/net-misc/grive/grive-0.5.1_pre20160114.ebuild b/net-misc/grive/grive-0.5.1_pre20160114.ebuild
index c60351f4ddab..9e85ba1529d6 100644
--- a/net-misc/grive/grive-0.5.1_pre20160114.ebuild
+++ b/net-misc/grive/grive-0.5.1_pre20160114.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 if [[ ${PV} = *9999 ]]; then
+	inherit git-2
 	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
 else
 	inherit vcs-snapshot
 	COMMIT="cfb8ff08b300d1fa57e12cdc85f724e3e25c906d"
diff --git a/net-misc/grive/grive-0.5.1_pre20160706.ebuild b/net-misc/grive/grive-0.5.1_pre20160706.ebuild
index 7e7ac90236b5..bd19981b730b 100644
--- a/net-misc/grive/grive-0.5.1_pre20160706.ebuild
+++ b/net-misc/grive/grive-0.5.1_pre20160706.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 if [[ ${PV} = *9999 ]]; then
+	inherit git-2
 	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
 else
 	inherit vcs-snapshot
 	COMMIT="457d84974592ed3f123622b12f2a7a748cbc0668"
diff --git a/net-misc/grive/grive-0.5.1_pre20161004.ebuild b/net-misc/grive/grive-0.5.1_pre20161004.ebuild
index 76c1a3633a94..5990f75e9ceb 100644
--- a/net-misc/grive/grive-0.5.1_pre20161004.ebuild
+++ b/net-misc/grive/grive-0.5.1_pre20161004.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 if [[ ${PV} = *9999 ]]; then
+	inherit git-2
 	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
 else
 	inherit vcs-snapshot
 	COMMIT="7bbb01c3014cc996ec24a7e5c0684f24b604b735"
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 535c775a62e5..d544b4d39c0c 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -6,6 +6,6 @@ AUX rarpd.init.d 583 BLAKE2B 527579b7cc8211af9910702ff730b0911cd84dc2efe8c5272b7
 DIST iputils-20171016_pre.tar.gz 195254 BLAKE2B 1170db29d53dd8285b11d4df7b7da2ea3bd2be3599a3f0df85ca7e64247f2a534d03e43a2b6267ba4b9c0b65fcc58045151833ae2c1035a839ed728a389804af SHA512 570896fc58d945e08032134701ab6ea02bbf6fff420437bc5f89687cdcce6f3c1c64418a4c5ff54ca3cdc582bae2c95e196b2c8368eba2b163ebf88490aabf99
 DIST iputils-manpages-20171016_pre.tar.xz 29764 BLAKE2B 47def1413b2cdcfba7f924dd7a045063c289c244ba8fb4dc43caf2a8d52032b57ee6d86ee4dffd5351faa3124d4c83a33ca3365866568c2164b374eed9d70ec0 SHA512 31b4b0b4e46d7c98530577392c636e4397917cbe415762145a119e68e3223bc85b9d5afcfe61ae01584a35f6a1a772adffc52deeedc722c474179fa1d208d8d9
 EBUILD iputils-20171016_pre-r1.ebuild 4045 BLAKE2B 8762cc82fd5c71865106bf2e9763fa5150a8228b292e617654279e517e5a3f4bebc50f312133740d4c54d0ef0a75abac2e42775cd9d865d41b5444e75f56769a SHA512 397bd386cfff8a3551af24ac67677de021e56bf75908e6495e9e4b7eeb6bb2435b7c72101b78523da7e502d1a7fac92d5640d45a1da463986f01ec5230273c95
-EBUILD iputils-20171016_pre.ebuild 4082 BLAKE2B 8c9aedbe404bd31ddcb466b93eb6272eebba0e3fa18f7a0de285dd7aa007894614a47a9cab018f6c5546a172ca3ae240b7fdcf6196eb3cdd7a6fcfc6d34cd652 SHA512 08f92d29d3baeb0eadac360b5a7f81e550d264fda70945b416d38ae39239e75ef201587d7466d6a9431df1a4be28c62e59d11b685fc811f40f1c755bbae2637d
+EBUILD iputils-20171016_pre.ebuild 4083 BLAKE2B 61875f5e10d286863e236a678f462f4e4231d0e572090c043549143a85a60149cd783f8ec0ca04bd02cd1eea603394a802c56895adbb8633a7d404adee871d47 SHA512 d5e72c510f6e7245288a05f47dd4d7ec5f7b5563fd291ceab7da61dacf308e586f48bca00d93d9e1bd987e4c499784214b60d15f10f1c8bc3a82880a28af65b3
 EBUILD iputils-99999999.ebuild 3861 BLAKE2B 49cda306c5a9d1bc7200b1f1256f3ef867b0b573aa9b0620f98ec77f679e0599883fdff56de559fb06f0510d5d13960bb0bb998bfe0d42b737f08484066cf1e6 SHA512 26607fbcf1fc36f8c44ab10922866d6cc076dba5cb08dc3c0ffb7921dec0e188b7e680f61148616d172a73e27029413834aae431a87c9163e06837fc904a0b83
 MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc
diff --git a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild
index 8d1bbffafa10..dd1474007962 100644
--- a/net-misc/iputils/iputils-20171016_pre.ebuild
+++ b/net-misc/iputils/iputils-20171016_pre.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
@@ -35,7 +35,7 @@ SLOT="0"
 IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn:=[static-libs(+)] )
+	idn? ( net-dns/libidn[static-libs(+)] )
 	ipv6? ( ssl? (
 		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
 		nettle? ( dev-libs/nettle[static-libs(+)] )
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index f15f135c0b11..b9a585e1d924 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,6 +1,6 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 DIST ModemManager-1.6.12.tar.xz 1402364 BLAKE2B 11335c495cc428936c9b0dd319449a7bf4c58a95ccd53b7a5bb276d78030272a7f29e5f0fa96a96613c5e0cb6a62239d864a23de6260fb55f6ecab09a18e6454 SHA512 2ac72fb2d36530204528cc0cd4815d0b93a1a8c8539ac345101e5e15bbfffd3eda888bbdc54298d3547b9aeacb94c75be5c600e993099671da2f9f27e8ee93cd
 DIST ModemManager-1.6.4.tar.xz 1464276 BLAKE2B 5c5688c678f7b511d8097e47f143c04733b1d8e6624d7b1deb9dad286ccafa3f37455956f19d6d76a00230a044662a7c59275c41f7530b9829a602f968214ca2 SHA512 6b31ce186adce445cec8964df751b6146a86271e6c14d860740ae66cfe296ac2ac4df21079357775ac5f7a5837c80a7f8db21a2680bc6b45802f9928565f1c73
-EBUILD modemmanager-1.6.12.ebuild 3144 BLAKE2B 12b99b2b45f0f7a2b8e1ead4f49bf79d261e136f80d941d0d976e7454b355a492a22694a790c0aa69ad2e7e532b59ffbee38e8ea802ad66fc2863ca40136b371 SHA512 d84f200738fd8b6d43af2159a53f37ec1192782153544b63211819315e6810cea7cb0586a57b0e4f34eef6425d859d88622a88609a702be868c14e72f4466994
+EBUILD modemmanager-1.6.12.ebuild 3145 BLAKE2B 564c89078c5004a856fd11a60d1250449df3729ea8d55ff11e0c71a4c53b6f86c62c63c3c8f956f7ca4d5e0357e638f77c2a7942b7aec8e0470d4308cab06512 SHA512 0aba6f47661135f43a5e885216f21d7e467e275a81d9b86a0fd58ca0dedb21ee213930954d995c4f3b167065e068ac09412aa1dafc649a5fd136b04ba9f59e8c
 EBUILD modemmanager-1.6.4.ebuild 3143 BLAKE2B f8aa5e15ddc777b96ae2230a97437ebcefa1f36074e15bc880efa90920fdd4ceb28449e453f3cb39b11589fc0cd5110117b09edd87c1aac1b3d216c518658fce SHA512 edbe21effd6e22319d1f859d0f8c868725d6574633f2b311c191fd57d33ad6930547b84fbab8cc7a39303748b61dbc990fff63181e1710ca17b02ac72352376d
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.6.12.ebuild b/net-misc/modemmanager/modemmanager-1.6.12.ebuild
index 9e0baba934fd..acdbe601c4bf 100644
--- a/net-misc/modemmanager/modemmanager-1.6.12.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.6.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 IUSE="+introspection mbim policykit +qmi systemd vala"
 REQUIRED_USE="
diff --git a/net-misc/omnisync/Manifest b/net-misc/omnisync/Manifest
deleted file mode 100644
index c438f0280297..000000000000
--- a/net-misc/omnisync/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX omnisync-1.0-help.patch 806 BLAKE2B 8c82444278b5da9411b8babee5e6690825b800ee279873d3e9bb936f0c0c35d5f701de8b05c4cf6af02af1c961c9d902c80e155e15bb5f9683921188c3515a94 SHA512 f131ef883a9646a093dde18ea2c78cd54d0ba9d9541ed600a03521e595f9100e7df4145488ee3b52e61449b98f3e7bd65251ead8f369595e36f174373c51b690
-AUX omnisync-1.0-maxshm.patch 652 BLAKE2B aeafe8b36d6bf49e426ee1f78514a5f9cafb12f3ef2787d030b076178484a7b96e22f939ce285e0d6ab4c39c50ae12baeca841a5a88f4989e2c5348d52ebff3f SHA512 883c8509357ba00c97e09f4bf96b402999ee1100796c147441f72811f0b475a8d37f05fba7a33d341be759c42c52eee79338da4dfbd65fd0ae246bca13ca4c4b
-AUX omnisync-1.0-statfile.patch 434 BLAKE2B f003723bd48fff0b7c54b3f187744ee90fe1266b7dca85c445004f85e60af86f12427bd81323b0db12ee03f4c417b833cbb3bc7a65d58b89ca21d76ccb1d86a4 SHA512 2e613f85820f1c17c9c6afbb30d2f0607b69d90d2c496dd281b457d5f5658270513b40a72f14b165a2cb29df69c296007ec8039424e5dad227d0aa41b55c189f
-AUX omnisync.confd 970 BLAKE2B a3d678032e7520d359fe078cf4599e98d75a5f3444bb5e1b08ce3cab246424f6d22c153dee45c66417682212adbe0b3c3c9730b41ca36dde5449ce48e8b1a202 SHA512 f3bd6b0eb866eb6650615fd4a838f07afcbb8b9322b12658a855fcca2ec72171b035aeec5a5bd38bb4f4ad14c32647ad14d994df7058d99dbb9d333a309ccfdb
-AUX omnisync.initd 618 BLAKE2B b532cb4f9c0b763ad97d1098e34e8d4a0b14195698f0f6f518de4e25744058cbe5c66ec53a00eb7bffa9191741d78a75ee3029683e13092a3f227d4955cbecec SHA512 f1c116743fde8578a9812553640da3f680911469d8e38b0af007d69aab99038bed651436f7d9dd5ed8dc939fdd3b94a75c93d15b4bda866460b63c7253788941
-DIST omnisync-1.0.tgz 27725 BLAKE2B 00e546e3a04c8483f4a3995207fe6715e25526ca639f517220725c31d50d1c01fe0d15927e11e84143f3b2c8aa80ede1317c818945f0249147548bb03d27f744 SHA512 742ffc0a85bd923b99ae7e4f50a6aaa29107eaa987039e902797c78a9673e914e1fa61b2484c6777f62b0caf8b3110a071fd103c8b18456083883df534a1ef4d
-EBUILD omnisync-1.0-r1.ebuild 1193 BLAKE2B b894dab0a684559a1aae511c5e7df44f18357d6ffff6eb7c7c310f861c88a69d081d2f2625e2b57d14f5c24c6d6be2c4605fa9811472d97e52be3fecc694c81a SHA512 f708dedd72699462b0ed1fcd9e51b4382b112563462457147378d51bfc9e279f4955e45fabc7363316ae79e0eb624f9ad15f63b75f4feb1c3fb943b4d3ab88e0
-EBUILD omnisync-1.0.ebuild 1046 BLAKE2B 7f9b71a811ee74684d4fd814e457a38e987fa83ba877632c0bc7e1a3620705cbac1c1373b8d28f27440197854d4631661c97b0ca605a1b90cb9fb3a3ce97d047 SHA512 bbd43bb6e8882385fd203e5bfe62acbd5f104e5eaafbd177bf9a008d37b4cefb6d22624b269385635a3a61dd11cb672a7043ffd576bd63e0211c3afb135e3110
-MISC metadata.xml 242 BLAKE2B 8f242b6b14b8f22e005169c7c07b6d685e7c1ad269b4de100c7bca4e148a1f25dda103b7e213309b5509d51d14170498206d9bdb7d766bf986a00eaec55b9480 SHA512 c4931bb9ba45348c61011844649be8a5879b84e48316804989379694c692d96d29794eb38c642d0036ed9e61c4864c605340d6cfa6753519b66b05f26545f0a4
diff --git a/net-misc/omnisync/files/omnisync-1.0-help.patch b/net-misc/omnisync/files/omnisync-1.0-help.patch
deleted file mode 100644
index 47ff5201c030..000000000000
--- a/net-misc/omnisync/files/omnisync-1.0-help.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-main: fix help missing newline
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' omnisync-1.0.orig/main.c omnisync-1.0/main.c
---- omnisync-1.0.orig/main.c	2009-01-02 01:03:20.000000000 -0800
-+++ omnisync-1.0/main.c	2018-06-01 14:31:25.720686155 -0700
-@@ -139,7 +139,7 @@
- 	printf("-c x   community (snmp only)\n");
- 	printf("-h x   host to connect to\n");
- 	printf("-u x   ntpd shared memory unit\n");
--	printf("-z x   do an initial step, to speed up syncing, parameter is number of samples");
-+	printf("-z x   do an initial step, to speed up syncing, parameter is number of samples\n");
- 	printf("-S x   write measurements to file x\n");
- 	printf("-n     do NOT submit to NTPd/set clock, query only (use in combination with -v and -f)\n");
- 	printf("-f     do not fork\n");
diff --git a/net-misc/omnisync/files/omnisync-1.0-maxshm.patch b/net-misc/omnisync/files/omnisync-1.0-maxshm.patch
deleted file mode 100644
index 678c6e0072dd..000000000000
--- a/net-misc/omnisync/files/omnisync-1.0-maxshm.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-main: raise SHM unit limit
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' omnisync-1.0.orig/main.c omnisync-1.0/main.c
---- omnisync-1.0.orig/main.c	2009-01-02 01:03:20.000000000 -0800
-+++ omnisync-1.0/main.c	2018-06-01 14:32:34.630066839 -0700
-@@ -346,8 +346,8 @@
- 				unit_nr = atoi(optarg);
- 				if (unit_nr < 0)
- 					error_exit("-u requires a positive value\n");
--				if (unit_nr > 3)
--					error_exit("NTPd normally supports only 4 shared memory devices, still continuing though\n");
-+				if (unit_nr > 254)
-+					error_exit("NTPd normally supports only 254 shared memory devices\n");
- 				break;
- 
- 			case 'v':
diff --git a/net-misc/omnisync/files/omnisync-1.0-statfile.patch b/net-misc/omnisync/files/omnisync-1.0-statfile.patch
deleted file mode 100644
index 972316a33bd1..000000000000
--- a/net-misc/omnisync/files/omnisync-1.0-statfile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-main: wire up stats_file variable
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' omnisync-1.0.orig/main.c omnisync-1.0/main.c
---- omnisync-1.0.orig/main.c	2009-01-02 01:03:20.000000000 -0800
-+++ omnisync-1.0/main.c	2018-06-01 14:39:22.115229735 -0700
-@@ -358,6 +358,10 @@
- 				version();
- 				return 0;
- 
-+			case 'S':
-+				stats_file = optarg;
-+				break;
-+
- 			default:
- 				help();
- 				return 1;
diff --git a/net-misc/omnisync/files/omnisync.confd b/net-misc/omnisync/files/omnisync.confd
deleted file mode 100644
index c2ab3cc58f0e..000000000000
--- a/net-misc/omnisync/files/omnisync.confd
+++ /dev/null
@@ -1,21 +0,0 @@
-# REQUIRED, must be one of time/tcp time/udp daytime/tcp daytime/udp http https
-# snts irc icmp icmp snmp simpleptpl socks5sntp sntp
-OMNISYNC_MODE=""
-
-# Options to add
-# -F x   fudge factor (default: 0.000000)                                                                                                -m x   max. offset (default: 7200.000000)
-# -p x   proxy-server (http/https/socks5sntp only)
-# -B x   bind to interface x (not for snmp)
-# -I x   username[:password] (irc/socks5 auth. only)
-# -c x   community (snmp only)
-# -h x   host to connect to
-# -u x   ntpd shared memory unit
-# -z x   do an initial step, to speed up syncing, parameter is number of samples-S x   write measurements to file x
-# -n     do NOT submit to NTPd/set clock, query only (use in combination with -v and -f)
-# -f     do not fork
-# -i x   check interval (default: 60)
-# -d x   timeout
-# -U x   set user to run as
-# -P x   write pid to file x
-# -v     increase verbosity
-OMNISYNC_ARGS=""
diff --git a/net-misc/omnisync/files/omnisync.initd b/net-misc/omnisync/files/omnisync.initd
deleted file mode 100644
index c71e63d4d3e3..000000000000
--- a/net-misc/omnisync/files/omnisync.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net dns
-}
-
-INSTANCE=${SVCNAME#*.}
-if [ -n "${INSTANCE}" ] && [ ${SVCNAME} != "omnisync" ]; then
-    pidfile="/var/run/omnisync.${INSTANCE}.pid"
-else
-    pidfile="/var/run/omnisync.pid"
-fi
-
-command="/usr/sbin/omnisync"
-command_args="-P ${pidfile} -M ${OMNISYNC_MODE} ${OMNISYNC_ARGS}"
-
-start_pre() {
-	if [ -z "${OMNISYNC_MODE}" ] ; then
-		eerror 'Configuration incomplete! OMNISYNC_MODE not set'
-		return 1
-	fi
-	return 0
-}
-
-# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
diff --git a/net-misc/omnisync/metadata.xml b/net-misc/omnisync/metadata.xml
deleted file mode 100644
index b651dc535e37..000000000000
--- a/net-misc/omnisync/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>grknight@gentoo.org</email>
-	<name>Brian Evans</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-misc/omnisync/omnisync-1.0-r1.ebuild b/net-misc/omnisync/omnisync-1.0-r1.ebuild
deleted file mode 100644
index 5875550ac80f..000000000000
--- a/net-misc/omnisync/omnisync-1.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A driver for NTPd for people who are firewall-challenged"
-HOMEPAGE="https://www.vanheusden.com/time/omnisync"
-LICENSE="GPL-2"
-SRC_URI="https://www.vanheusden.com/time/${PN}/${P}.tgz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/openssl:0= net-analyzer/net-snmp:="
-DEPEND="${RDEPEND}"
-DOCS=( readme.txt Changes )
-PATCHES=(
-	"${FILESDIR}"/omnisync-1.0-help.patch
-	"${FILESDIR}"/omnisync-1.0-maxshm.patch
-	"${FILESDIR}"/omnisync-1.0-statfile.patch
-)
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i \
-		-e 's/-O2 -Wall/-Wall/' \
-		-e 's/-lsnmp/-lnetsnmp/' \
-		"${S%/}/Makefile" || die
-	use debug ||  sed -i -e 's/$(DEBUG)//' "${S%/}/Makefile" || die
-}
-
-src_install() {
-	dosbin omnisync
-	newinitd "${FILESDIR%/}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR%/}/${PN}.confd" ${PN}
-	einstalldocs
-}
-
-pkg_postinst() {
-	local isConfigured=$(grep 'OMNISYNC_MODE=""' "${ROOT%/}/etc/conf.d/${PN}")
-	if [[ -n "${isConfigured}" ]] ; then
-		elog "Be sure to configure ${PN} in ${ROOT%/}/etc/conf.d before trying to start the service"
-	fi
-}
diff --git a/net-misc/omnisync/omnisync-1.0.ebuild b/net-misc/omnisync/omnisync-1.0.ebuild
deleted file mode 100644
index 6c0ff7635dcf..000000000000
--- a/net-misc/omnisync/omnisync-1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A driver for NTPd for people who are firewall-challenged"
-HOMEPAGE="https://www.vanheusden.com/time/omnisync"
-LICENSE="GPL-2"
-SRC_URI="https://www.vanheusden.com/time/${PN}/${P}.tgz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/openssl:0= net-analyzer/net-snmp:="
-DEPEND="${RDEPEND}"
-DOCS=( readme.txt Changes )
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e 's/-O2 -Wall/-Wall/' -e 's/-lsnmp/-lnetsnmp/' "${S%/}/Makefile" || die
-	use debug ||  sed -i -e 's/$(DEBUG)//' "${S%/}/Makefile" || die
-}
-
-src_install() {
-	dosbin omnisync
-	newinitd "${FILESDIR%/}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR%/}/${PN}.confd" ${PN}
-	einstalldocs
-}
-
-pkg_postinst() {
-	local isConfigured=$(grep 'OMNISYNC_MODE=""' "${ROOT%/}/etc/conf.d/${PN}")
-	if [[ -n "${isConfigured}" ]] ; then
-		elog "Be sure to configure ${PN} in ${ROOT%/}/etc/conf.d before trying to start the service"
-	fi
-}
diff --git a/net-misc/pedro/Manifest b/net-misc/pedro/Manifest
index 72214a5acdca..2b9f30cc99e5 100644
--- a/net-misc/pedro/Manifest
+++ b/net-misc/pedro/Manifest
@@ -1,5 +1,5 @@
-AUX pedro-1.6-portage.patch 713 BLAKE2B 506efa96dd6532685b56c893edf9df4d1dac1310ea4d1dd572d37c5e3f9a343eadcb080c67fd6c58ce1db215c23cb063838a785e65894c952322ca4ef0d981fa SHA512 c4ef62732f811557f12a35237ecdbc435660b3bfc45312abe43850936e12f864c21ee577a6c268256052328c9d5fb5d2fe0934adf67b406bf6146393e569c0df
+AUX pedro-1.6-portage.patch 806 BLAKE2B 13fcde3498d697eabda3b18462f9c517a36bc9289347487925c91f07af87f7256ed644aae5eace3583a5171ce2ab21cb07753f31a6be49c8f25dfac75ebca017 SHA512 964527b3f480f7e009dd60a4f0e1b1c32a58a50dc358cc3975934db95c9ca34270463d3bc12cec9fd5d93234a1ccf83a5fe4666cce8cd684427c8ec11d34b6cb
 DIST pedro-1.6.tgz 711856 BLAKE2B 5027dd438995e212889786996debb5765d49828d38ce715672e44776b5fb63db0d6bca0e72339fd5067254aed0b731d3f77656ad510d978e4f456af45d6cf008 SHA512 263f53e447d4b3baab405a1d7313fc397f8a62958957688265c7485a5697b642138636659b5515b9010341655ba8045e5d85f69a86c20baa28edc0dcff0aef42
 DIST pedro-manual-1.6.tar.gz 222863 BLAKE2B 085b118585808aced9217a8001080b589d9dad958ad14787f929a4808b10bb2be80ae7bc04c07b676e41aed9e2ec916215c5d15dda2317f71ecebbc7c1737d96 SHA512 87f8e07e3a687d12e366f1974398996f2346e417680ab534622f901c0c7e1efeb171f0c0dadad46b578122c9e98531570c303d2d3ce04b1cd8150816d6138f99
-EBUILD pedro-1.6.ebuild 905 BLAKE2B aa651f37af140d2439d3574236b95cf9f68039bb93cff5559c6aa8b77dc174b016dd7a0d58b577001a6b6a77bcd7f01260421c156b3e11638014faf9707096e6 SHA512 e5e402079e4b5e9ebfefb59a3ac64b77aedc2b5dd5be6735ec451bd0e34bc75d186302970752728dbc2b4d11f6e49c510908275b690c5727ded6e9eb07509b38
+EBUILD pedro-1.6.ebuild 1042 BLAKE2B bbdeaa35868ea2bb43b310adbb95373bd054696db26c9a8bdfa9506a19d4b5c99df0e315d657136be7015186a8f55ca4b6526ddaad0d1b5e3e902d84964b21e6 SHA512 f9e21748407d4236403228397ad72bba31df2b98dab22141e887290d66db94fd019f99821b2bd6abd4632269cca39c8b1842ef370a8213a1a5158604c02e5186
 MISC metadata.xml 238 BLAKE2B 471c25958ebf5f578ea2bc7abf38d99bd0810529255b7a3c42327d482a83d9b89c31c524907cc391b2320b3ff08b402d372498940dffc5aac5e6e4ad37e263a6 SHA512 98e2109c9261f162840c0123e9f4748fcf3eb0f07f2f4a47c30ea78b84ab1bc41dca829ad2c8b6476df49748a40fc7101e59d4ce150b28cf32415d8232e47fd7
diff --git a/net-misc/pedro/files/pedro-1.6-portage.patch b/net-misc/pedro/files/pedro-1.6-portage.patch
index b72a3251b89a..be1f9d3b2136 100644
--- a/net-misc/pedro/files/pedro-1.6-portage.patch
+++ b/net-misc/pedro/files/pedro-1.6-portage.patch
@@ -1,5 +1,5 @@
---- a/configure
-+++ b/configure
+--- pedro-1.6.orig/configure	2011-08-23 11:01:21.000000000 +1200
++++ pedro-1.6/configure	2011-11-19 21:28:47.000000000 +1300
 @@ -10478,7 +10478,7 @@
  ac_config_headers="$ac_config_headers config.h"
  
diff --git a/net-misc/pedro/pedro-1.6.ebuild b/net-misc/pedro/pedro-1.6.ebuild
index 428ab0412b8a..00b9a3e6b9af 100644
--- a/net-misc/pedro/pedro-1.6.ebuild
+++ b/net-misc/pedro/pedro-1.6.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=2
+
+inherit eutils
 
 DESCRIPTION="Pedro is a subscription/notification communications system"
 HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/PedroHome.html"
@@ -18,23 +20,25 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${P}
 
-PATCHES=( "${FILESDIR}/${P}-portage.patch" )
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-portage.patch
+}
 
 src_install() {
-	default
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS README || die
 
 	if use doc ; then
-		dodoc "${WORKDIR}"/${PN}.pdf
+		dodoc "${WORKDIR}"/${PN}.pdf || die
 	fi
 
 	if use examples ; then
-		docinto /usr/share/doc/${PF}/examples
-		dodoc src/examples/*.{c,tcl}
-
-		docinto /usr/share/doc/${PF}/examples/java_api
-		dodoc src/java_api/*.java
-
-		docinto /usr/share/doc/${PF}/examples/python_api
-		dodoc src/python_api/*.py
+		insinto /usr/share/doc/${PF}/examples
+		doins src/examples/*.{c,tcl} || die
+		insinto /usr/share/doc/${PF}/examples/java_api
+		doins src/java_api/*.java || die
+		insinto /usr/share/doc/${PF}/examples/python_api
+		doins src/python_api/*.py || die
 	fi
 }
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 7c4394bf4228..944c28b3d7d8 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -10,11 +10,9 @@ DIST stunnel-5.40.tar.gz 648828 BLAKE2B ce0e9cdd1d6c9ec2eb318e1a31307a4e4f27849b
 DIST stunnel-5.43.tar.gz 698715 BLAKE2B 21ac7014e571e1c22b1b21b6dc5c4f22ec91197c7088756fb65dd4dd22541538179d5b389cbd1c3bd8f8d61436eab36e23f6317757229035cd8e9f04ba536f0e SHA512 3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
 DIST stunnel-5.44.tar.gz 699117 BLAKE2B 956c7ce8987f79efab3baaa5071263466ec01f0475bd7e66dff41e8de66811a10be3a5f14bd6430e26159682bd3c2abe93a0d5824a854ae0243e6bbfae14a664 SHA512 a1aa4f234926208bf1b2c9acc0bf83dc0f2c8f575bc57f5ce89b32b4e3fde0412ea0ef7c2edb364fbe0b52fdd89773fab4df53950c58797c11b7668f3e4e7638
 DIST stunnel-5.45.tar.gz 706423 BLAKE2B 81c5355419de3b0bc88d59ea8c98d1a4523d7a1ae6a3d12464f7ab6a1df1f5dd798d2f50ec7adce7515e68a650149321f13e34791781620ad071824246502dce SHA512 653fea6e5002983bb9231a542ab1bab078428821910b8e257adbeea88e583e84d080615f232d5d3086e8d6069c43ddbdfc7923c4b50071ab0c0be547e76d8983
-DIST stunnel-5.46.tar.gz 706499 BLAKE2B 6ece93015b2a59ec17fa60505bccb5e4444879d44fa0cea6e838aa56d178f61f26b8b9b469d8bf2991d4c094fd824eaed2b5214184f6a15e0c415c53b6f7d136 SHA512 2000e36d4d011a83e47afcaf19473e083da010d7b3909cb831c51975512257888615b5d64f4a4d78f48529d68c6740ea2be7f7935b0ab86de4535e290f78cc97
 EBUILD stunnel-5.36.ebuild 2899 BLAKE2B a4c62a1a79157b5b24a8904dacbe45a44b22b53710b44a5bb5c3823e29df666024e8300d82cc6fc5e52a9f8cedad0beaaadc5ee4bec4d366f2544587009c73db SHA512 ffeac1d20a4a83fcda56ae36b81e7a230ae18ad786fdbd51024b0f87b013c9988538cb92d8757869b3337fc78cf25e605fa31fe3d54b437df59c3f1d4a8ec595
 EBUILD stunnel-5.40.ebuild 2930 BLAKE2B b18d32b276cb28e83b8f99b5c495c929c3c6ddff54a7580be3387aa4d5e114feed917bdf4a7faa4136850cdea0ba019fdc3c86fb28268f23f23a125ceb7b896e SHA512 6034f34af01ed21b16474f1ec4a76249d9ee2f14e4312ecf8d7cb75f66f49e9e641328fa4904cc9adec6d9cb480e63187ed9bb9a6263846ef2eaf7a2d8f3eb20
-EBUILD stunnel-5.43.ebuild 2927 BLAKE2B a3a72f3fb99e44467e97b726769a668769bb57c971f415dd1adf6d61b8ea20015b639dddb7f048279a574bc83bf28ac6809471f98315e3455a3f6a68deeccfd4 SHA512 2c69dd162ddc2474117a2d9aaeecd52c2efb08a134f8e7e052de4710bf172dff749033a87844392d48d644c4d2d702aba10a43592deb3e83c96ca55c001f1f5e
+EBUILD stunnel-5.43.ebuild 2928 BLAKE2B bf7ea346a09917a814ac560ba25e7692e8d5c43d74dd6c031151447ca7a1409ffce9c558e3c71c550fe63aa4810db3b96669cc43dad7600332c09060b335f23d SHA512 2ab877ef7f2d5a0320157d2878cac9e40d9af11c9cccbb11859da91e46279486f26a5af2e094cfc302ff75c24964cede7dce11df0693a9d6e2b624595b556de5
 EBUILD stunnel-5.44.ebuild 2930 BLAKE2B 2f027288047c1efa62cbcff7869b492422b925576e2f672a851f8c101de4c9a8dbe87d6746050eb5d6115ccaab81c5006b5ee046b3356cf161142c99c6ee6372 SHA512 af327981e004f8a56473fcfa88d8f5027991461a6ffc791db6a840919513dd0e0d3de47828e7a4d6425bef432b76d2d8a05b3a6ab742668e5da4051d44aead7d
 EBUILD stunnel-5.45.ebuild 2930 BLAKE2B 95ade179eb9d81e66ea6fe7523a299c8e6dd58d43867568b8e22d22125f6a6111d1f8b988df153cb438afba2736db811507d87acf0f2b5b00469904c12657f34 SHA512 c8fca15345e1a955af0824d847dc0e06a220da7dcdff9a5144e567f54ea7e6c36a14d74fb407b5981249c3076811e7da2fcb668855cdcbca019aa27e464c9229
-EBUILD stunnel-5.46.ebuild 2930 BLAKE2B 95ade179eb9d81e66ea6fe7523a299c8e6dd58d43867568b8e22d22125f6a6111d1f8b988df153cb438afba2736db811507d87acf0f2b5b00469904c12657f34 SHA512 c8fca15345e1a955af0824d847dc0e06a220da7dcdff9a5144e567f54ea7e6c36a14d74fb407b5981249c3076811e7da2fcb668855cdcbca019aa27e464c9229
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/stunnel-5.43.ebuild b/net-misc/stunnel/stunnel-5.43.ebuild
index e2b98da467ac..62fe9a4b0ceb 100644
--- a/net-misc/stunnel/stunnel-5.43.ebuild
+++ b/net-misc/stunnel/stunnel-5.43.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.46.ebuild b/net-misc/stunnel/stunnel-5.46.ebuild
deleted file mode 100644
index d30f1845da1c..000000000000
--- a/net-misc/stunnel/stunnel-5.46.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ssl-cert multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 libressl selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
-	stunnel3? ( dev-lang/perl )
-	selinux? ( sec-policy/selinux-stunnel )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-
-	# libressl compat
-	eapply "${FILESDIR}"/${PN}-5.43-compat-libressl.patch
-
-	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	docinto html
-	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel-r1 stunnel
-
-	doenvd "${T}"/20stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}