gentoo resync : 18.08.2019

3 files changed, 92 insertions, 2 deletions

diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 906fc9f7ae73..14d03ba63dca 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -10,6 +10,7 @@ DIST keepalived-2.0.13.tar.gz 955953 BLAKE2B f6a8d23cdcf4b8484c37da9d48c12394617
 DIST keepalived-2.0.15.tar.gz 972461 BLAKE2B 7c57d4ecdec7efe5dcb477e92daf4e6ee947ec66c3dc68a96fe0a7f07656a3c503751f10e9448f80e896b63d987fa9448bb264537106685cfac88ca87096721f SHA512 d426f2d917f72264944e8324409838287d4c535dfd5b5574a41c06828efc9095a2304f87a6435a067d4ad88ad5619108f7de97abb4a257a4c30e335929978dd1
 DIST keepalived-2.0.16.tar.gz 983376 BLAKE2B 6196c617123d0c026cf4476f3e788ef797ebf24649a41ed1cfe360843bfb793d7115e2eaff499154ac84d8d4854ecfbfb6839339878502917a9173a8141545e6 SHA512 290af548c84a369f69df74ca96f8de6e2e6cf20abc7ca03ccad6217856192f4109620b59406b0e829f486c148bc6a4ed3a5efe82c12eeb9314a24471c03f95bd
 DIST keepalived-2.0.17.tar.gz 1003077 BLAKE2B 68ce64145f917267f6f156fc7b4ffb05ce0bd24b64ddfb3cb2ae8b54850586cffa04c0b617a0f1c6cffd659bba208c145051e436e002ee048908c44fa1c433ff SHA512 6bbcd76604785ef11af4df0a72015ff75a3f47fd04dbe15913f1a30bc80371a188f54020dca881a2b6a562e6ea0b1c5c9c4561c46aa4bdbb8c9f3c54b411d1df
+DIST keepalived-2.0.18.tar.gz 1015958 BLAKE2B dc941fe24e5945148b8e0ba2f18237f80b4a8382fd83e48b1b0caee2e28648ab8adc405f616d718cb00b097bcd91672f6281f0dbeed20a1fd532c392e4295620 SHA512 11e0a9b9bdca734a923254b4484f4e808cf362e795e3f457f707772b7522929be4bbbba9b1c152b7cb7601d8315b6faea229ed59f115787d6197fbc62770f9a3
 EBUILD keepalived-2.0.10-r1.ebuild 1797 BLAKE2B 1abc83adbdfae01b5ee03470164975fc2df917a54e8f72b9f77af28171cf7797524a7361600be6d61a7293d4546d544d105151e4027e387f209da5b637c89f40 SHA512 b1d9cb8a2471cd6a84892cc3a2bfd5d25212c509f9cd60dc32c0bc6e393a0d918ed277896848fa48a9ff04f4cd54f35804f9ec2537f884052fc9d683c6d3b0ea
 EBUILD keepalived-2.0.11.ebuild 1750 BLAKE2B 2b77dcce062c8096de1a16aa957fd5babcd2c91fe00e716258a4d0322e75a92dd5c662b0285daef77e8090edac2ea1229610f9014721e4e0ab3f8807b8f02c5e SHA512 a2702a070318a02fdd53404c65312c02af9e11a71c8eee54036510436ea81432ca993cf4b2959a77ad3828f3f3058299add16f56a561f55e87554948fdc6fe83
 EBUILD keepalived-2.0.12.ebuild 1750 BLAKE2B 2b77dcce062c8096de1a16aa957fd5babcd2c91fe00e716258a4d0322e75a92dd5c662b0285daef77e8090edac2ea1229610f9014721e4e0ab3f8807b8f02c5e SHA512 a2702a070318a02fdd53404c65312c02af9e11a71c8eee54036510436ea81432ca993cf4b2959a77ad3828f3f3058299add16f56a561f55e87554948fdc6fe83
@@ -17,5 +18,6 @@ EBUILD keepalived-2.0.13-r1.ebuild 2238 BLAKE2B c1efbbe69af62c378bc3a3c39a7fec7d
 EBUILD keepalived-2.0.13.ebuild 1750 BLAKE2B 2b77dcce062c8096de1a16aa957fd5babcd2c91fe00e716258a4d0322e75a92dd5c662b0285daef77e8090edac2ea1229610f9014721e4e0ab3f8807b8f02c5e SHA512 a2702a070318a02fdd53404c65312c02af9e11a71c8eee54036510436ea81432ca993cf4b2959a77ad3828f3f3058299add16f56a561f55e87554948fdc6fe83
 EBUILD keepalived-2.0.15.ebuild 2254 BLAKE2B 4df1efab71cdffa310d8e3237384640e8c1ae518ca5cf9b6acd05720b5d81adef36e2d528842f22ca27ca7e54a18433f5d2c9a95ca3fc86aafe08c84afbbc7ae SHA512 6c611ffd1ad7749f373faa62450d93329baaa840e0419a9d8a464f255ff350ea8376ce2fabf199d95e3eb986eeb4d1a2cf84013dfa9f7d71aa9a029c79a6bebd
 EBUILD keepalived-2.0.16.ebuild 2254 BLAKE2B 4df1efab71cdffa310d8e3237384640e8c1ae518ca5cf9b6acd05720b5d81adef36e2d528842f22ca27ca7e54a18433f5d2c9a95ca3fc86aafe08c84afbbc7ae SHA512 6c611ffd1ad7749f373faa62450d93329baaa840e0419a9d8a464f255ff350ea8376ce2fabf199d95e3eb986eeb4d1a2cf84013dfa9f7d71aa9a029c79a6bebd
