4 files changed, 10 insertions, 132 deletions
diff --git a/sys-cluster/keepalived/ChangeLog b/sys-cluster/keepalived/ChangeLog
index 00db36f59a26..85438591685d 100644
--- a/sys-cluster/keepalived/ChangeLog
+++ b/sys-cluster/keepalived/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/keepalived
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.130 2015/04/19 09:41:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.131 2015/07/08 10:02:10 ultrabug Exp $
+
+*keepalived-1.2.18 (08 Jul 2015)
+
+  08 Jul 2015; Ultrabug <ultrabug@gentoo.org> -keepalived-1.2.7-r2.ebuild,
+  -keepalived-1.2.12-r1.ebuild, -keepalived-1.2.13.ebuild,
+  +keepalived-1.2.18.ebuild:
+  version bump fix #553760 thx to Tomas Mozes, drop old unstable
 
   19 Apr 2015; Pacho Ramos <pacho@gentoo.org> keepalived-1.2.15.ebuild:
   x86 stable wrt bug #538792
diff --git a/sys-cluster/keepalived/keepalived-1.2.13.ebuild b/sys-cluster/keepalived/keepalived-1.2.13.ebuild
deleted file mode 100644
index 06db9397fb0d..000000000000
--- a/sys-cluster/keepalived/keepalived-1.2.13.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.2.13.ebuild,v 1.9 2015/02/28 14:04:17 ago Exp $
-
-EAPI=4
-
-inherit autotools base
-
-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="debug ipv6 snmp"
-
-RDEPEND="dev-libs/popt
-	sys-apps/iproute2
-	dev-libs/libnl
-	dev-libs/openssl
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.30"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.2-libipvs-fix-backup-daemon.patch
-)
-
-DOCS=( README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO
-	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt )
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	STRIP=/bin/true \
-	econf \
-		--with-kernel-dir=/usr \
-		--enable-vrrp \
-		$(use_enable debug) \
-		$(use_enable snmp)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/keepalived.init keepalived
-	newconfd "${FILESDIR}"/keepalived.confd keepalived
-
-	use snmp && dodoc doc/KEEPALIVED-MIB
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog genhash/VERSION || die
-	# 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/keepalived-1.2.12-r1.ebuild b/sys-cluster/keepalived/keepalived-1.2.18.ebuild
index ee65102893bd..91e755a7a4d9 100644
--- a/sys-cluster/keepalived/keepalived-1.2.12-r1.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.2.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.2.12-r1.ebuild,v 1.1 2014/05/04 14:49:17 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.2.18.ebuild,v 1.1 2015/07/08 10:02:10 ultrabug Exp $
 
 EAPI=4
 
diff --git a/sys-cluster/keepalived/keepalived-1.2.7-r2.ebuild b/sys-cluster/keepalived/keepalived-1.2.7-r2.ebuild
deleted file mode 100644
index 8fb68d5361a8..000000000000
--- a/sys-cluster/keepalived/keepalived-1.2.7-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.2.7-r2.ebuild,v 1.1 2013/03/05 13:40:24 ultrabug Exp $
-
-EAPI=4
-
-inherit autotools base
-
-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="debug ipv6 snmp"
-
-RDEPEND="dev-libs/popt
-	sys-apps/iproute2
-	dev-libs/libnl:1.1
-	dev-libs/openssl
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.30"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.2-libipvs-fix-backup-daemon.patch
-	"${FILESDIR}"/${PN}-1.2.2-libipvs-fix-ipv6.patch
-)
-
-DOCS=( README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO
-	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt )
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	STRIP=/bin/true \
-	econf \
-		--with-kernel-dir=/usr \
-		--enable-vrrp \
-		$(use_enable debug) \
-		$(use_enable snmp)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/keepalived.init keepalived
-	newconfd "${FILESDIR}"/keepalived.confd keepalived
-
-	use snmp && dodoc doc/KEEPALIVED-MIB
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog genhash/VERSION || die
-	# 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/
-}