Add seperate variant that uses newer linux-headers instead of the bundled ip_vs.h. Tested on ipv6-ready forums.gentoo.org.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

3 files changed, 66 insertions, 2 deletions

diff --git a/sys-cluster/keepalived/ChangeLog b/sys-cluster/keepalived/ChangeLog
index dcf77ce33923..cb0512a72c33 100644
--- a/sys-cluster/keepalived/ChangeLog
+++ b/sys-cluster/keepalived/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/keepalived
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.79 2011/06/08 05:38:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.80 2011/06/08 05:44:11 robbat2 Exp $
+
+*keepalived-1.2.2-r1 (08 Jun 2011)
+
+  08 Jun 2011; Robin H. Johnson <robbat2@gentoo.org>
+  +keepalived-1.2.2-r1.ebuild:
+  Add seperate variant that uses newer linux-headers instead of the bundled
+  ip_vs.h. Tested on ipv6-ready forums.gentoo.org.
 
   08 Jun 2011; Robin H. Johnson <robbat2@gentoo.org> keepalived-1.2.2.ebuild:
   Fix automagic dependency on libnl that is needed for working IPv6 support.
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index cd76ba4d1f6a..027fd5bea8a3 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -2,6 +2,7 @@ AUX init-keepalived 741 RMD160 7c01c24d94758cc93fe1c13f89dbc566187ee444 SHA1 902
 AUX keepalived-1.1.13-linux-2.6.21-ip_vs.h 7549 RMD160 e6407ca157a3d7bcc810841b6f5937cd7d477b0e SHA1 42386dd7a767704d0af9987578185d3fc8ccfd30 SHA256 67cb638f17e1189aedc0f464622744867549c91d637d38cdfd8d824aae841aea
 AUX keepalived-1.1.20-do-not-need-kernel-sources.patch 3277 RMD160 975f2a7aed51f3c538e158f6097e2c0663ccb82d SHA1 5f7cd816e6e5752315da06ffd762c9aed200a962 SHA256 b4a38f12714717016a7588dae8bd5d3717de0cc9a8d72f08b089e6ff0bd88bf4
 DIST keepalived-1.2.2.tar.gz 249557 RMD160 a24f2fd97007c331daf9f2c2b1608eb727780552 SHA1 52a6d46823d29791d10f8869face64b6c6df5616 SHA256 4c05dbd149af120506b4f3a66b4016e30d9ad112e4c26a602e28c366705de8c0
+EBUILD keepalived-1.2.2-r1.ebuild 1483 RMD160 906adcf36ba1f882b32224a5885621b51253540a SHA1 07b03ad4ed225bf35f0e4281317033c7c9daf4b3 SHA256 a2a2d10dd4fd5de5cdfb4a3f829d237248eb1995bdfe6c36ac99c3eb9246fc63
 EBUILD keepalived-1.2.2.ebuild 1864 RMD160 96e9dcd86a50fb0f52b812c335f1b859da30fb08 SHA1 0ae13a5bb88b95295adedc37f9937a23fd9e06b3 SHA256 0d64554574f296411295be6a6ba497981d4e061cfe64c126c0ae44a23a2f04b2
-MISC ChangeLog 12122 RMD160 0a5ea2debc4fdec1abfc2115587c76c78dae43a7 SHA1 945152e84af7f156057b79905cd70b140ed42765 SHA256 87f9d2fc58cf4eeee0deee03de837cf0f1a9dda41908bdd1773bfd7285d52e37
+MISC ChangeLog 12370 RMD160 b450bdd83e4609e9484f578757a688f2228866f7 SHA1 1920dc3d18f6517b4483b684435a374cce52fd6e SHA256 ef1355a3ec9b001bb299bf78a7eea4a06d1ab173bb58f44b6381d591781ea138
 MISC metadata.xml 280 RMD160 1869468fd0838a95533ab1a68f8d50f63ee2f0ac SHA1 2d837eb6e9478ffb08e1c597a3f8a9e456f6be12 SHA256 0924e43f049ea2f507b4f5dfa973fa4cedf4e967c19aa9cb5afb6f4ccdef6cf8
diff --git a/sys-cluster/keepalived/keepalived-1.2.2-r1.ebuild b/sys-cluster/keepalived/keepalived-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..5358cb02ce81
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-1.2.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.2.2-r1.ebuild,v 1.1 2011/06/08 05:44:11 robbat2 Exp $
+
+EAPI=3
+
+inherit flag-o-matic 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"
+
+RDEPEND="dev-libs/popt
+	sys-apps/iproute2
+	dev-libs/libnl
+	dev-libs/openssl"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.30"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1.20-do-not-need-kernel-sources.patch )
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	STRIP=/bin/true \
+	econf \
+		--enable-vrrp \
+		$(use_enable debug)
+}
+
+src_install() {
+	base_src_install
+
+	newinitd "${FILESDIR}"/init-keepalived keepalived || die
+
+	dodoc doc/keepalived.conf.SYNOPSIS || die
+	dodoc README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO || die
+
+	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 || die
+
+	# Security risk to bundle SSL certs
+	rm -f "${D}"/etc/keepalived/samples/*.pem
+	# Clean up sysvinit files
+	rm -rf "${D}"/etc/sysconfig "${D}"/etc/rc.d/
+}