gentoo resync : 05.01.2018

4 files changed, 75 insertions, 4 deletions

diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 1b8b50fe7f7d..6c278b81c3fc 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -2,6 +2,8 @@ AUX keepalived.confd 171 BLAKE2B ad9baf96333182a2acdb10a4be7220de1dc0827c4932af0
 AUX keepalived.init 792 BLAKE2B a3e98861fbb9a193b4d63aabde8a44a041603b7983a02af7815c4db0062691dc2ea905c704d7d123588355a8cfbde124e2a5732d621eb5c664169a83ec81f6ed SHA512 240201b81bcca7b213bd3ec45fc286f0305d72a6952a3baf485d717df413df3a2da0f4b018eaa050b0b12cda78767f5c4ae60ec75e5802cfe57cb29951e86ba0
 DIST keepalived-1.2.24.tar.gz 601873 BLAKE2B d2bbf6189f789dd2b61207e80d4262ca6ff8a653268e9d5f4dada7def7cc6ab7d8f8fd49d9b97b228922ff56495213a22c459a44943a92a14abd91b787c491a8 SHA512 a5e555dd955173887896155a04b1f6bb0c2f2a758008472abd5433b057be3fd85e4f270a7b7eb2f36a1c16e46b235ef930b1844938276528ff61bbdd783bb1f5
 DIST keepalived-1.3.5.tar.gz 683183 BLAKE2B 6242cbe61e8cbe80d094dbad3882b0116fc3cd129c5f0f082ec821d794dff53ab22a661feb1c11d2c5386bcea3c2727ed899ea2968dfa8a7ed4272b8596f0839 SHA512 ebd710167becd4b99b665877953d19477c11f1d1c736eb580a05dedd4946363b756553e20607f34aa6c35f57b7252d8a22287beedc316b62a745fccc4243a720
+DIST keepalived-1.4.0.tar.gz 731936 BLAKE2B b6adf7925cc81a4c6e6f69afaa28bd72f6c13076be03f2971775a63c823dac5c6fec46e0b6724af1a7ac9036a749b285429ba3ffad2d9ecc39ccc213cbe2cb28 SHA512 485eda5912d68663f011b8e79263ce1e38ed785919055b113536f63aab52c0d5f581a9ab1951c7f62362ac0a68ee921efc41934a4e535d6df7e59249ef32d6d3
 EBUILD keepalived-1.2.24.ebuild 1412 BLAKE2B 4319c70c9cf0acae2ed7e6cf283fee6aa86b2149367b94ba7500b5ac885a723cd6fc266f57c1e25618394f1f0ff114019b73c3ef1ea7fbf622870ee2a67973fb SHA512 3c4a6951cf0cb39bdd604af88f41f3895d5cf72c283d022b506c0fae841cb86adda7b11aa1d23247be17e26cd6cdf826fd45bae39b018f3477820a4dd2c26588
