Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

4 files changed, 62 insertions, 16 deletions

diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 8555d04efc4a..0a1ed57c619b 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -2,9 +2,11 @@ AUX monit.initd-5.0-r1 798 BLAKE2B 3596494122e9746157e86379f204e54d5ad7c0eb37832
 AUX monit.pamd 120 BLAKE2B 76744f79babaa99fa2961f73158ca755f885e9ea8e20b76dcb29f8fd10be6b5804b09b3c90f59ada7ce81eab90713ba43d2b2f28a6abc278fdfc75b356af4e67 SHA512 75c5fbad1c04fc5c9c0de224df245d64f4e59e23f79f4037edcc94623795852900318747e8a71946cab406009834643e84e1cd40b27854951d5462e740712b5c
 AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e4360520252369951b3f7f87a3dd96440a58c9d2c4973ce9980a00ab7085c92af1e6542ae10d679ba352d170b19 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88
 DIST monit-5.23.0.tar.gz 1298472 BLAKE2B 8cc580c1a9947e43703eff3593992d6ad53380918ccab17e0294c195469953f2ae617b8f8360d16b77264012da0aba99dc072d7ff3e3fc66429b3b8f33adb098 SHA512 6ca3de51c7fdb8a677feafb684dc459f4064539fe5501dfa53a2027bb7b1e6f6121b7fa593c9e373f009d2fd0eeca2b9dd659c337f056dfe769908a3aa7ec5b8
+DIST monit-5.24.0.tar.gz 1352660 BLAKE2B 6759d1c75adcd089a7e3a5e48150b1ea0fcd6ab7dd1f8f3018c0a48a5a2b648bc353a99785f140d7d4cc0715b1d3c4057d26a763ec268d6dce56f96f66071bbc SHA512 5260a1b543495c650e2e91ad38129c65253ce6649150e0e51d11b2902723cb7dd8e1a874c473bec3ba5b51721f2b61fdec92cf445f11cc217c1a6fcc0fab1a1e
+DIST monit-5.25.0.tar.gz 1353674 BLAKE2B a187ec1de14934f3e54bccaaf1dbf98eba57f8f06b6c43057060b63ed39f351732dd720f5026dd94bc814528a4bb685c0e342a9990f2e12f08399de4e0852a84 SHA512 6a0a3e81a97846420785026d108f2640986d0c24ecde55faf522dd7891ecdc2237c40667ec7b63a53358539c18870927cd75eb4c24cbb4b8ff73c54c267e70c5
 DIST monit-5.25.1.tar.gz 1353855 BLAKE2B 5abef9c97088b12ab376e67f2524534ad1b0e2e3dfa98d5f5fdd8a6fc2331ead57d77aa1d8229a0825cbb36871b063006b74dc98dd780baef8aaca1da5c6c74c SHA512 b21b18302aed602f9371f7dee29f7306dbccd355df333bc6d868acdb6c054cef877dee72e261383938fe1d10121cd07e820e040ea80ed70260fdda8b451f6ab1
-DIST monit-5.25.2.tar.gz 1354704 BLAKE2B 503660146edba988d0c52d1773dc3d3d6f495b3e3f0ae147be6a4297bf118ad6b5f7289868ad4b61226cf499bd8d6e3aed8f5fec91ff8ff699968f4262f1fd01 SHA512 e9b6ce60bf82c2564a084fc42b65ef432ee35855cad038fe6ae209047abaa1c54cabb4cd75c8a85c1102844a1b90c3c5f8ddbbd56711665b9bea616bcc02ec86
 EBUILD monit-5.23.0.ebuild 1101 BLAKE2B 8083ac591d7e3131e053c25a1b50ee6ddc90882bec2c706321c044922b6070b021dde5480c224dab4ef58afb55cc6d69f135e4b0aa3f15e8529e303cea66020d SHA512 c49e39d635cff50eb1708ed61741b6200ae22646889af29a29a01d90bb51ba19e9bc81bf0b731e100369e8201def512753ee35dd352137991a1c6eb2032a9ef3