-EBUILD keepalived-2.0.17.ebuild 2254 BLAKE2B 4df1efab71cdffa310d8e3237384640e8c1ae518ca5cf9b6acd05720b5d81adef36e2d528842f22ca27ca7e54a18433f5d2c9a95ca3fc86aafe08c84afbbc7ae SHA512 6c611ffd1ad7749f373faa62450d93329baaa840e0419a9d8a464f255ff350ea8376ce2fabf199d95e3eb986eeb4d1a2cf84013dfa9f7d71aa9a029c79a6bebd
+EBUILD keepalived-2.0.17.ebuild 2248 BLAKE2B 81710d50ad69e9147c69d504ae50ed34b992be405a0b574c62a778d40151361f75f3e6cd3a993cac131a14ca516c0fd3ded77c5b9982c04fa3f9a38db5c4459e SHA512 7f5efbec50d66a5d588521f4fd2ea692d418d07dcf18270c7cb34dfda27ce20eb4d86a86cec23c24c08de04316fce1637f527d8c396735d950675594715fc29c
+EBUILD keepalived-2.0.18.ebuild 2254 BLAKE2B 4df1efab71cdffa310d8e3237384640e8c1ae518ca5cf9b6acd05720b5d81adef36e2d528842f22ca27ca7e54a18433f5d2c9a95ca3fc86aafe08c84afbbc7ae SHA512 6c611ffd1ad7749f373faa62450d93329baaa840e0419a9d8a464f255ff350ea8376ce2fabf199d95e3eb986eeb4d1a2cf84013dfa9f7d71aa9a029c79a6bebd
 MISC metadata.xml 640 BLAKE2B 5644b98bf487637c431299fe61e1185731d9fc22e9a19b9a3218855318a9c40500339c628671eb958c2bcee99d867a8e9c93903fdcdad25ad566659422dd2119 SHA512 6fd4981067e0a2e74511db7be79d656c62b39c1f43f860e0d981b6c9770cb2da6b4fd3e40af1ed23adc8bbbd01202e6c45e58b6f86480a807d193aae1a3f7ad3
diff --git a/sys-cluster/keepalived/keepalived-2.0.17.ebuild b/sys-cluster/keepalived/keepalived-2.0.17.ebuild
index a00ef1ac4008..76a5364a2f61 100644
--- a/sys-cluster/keepalived/keepalived-2.0.17.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.0.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="+bfd dbus debug -json regex snmp"
 
 RDEPEND="dev-libs/libnl:=
diff --git a/sys-cluster/keepalived/keepalived-2.0.18.ebuild b/sys-cluster/keepalived/keepalived-2.0.18.ebuild
new file mode 100644
index 000000000000..a00ef1ac4008
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-2.0.18.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="https://www.keepalived.org/"
+SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+bfd dbus debug -json regex snmp"
+
+RDEPEND="dev-libs/libnl:=
+	dev-libs/openssl:=
+	dev-libs/popt
+	net-libs/libnfnetlink
+	sys-apps/iproute2
+	regex? ( >=dev-libs/libpcre2-8 )
+	dbus? ( sys-apps/dbus dev-libs/glib:2 )
+	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() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# keepalived has support to dynamically use some libraries instead of
+	# linking them:
+	#--enable-dynamic-linking \
+	#--enable-libiptc-dynamic \
+	#--enable-libnl-dynamic \
+	#--enable-libxtables-dynamic \
+	STRIP=/bin/true \
+	econf \
+		--with-init=custom \
+		--with-kernel-dir=/usr \
+		--enable-sha1 \
+		--enable-vrrp \
+		$(use_enable bfd) \
+		$(use_enable dbus) \
+		$(use_enable dbus dbus-create-instance) \
+		$(use_enable debug) \
+		$(use_enable json) \
+		$(use_enable regex) \
+		$(use_enable regex regex-timers ) \
+		$(use_enable snmp) \
+		$(use_enable snmp snmp-checker) \
+		$(use_enable snmp snmp-rfc) \
+		$(use_enable snmp snmp-rfcv2) \
+		$(use_enable snmp snmp-rfcv3) \
+		$(use_enable snmp snmp-vrrp)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
+	newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
+
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+
+	use snmp && dodoc doc/*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 -v "${ED}"/etc/keepalived/samples/*.pem || die
+	# Clean up sysvinit files
+	rm -rv "${ED}"/etc/sysconfig || die
+}