-EBUILD keepalived-1.3.5.ebuild 1535 BLAKE2B 2bde65f9c83af44d9015d5456d120d2db264c5dc83135f89c3c60ef7bdb4fe06010f5a1828e8cb55f63e2a226bf0428f2bafce6bc3bf322499342a51bde2e81b SHA512 900a77aa4bfee11e98672dd60390f093c1f322a0d288118790cb482189a5058a9aec160dbef1a3e298b1b8c83293c258bea095873e91a0514aca5dbf9654fe8c
-MISC metadata.xml 368 BLAKE2B 6e855815643185d9155bba3d62561c685ab442dd86b82dfb2097f145b3c5f53fb2f2ea6ef22f0061a85b881565564c96c8d9ab9c9903df3cf1fb8a7c7b6a1595 SHA512 712ea427d36786eaf0516e0b36f821ec89ee20bec9190a510ec0576c5f7e3867be89c2486cbd0faa341e3cc8235a3ed3f3d76028235d93038cc8c95be44021f5
+EBUILD keepalived-1.3.5.ebuild 1539 BLAKE2B d69b34a4ca3dde74e1557bd6e11aa6766f44992b64c3c45baa28c0e78463b2f003570d7fbc6c4859d9082de45c0751bbe12dfb3e6943bb89f913a019262b3e2a SHA512 df18b8cae956594c478d305667e13d17ad615f2f9359a2b8d32f144750fa5d57b1e1232e87d9ebdde71173d0ababcfff6ea49f3388ae239dafb4b4b4a48e8295
+EBUILD keepalived-1.4.0.ebuild 1597 BLAKE2B 603fcdc04cc9906fd72a6075fbf1646569aa85cc6194a04db9b16cdbadd976bdfdb466e231cd0252a6ca45b20b807eace3c532fd0d6044c06247a67088e8876d SHA512 a88d95101d4a108b791d64050097fa6db3885e7f7f59b6c97d0068fd6823781b504e8291cbc114e5c1ea9c90641c6b011f37ff74751019b164dd15ab2c13a54a
+MISC metadata.xml 471 BLAKE2B 2dfba9fe3d7d39f8484baa1f1be9a59b5da8f6cc0da4a3af1ec07e5daf4f2522f802af51048463dfad54bfbffe0286ce8a3b9ff8889139ca32693bad378937e3 SHA512 203c93aaf60f7d0dcc6150fff2a4a3dd61fa4d6cfab26452d8efeed1d79096b17db7e47700582475b7e6607ae70521c32cc91015e7852dde22a7d828740946af
diff --git a/sys-cluster/keepalived/keepalived-1.3.5.ebuild b/sys-cluster/keepalived/keepalived-1.3.5.ebuild
index 3b9a251008b9..efb2b36f7ed5 100644
--- a/sys-cluster/keepalived/keepalived-1.3.5.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,7 +50,7 @@ src_install() {
 	newinitd "${FILESDIR}"/keepalived.init keepalived
 	newconfd "${FILESDIR}"/keepalived.confd keepalived
 
-	use snmp && dodoc doc/KEEPALIVED-MIB
+	use snmp && dodoc doc/KEEPALIVED-MIB.txt
 
 	docinto genhash
 	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
diff --git a/sys-cluster/keepalived/keepalived-1.4.0.ebuild b/sys-cluster/keepalived/keepalived-1.4.0.ebuild
new file mode 100644
index 000000000000..66d4382c86b0
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-1.4.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="http://www.keepalived.org/"
+SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="dbus debug ipv6 -json snmp"
+
+RDEPEND="dev-libs/libnl:=
+	dev-libs/openssl:=
+	dev-libs/popt
+	net-libs/libnfnetlink
+	sys-apps/iproute2
+	dbus? ( sys-apps/dbus )
+	json? ( dev-libs/json-c:= )
+	snmp? ( net-analyzer/net-snmp )"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-4.4"
+
+DOCS=( README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
+	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt )
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+src_configure() {
+	STRIP=/bin/true \
+	econf \
+		--with-kernel-dir=/usr \
+		--enable-sha1 \
+		--enable-vrrp \
+		$(use_enable dbus) \
+		$(use_enable dbus dbus-create-instance) \
+		$(use_enable debug) \
+		$(use_enable json) \
+		$(use_enable snmp)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/keepalived.init keepalived
+	newconfd "${FILESDIR}"/keepalived.confd keepalived
+
+	use snmp && dodoc doc/KEEPALIVED-MIB.txt
+
+	docinto genhash
+	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
+	# This was badly named by upstream, it's more HOWTO than anything else.
+	newdoc INSTALL INSTALL+HOWTO
+
+	# Security risk to bundle SSL certs
+	rm -f "${ED}"/etc/keepalived/samples/*.pem
+	# Clean up sysvinit files
+	rm -rf "${ED}"/etc/sysconfig "${ED}"/etc/rc.d/
+}
diff --git a/sys-cluster/keepalived/metadata.xml b/sys-cluster/keepalived/metadata.xml
index 51b30f6d8f3f..4de8679ae129 100644
--- a/sys-cluster/keepalived/metadata.xml
+++ b/sys-cluster/keepalived/metadata.xml
@@ -8,4 +8,7 @@
 	<longdescription>
 		VRRP2 implementation. Used for setting up high availability clusters.
 	</longdescription>
+	<use>
+		<flag name="json">compile with signal to dump configuration and stats as JSON.</flag>
+	</use>
 </pkgmetadata>