punt old, to avoid downgrade of linux-headers for one

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

5 files changed, 6 insertions, 439 deletions

diff --git a/sys-cluster/keepalived/ChangeLog b/sys-cluster/keepalived/ChangeLog
index 9b0846a229e0..f29b8402e127 100644
--- a/sys-cluster/keepalived/ChangeLog
+++ b/sys-cluster/keepalived/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/keepalived
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.90 2012/03/17 17:30:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.91 2012/05/25 09:51:29 ssuominen Exp $
+
+  25 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/keepalived-1.1.13-linux-2.6.21-ip_vs.h, -keepalived-1.2.2.ebuild,
+  -keepalived-1.2.2-r1.ebuild, -keepalived-1.2.2-r2.ebuild:
+  old
 
   17 Mar 2012; Raúl Porcel <armin76@gentoo.org> keepalived-1.2.2-r3.ebuild:
   ia64/s390/sparc stable wrt #371469
diff --git a/sys-cluster/keepalived/files/keepalived-1.1.13-linux-2.6.21-ip_vs.h b/sys-cluster/keepalived/files/keepalived-1.1.13-linux-2.6.21-ip_vs.h
deleted file mode 100644
index 57a9c71fdd5d..000000000000
--- a/sys-cluster/keepalived/files/keepalived-1.1.13-linux-2.6.21-ip_vs.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/* This file is copied from the Linux kernel sources, as of 2.6.21.
- * The IP_VS_VERSION_CODE has not changed in a very long time :-).
- * The __KERNEL__ portion has been removed for size.
- * Robin H. Johnson <robbat2@gentoo.org>
- * 27 April 2007
- */
-/*
- *      IP Virtual Server
- *      data structure and functionality definitions
- */
-
-#ifndef _IP_VS_H
-#define _IP_VS_H
-
-#include <asm/types.h>		/* For __uXX types */
-#include <linux/types.h>	/* For __beXX types in userland */
-
-#define IP_VS_VERSION_CODE	0x010201
-#define NVERSION(version)			\
-	(version >> 16) & 0xFF,			\
-	(version >> 8) & 0xFF,			\
-	version & 0xFF
-
-/*
- *      Virtual Service Flags
- */
-#define IP_VS_SVC_F_PERSISTENT	0x0001		/* persistent port */
-#define IP_VS_SVC_F_HASHED	0x0002		/* hashed entry */
-
-/*
- *      Destination Server Flags
- */
-#define IP_VS_DEST_F_AVAILABLE	0x0001		/* server is available */
-#define IP_VS_DEST_F_OVERLOAD	0x0002		/* server is overloaded */
-
-/*
- *      IPVS sync daemon states
- */
-#define IP_VS_STATE_NONE	0x0000		/* daemon is stopped */
-#define IP_VS_STATE_MASTER	0x0001		/* started as master */
-#define IP_VS_STATE_BACKUP	0x0002		/* started as backup */
-
-/*
- *      IPVS socket options
- */
-#define IP_VS_BASE_CTL		(64+1024+64)		/* base */
-
-#define IP_VS_SO_SET_NONE	IP_VS_BASE_CTL		/* just peek */
-#define IP_VS_SO_SET_INSERT	(IP_VS_BASE_CTL+1)
-#define IP_VS_SO_SET_ADD	(IP_VS_BASE_CTL+2)
-#define IP_VS_SO_SET_EDIT	(IP_VS_BASE_CTL+3)
-#define IP_VS_SO_SET_DEL	(IP_VS_BASE_CTL+4)
-#define IP_VS_SO_SET_FLUSH	(IP_VS_BASE_CTL+5)
-#define IP_VS_SO_SET_LIST	(IP_VS_BASE_CTL+6)
-#define IP_VS_SO_SET_ADDDEST	(IP_VS_BASE_CTL+7)
-#define IP_VS_SO_SET_DELDEST	(IP_VS_BASE_CTL+8)
-#define IP_VS_SO_SET_EDITDEST	(IP_VS_BASE_CTL+9)
-#define IP_VS_SO_SET_TIMEOUT	(IP_VS_BASE_CTL+10)
-#define IP_VS_SO_SET_STARTDAEMON (IP_VS_BASE_CTL+11)
-#define IP_VS_SO_SET_STOPDAEMON (IP_VS_BASE_CTL+12)
-#define IP_VS_SO_SET_RESTORE    (IP_VS_BASE_CTL+13)
-#define IP_VS_SO_SET_SAVE       (IP_VS_BASE_CTL+14)
-#define IP_VS_SO_SET_ZERO	(IP_VS_BASE_CTL+15)
-#define IP_VS_SO_SET_MAX	IP_VS_SO_SET_ZERO
-
-#define IP_VS_SO_GET_VERSION	IP_VS_BASE_CTL
-#define IP_VS_SO_GET_INFO	(IP_VS_BASE_CTL+1)
-#define IP_VS_SO_GET_SERVICES	(IP_VS_BASE_CTL+2)
-#define IP_VS_SO_GET_SERVICE	(IP_VS_BASE_CTL+3)
-#define IP_VS_SO_GET_DESTS	(IP_VS_BASE_CTL+4)
-#define IP_VS_SO_GET_DEST	(IP_VS_BASE_CTL+5)	/* not used now */
-#define IP_VS_SO_GET_TIMEOUT	(IP_VS_BASE_CTL+6)
-#define IP_VS_SO_GET_DAEMON	(IP_VS_BASE_CTL+7)
-#define IP_VS_SO_GET_MAX	IP_VS_SO_GET_DAEMON
-
-
-/*
- *      IPVS Connection Flags
- */
-#define IP_VS_CONN_F_FWD_MASK	0x0007		/* mask for the fwd methods */
-#define IP_VS_CONN_F_MASQ	0x0000		/* masquerading/NAT */
-#define IP_VS_CONN_F_LOCALNODE	0x0001		/* local node */
-#define IP_VS_CONN_F_TUNNEL	0x0002		/* tunneling */
-#define IP_VS_CONN_F_DROUTE	0x0003		/* direct routing */
-#define IP_VS_CONN_F_BYPASS	0x0004		/* cache bypass */
-#define IP_VS_CONN_F_SYNC	0x0020		/* entry created by sync */
-#define IP_VS_CONN_F_HASHED	0x0040		/* hashed entry */
-#define IP_VS_CONN_F_NOOUTPUT	0x0080		/* no output packets */
-#define IP_VS_CONN_F_INACTIVE	0x0100		/* not established */
-#define IP_VS_CONN_F_OUT_SEQ	0x0200		/* must do output seq adjust */
-#define IP_VS_CONN_F_IN_SEQ	0x0400		/* must do input seq adjust */
-#define IP_VS_CONN_F_SEQ_MASK	0x0600		/* in/out sequence mask */
-#define IP_VS_CONN_F_NO_CPORT	0x0800		/* no client port set yet */
-#define IP_VS_CONN_F_TEMPLATE	0x1000		/* template, not connection */
-
-/* Move it to better place one day, for now keep it unique */
-#define NFC_IPVS_PROPERTY	0x10000
-
-#define IP_VS_SCHEDNAME_MAXLEN	16
-#define IP_VS_IFNAME_MAXLEN	16
-
-
-/*
- *	The struct ip_vs_service_user and struct ip_vs_dest_user are
- *	used to set IPVS rules through setsockopt.
- */
-struct ip_vs_service_user {
-	/* virtual service addresses */
-	u_int16_t		protocol;
-	__be32			addr;		/* virtual ip address */
-	__be16			port;
-	u_int32_t		fwmark;		/* firwall mark of service */
-
-	/* virtual service options */
-	char			sched_name[IP_VS_SCHEDNAME_MAXLEN];
-	unsigned		flags;		/* virtual service flags */
-	unsigned		timeout;	/* persistent timeout in sec */
-	__be32			netmask;	/* persistent netmask */
-};
-
-
-struct ip_vs_dest_user {
-	/* destination server address */
-	__be32			addr;
-	__be16			port;
-
-	/* real server options */
-	unsigned		conn_flags;	/* connection flags */
-	int			weight;		/* destination weight */
-
-	/* thresholds for active connections */
-	u_int32_t		u_threshold;	/* upper threshold */
-	u_int32_t		l_threshold;	/* lower threshold */
-};
-
-
-/*
- *	IPVS statistics object (for user space)
- */
-struct ip_vs_stats_user
-{
-	__u32                   conns;          /* connections scheduled */
-	__u32                   inpkts;         /* incoming packets */
-	__u32                   outpkts;        /* outgoing packets */
-	__u64                   inbytes;        /* incoming bytes */
-	__u64                   outbytes;       /* outgoing bytes */
-
-	__u32			cps;		/* current connection rate */
-	__u32			inpps;		/* current in packet rate */
-	__u32			outpps;		/* current out packet rate */
-	__u32			inbps;		/* current in byte rate */
-	__u32			outbps;		/* current out byte rate */
-};
-
-
-/* The argument to IP_VS_SO_GET_INFO */
-struct ip_vs_getinfo {
-	/* version number */
-	unsigned int		version;
-
-	/* size of connection hash table */
-	unsigned int		size;
-
-	/* number of virtual services */
-	unsigned int		num_services;
-};
-
-
-/* The argument to IP_VS_SO_GET_SERVICE */
-struct ip_vs_service_entry {
-	/* which service: user fills in these */
-	u_int16_t		protocol;
-	__be32			addr;		/* virtual address */
-	__be16			port;
-	u_int32_t		fwmark;		/* firwall mark of service */
-
-	/* service options */
-	char			sched_name[IP_VS_SCHEDNAME_MAXLEN];
-	unsigned		flags;          /* virtual service flags */
-	unsigned		timeout;	/* persistent timeout */
-	__be32			netmask;	/* persistent netmask */
-
-	/* number of real servers */
-	unsigned int		num_dests;
-
-	/* statistics */
-	struct ip_vs_stats_user stats;
-};
-
-
-struct ip_vs_dest_entry {
-	__be32			addr;		/* destination address */
-	__be16			port;
-	unsigned		conn_flags;	/* connection flags */
-	int			weight;		/* destination weight */
-
-	u_int32_t		u_threshold;	/* upper threshold */
-	u_int32_t		l_threshold;	/* lower threshold */
-
-	u_int32_t		activeconns;	/* active connections */
-	u_int32_t		inactconns;	/* inactive connections */
-	u_int32_t		persistconns;	/* persistent connections */
-
-	/* statistics */
-	struct ip_vs_stats_user stats;
-};
-
-
-/* The argument to IP_VS_SO_GET_DESTS */
-struct ip_vs_get_dests {
-	/* which service: user fills in these */
-	u_int16_t		protocol;
-	__be32			addr;		/* virtual address */
-	__be16			port;
-	u_int32_t		fwmark;		/* firwall mark of service */
-
-	/* number of real servers */
-	unsigned int		num_dests;
-
-	/* the real servers */
-	struct ip_vs_dest_entry	entrytable[0];
-};
-
-
-/* The argument to IP_VS_SO_GET_SERVICES */
-struct ip_vs_get_services {
-	/* number of virtual services */
-	unsigned int		num_services;
-
-	/* service table */
-	struct ip_vs_service_entry entrytable[0];
-};
-
-
-/* The argument to IP_VS_SO_GET_TIMEOUT */
-struct ip_vs_timeout_user {
-	int			tcp_timeout;
-	int			tcp_fin_timeout;
-	int			udp_timeout;
-};
-
-
-/* The argument to IP_VS_SO_GET_DAEMON */
-struct ip_vs_daemon_user {
-	/* sync daemon state (master/backup) */
-	int			state;
-
-	/* multicast interface name */
-	char			mcast_ifn[IP_VS_IFNAME_MAXLEN];
-
-	/* SyncID we belong to */
-	int			syncid;
-};
-
-
-#ifdef __KERNEL__
-/* This portion of the code removed for size. 
- * Robin H. Johnson <robbat2@gentoo.org>
- * 27 April 2007 */
-#endif /* __KERNEL__ */
-
-#endif	/* _IP_VS_H */
diff --git a/sys-cluster/keepalived/keepalived-1.2.2-r1.ebuild b/sys-cluster/keepalived/keepalived-1.2.2-r1.ebuild
deleted file mode 100644
index 7b3f5b233eed..000000000000
--- a/sys-cluster/keepalived/keepalived-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.3 2011/10/27 16:18:50 jer 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"
-
-RDEPEND="dev-libs/popt
-	sys-apps/iproute2
-	dev-libs/libnl:1.1
-	dev-libs/openssl"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.30"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.1.20-do-not-need-kernel-sources.patch )
-
-DOCS=( README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO doc/keepalived.conf.SYNOPSIS )
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	STRIP=/bin/true \
-	econf \
-		--enable-vrrp \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/init-keepalived keepalived
-
-	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.2-r2.ebuild b/sys-cluster/keepalived/keepalived-1.2.2-r2.ebuild
deleted file mode 100644
index 51414c731c07..000000000000
--- a/sys-cluster/keepalived/keepalived-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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-r2.ebuild,v 1.1 2011/12/10 23:51:01 robbat2 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"
-
-RDEPEND="dev-libs/popt
-	sys-apps/iproute2
-	dev-libs/libnl:1.1
-	dev-libs/openssl"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.30"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.1.20-do-not-need-kernel-sources.patch "${FILESDIR}"/${PN}-1.2.2-bind-afunspec.patch )
-
-DOCS=( README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO doc/keepalived.conf.SYNOPSIS )
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	STRIP=/bin/true \
-	econf \
-		--enable-vrrp \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/init-keepalived keepalived
-
-	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.2.ebuild b/sys-cluster/keepalived/keepalived-1.2.2.ebuild
deleted file mode 100644
index 4d01daf26753..000000000000
--- a/sys-cluster/keepalived/keepalived-1.2.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.ebuild,v 1.8 2011/10/27 16:18:50 jer 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:1.1
-	dev-libs/openssl"
-DEPEND="${RDEPEND}
-	=sys-kernel/linux-headers-2.6*"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.1.20-do-not-need-kernel-sources.patch )
-
-src_prepare() {
-	base_src_prepare
-
-	# Prepare a suitable copy of the IPVS headers
-	# So that we don't need kernel sources at all!
-	mkdir -p "${S}"/include/net || die "Failed to prepare ipvs header directory"
-	cp -f "${FILESDIR}"/${PN}-1.1.13-linux-2.6.21-ip_vs.h \
-		"${S}"/include/net/ip_vs.h || die "Failed to add ipvs header"
-
-	# Ensure that keepalived can find the header that we are injecting
-	append-flags -I"${S}"/include
-
-	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/
-}