-EBUILD monit-5.25.1.ebuild 1102 BLAKE2B d2b9cc9540de97e27c0165b733f3f6ea623cf33d9dbaafe8fb5ed1c854d675e83f6dcb969abe4b857459a3d99859d4426b93d4d71e3649513bc6d1dd43634781 SHA512 e7c77aa666261c2aa791f818b35b6c27c6a52dc2f586f610977f5946c9235cdfa20b6f508f0ac64c31a63d28c8fe3ca3a7e59c7c56771868dcb2ab858e8de113
-EBUILD monit-5.25.2-r1.ebuild 1226 BLAKE2B d1efe3c4501795e124ea3895fa21bfa2264d5bb5d153748b94efcccee38cfeb269cc5d769dcd792cf7167508bc0a23a05c36885cce0f9a99f729303be4b368e8 SHA512 7816aa95fcccdd7d27dd428cdc98f4f6a646aeef875dc02919503cbe1536b8dd2b8b473cd04236317c99f8fece3bb3aab30285424b5d4ea50c40153975584147
+EBUILD monit-5.24.0.ebuild 1104 BLAKE2B 2c26b88f5adcd0c0905bba8f0ed13e8cca07b15284282e3b2cb531013419ed5d34b79b5fc99f7123da7e2b15835902763b5bebf95d697329d3b6cf7f85aac356 SHA512 bc900aa0e228505601343c5679bfdda306119a5790812bc10c88a5e4852be827b9d041fe1a390be1b82f64fac955e87e77929005450abb2351a5d937d575e8a6
+EBUILD monit-5.25.0.ebuild 1104 BLAKE2B 2c26b88f5adcd0c0905bba8f0ed13e8cca07b15284282e3b2cb531013419ed5d34b79b5fc99f7123da7e2b15835902763b5bebf95d697329d3b6cf7f85aac356 SHA512 bc900aa0e228505601343c5679bfdda306119a5790812bc10c88a5e4852be827b9d041fe1a390be1b82f64fac955e87e77929005450abb2351a5d937d575e8a6
+EBUILD monit-5.25.1.ebuild 1104 BLAKE2B 2c26b88f5adcd0c0905bba8f0ed13e8cca07b15284282e3b2cb531013419ed5d34b79b5fc99f7123da7e2b15835902763b5bebf95d697329d3b6cf7f85aac356 SHA512 bc900aa0e228505601343c5679bfdda306119a5790812bc10c88a5e4852be827b9d041fe1a390be1b82f64fac955e87e77929005450abb2351a5d937d575e8a6
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-admin/monit/monit-5.25.2-r1.ebuild b/app-admin/monit/monit-5.24.0.ebuild
index 8897263d608b..0cbe43595233 100644
--- a/app-admin/monit/monit-5.25.2-r1.ebuild
+++ b/app-admin/monit/monit-5.24.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit bash-completion-r1 pam systemd
+inherit pam systemd
 
 DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
 HOMEPAGE="http://mmonit.com/monit/"
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="ipv6 libressl pam ssl"
+IUSE="libressl pam ssl"
 
 RDEPEND="
 	ssl? (
@@ -30,12 +30,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myeconfargs=(
-		$(use_with ipv6)
-		$(use_with pam)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
+	econf $(use_with ssl) $(use_with pam)
 }
 
 src_install() {
@@ -48,8 +43,6 @@ src_install() {
 	systemd_dounit "${FILESDIR}"/${PN}.service
 
 	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
-
-	dobashcomp system/bash/monit
 }
 
 pkg_postinst() {
diff --git a/app-admin/monit/monit-5.25.0.ebuild b/app-admin/monit/monit-5.25.0.ebuild
new file mode 100644
index 000000000000..0cbe43595233
--- /dev/null
+++ b/app-admin/monit/monit-5.25.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit pam systemd
+
+DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="libressl pam ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	pam? ( virtual/pam )"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+	econf $(use_with ssl) $(use_with pam)
+}
+
+src_install() {
+	default
+
+	dodoc README
+
+	insinto /etc; insopts -m600; doins monitrc
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/monit/monit-5.25.1.ebuild b/app-admin/monit/monit-5.25.1.ebuild
index 0d26490402be..0cbe43595233 100644
--- a/app-admin/monit/monit-5.25.1.ebuild
+++ b/app-admin/monit/monit-5.25.1.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=6
@@ -10,7 +10,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="libressl pam ssl"
 
 RDEPEND="