added 1.1.1, and cleaned out some older ebuilds

7 files changed, 61 insertions, 71 deletions

diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 94f78897b440..d0c9219d8810 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,6 +1,6 @@
 MD5 583d1231467069d0fc17df5cd604f903 keepalived-1.0.3.ebuild 918
 MD5 7020f28a3694c10f366f5c74699aec64 keepalived-1.1.1.ebuild 1215
-MD5 7c7f0f185d059c3fbfe365c4d7c7aa27 ChangeLog 1137
+MD5 4a420e7e6b8b1c9035439e0c08ee70d1 ChangeLog 1137
 MD5 b1f8668a9a7c709a3e0ae627712ceaf3 metadata.xml 426
 MD5 69cff859ea4eb0354fd80bd3c799c7c0 files/init-keepalived 644
 MD5 693b1c8d6d57207baada85b995210ee2 files/digest-keepalived-1.0.3 68
diff --git a/sys-cluster/keepalived/files/digest-keepalived-1.0.0 b/sys-cluster/keepalived/files/digest-keepalived-1.0.0
deleted file mode 100644
index 58a58f621ded..000000000000
--- a/sys-cluster/keepalived/files/digest-keepalived-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 75761ad3b2afe73f6a1d6bc060ced196 keepalived-1.0.0.tar.gz 147817
diff --git a/sys-cluster/keepalived/files/digest-keepalived-1.1.1 b/sys-cluster/keepalived/files/digest-keepalived-1.1.1
new file mode 100644
index 000000000000..419e7a7a1a03
--- /dev/null
+++ b/sys-cluster/keepalived/files/digest-keepalived-1.1.1
@@ -0,0 +1 @@
+MD5 5a96b7c387f966bfa97b40345ec72820 keepalived-1.1.1.tar.gz 169266
diff --git a/sys-cluster/keepalived/keepalived-1.0.0.ebuild b/sys-cluster/keepalived/keepalived-1.0.0.ebuild
deleted file mode 100644
index 771ca66e7e81..000000000000
--- a/sys-cluster/keepalived/keepalived-1.0.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.0.0.ebuild,v 1.2 2003/07/01 16:48:35 iggy Exp $
-
-DESCRIPTION="The main goal of the keepalived project is to add a strong & robust keepalive facility to the Linux Virtual Server project."
-HOMEPAGE="http://keepalived.sourceforge.net"
-LICENSE="GPL-2"
-DEPEND="popt"
-
-SRC_URI="http://keepalived.sourceforge.net/software/${P}.tar.gz"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="x86"
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	cd "${S}"
-	./configure --prefix=/
-	make || die
-}
-
-src_install() {
-
-	into /
-	dosbin bin/keepalived
-
-	into /
-	dobin bin/genhash
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init-keepalived keepalived
-
-	insinto /etc/keepalived
-	doins keepalived/etc/keepalived/keepalived.conf
-
-	insinto /etc/keepalived/samples
-	doins keepalived/samples/client.pem
-	doins keepalived/samples/dh1024.pem
-	doins keepalived/samples/keepalived.conf.HTTP_GET.port
-	doins keepalived/samples/keepalived.conf.SSL_GET
-	doins keepalived/samples/keepalived.conf.SYNOPSIS
-	doins keepalived/samples/keepalived.conf.ci-linux
-	doins keepalived/samples/keepalived.conf.fwmark
-	doins keepalived/samples/keepalived.conf.inhibit
-	doins keepalived/samples/keepalived.conf.misc_check
-	doins keepalived/samples/keepalived.conf.misc_check_arg
-	doins keepalived/samples/keepalived.conf.real_server_group
-	doins keepalived/samples/keepalived.conf.sample
-	doins keepalived/samples/keepalived.conf.status_code
-	doins keepalived/samples/keepalived.conf.virtualhost
-	doins keepalived/samples/keepalived.conf.vrrp
-	doins keepalived/samples/keepalived.conf.vrrp.lvs_syncd
-	doins keepalived/samples/keepalived.conf.vrrp.scripts
-	doins keepalived/samples/keepalived.conf.vrrp.sync
-	doins keepalived/samples/root.pem
-	doins keepalived/samples/sample.misccheck.smbcheck.sh
-
-	dodoc ChangeLog COPYING README keepalived.spec
-	einfo ""
-	einfo "If you want Linux Virtual Server support in keepalived"
-	einfo "then you must compile an LVS patched kernel, the ipvsadm"
-	einfo "userland tools, and reemerge keepalived."
-	einfo ""
-}
-
diff --git a/sys-cluster/keepalived/keepalived-1.0.3.ebuild b/sys-cluster/keepalived/keepalived-1.0.3.ebuild
index 41f275e6ec6a..e1bbb6b5729a 100644
--- a/sys-cluster/keepalived/keepalived-1.0.3.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.0.3.ebuild
@@ -2,13 +2,13 @@ DESCRIPTION="The main goal of the keepalived project is to add a strong & robust
 HOMEPAGE="http://keepalived.sourceforge.net"
 LICENSE="GPL-2"
 DEPEND="virtual/linux-sources
-	popt"
+	dev-libs/popt"
 
 SRC_URI="http://keepalived.sourceforge.net/software/${P}.tar.gz"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 S="${WORKDIR}/${P}"
 
 src_compile() {
diff --git a/sys-cluster/keepalived/keepalived-1.1.1.ebuild b/sys-cluster/keepalived/keepalived-1.1.1.ebuild
new file mode 100644
index 000000000000..4b84e8b2d4c6
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-1.1.1.ebuild
@@ -0,0 +1,56 @@
+DESCRIPTION="The main goal of the keepalived project is to add a strong & robust keepalive facility to the Linux Virtual Server project."
+HOMEPAGE="http://keepalived.sourceforge.net"
+LICENSE="GPL-2"
+
+DEPEND="virtual/linux-sources
+	dev-libs/popt"
+
+SRC_URI="http://keepalived.sourceforge.net/software/${P}.tar.gz"
+
+IUSE=""
+SLOT="0"
+KEYWORDS="~x86"
+S="${WORKDIR}/${P}"
+
+src_compile() {
+	local myconf
+	
+	myconf="--prefix=/"
+
+	use debug && myconf="${myconf} --enable-debug"
+#	use profile && myconf="${myconf} --enable-profile"
+	
+	cd "${S}"
+	./configure ${myconf} || die "configure failed"
+	emake || die "make failed (myconf=${myconf})"
+
+}
+
+src_install() {
+
+	cd "${S}"
+	einstall || die
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/init-keepalived keepalived
+
+	dodoc doc/* doc/samples/*
+
+
+}
+
+pkg_postinst() {
+
+	einfo ""
+	einfo "If you want Linux Virtual Server support in"
+	einfo "keepalived then you must emerge an LVS patched" 
+	einfo "kernel like gentoo-sources, compile with ipvs"
+	einfo "support either as a module or built into the"
+	einfo "kernel, emerge the ipvsadm userland tools,"
+	einfo "and reemerge keepalived."
+	einfo ""
+	einfo "For debug support add USE=\"debug\""
+	einfo "to your /etc/make.conf"
+	einfo ""
+
+}
diff --git a/sys-cluster/keepalived/metadata.xml b/sys-cluster/keepalived/metadata.xml
index 09e1b66f45ef..38d2ae42f731 100644
--- a/sys-cluster/keepalived/metadata.xml
+++ b/sys-cluster/keepalived/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-  <herd>no-herd</herd>
+  <herd>cluster</herd>
   <maintainer>
     <email>iggy@gentoo.org</email>
     <name>Brian Jackson</name>