ppc/ppc64 stable wrt #368225 Drop old

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

5 files changed, 15 insertions, 338 deletions

diff --git a/sys-cluster/keepalived/ChangeLog b/sys-cluster/keepalived/ChangeLog
index 839bb8aeb0f9..d76d5a61e890 100644
--- a/sys-cluster/keepalived/ChangeLog
+++ b/sys-cluster/keepalived/ChangeLog
@@ -1,6 +1,11 @@
 # 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.76 2011/06/06 01:23:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.77 2011/06/07 11:10:43 xarthisius Exp $
+
+  07 Jun 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  -files/keepalived-1.1.13-linux-2.6.21-ip_vs.h, -keepalived-1.1.20.ebuild,
+  keepalived-1.2.2.ebuild:
+  ppc/ppc64 stable wrt #368225 Drop old
 
   06 Jun 2011; Jeroen Roovers <jer@gentoo.org> keepalived-1.2.2.ebuild:
   Stable for HPPA (bug #368225).
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 913648a4dee6..50d07b78bb80 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -2,18 +2,17 @@
 Hash: SHA1
 
 AUX init-keepalived 741 RMD160 7c01c24d94758cc93fe1c13f89dbc566187ee444 SHA1 90287f22be2a60af28d166481ce21ee497abf06b SHA256 eaae345df0c529fdfe5cf70e2a2626c280ecb483cfe8953b992fda29b5c7e063
-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.1.20.tar.gz 233002 RMD160 49db329a4044f02fcf7874d49628e0a8034843e9 SHA1 cd04772c22ba38520b993acc4cfcb4d191889b6f SHA256 2e6d31bc8846fec00eb8d0bb20719a04bd34bb1144684bdb5e8085d9e1d3b8f2
 DIST keepalived-1.2.2.tar.gz 249557 RMD160 a24f2fd97007c331daf9f2c2b1608eb727780552 SHA1 52a6d46823d29791d10f8869face64b6c6df5616 SHA256 4c05dbd149af120506b4f3a66b4016e30d9ad112e4c26a602e28c366705de8c0
-EBUILD keepalived-1.1.20.ebuild 1841 RMD160 4b8781bb16e5d1e0a66df55a20917dc4d56a96ca SHA1 1300e8b0da352f2e8efe7a6958482620ffa42612 SHA256 b4cb7ffc92f54bf0dca5455cbb071603c3d65211b5085a72863f8c7a702b3b1c
-EBUILD keepalived-1.2.2.ebuild 1846 RMD160 966380807259e14a91ddae0ada153abfee2bd2bf SHA1 47112b1276e6903220d4e3d457bd0ecb670ca9ec SHA256 c1552f99c5f422502606396af5b1e69c299d14eba8facff0e805a8d4fb80bab4
-MISC ChangeLog 11606 RMD160 f48256debe76c27d3249cbe55c406ff61110b692 SHA1 e6c7958ab6079c2af8f8f75e0e645d156ddf70fb SHA256 7584dd280513d2fccc058e9423dfa69928cb470cdcde89d57af59615bfebc2c5
+EBUILD keepalived-1.2.2.ebuild 1851 RMD160 7b9a3e4c3fa963d039ae042c48707216e4d84184 SHA1 ff36cb63187ec3eae2bf646fdc8af61076e7f224 SHA256 f0f1aa3ca722713c41cc05ac2cb8f49f3a8b95ecf855f326f80b5dd3e5780ef0
+MISC ChangeLog 11811 RMD160 655a727454819c49ff6d9b9571480eee5d4e603a SHA1 3f21803a4d83dcc83ff4b0738b14b46951987066 SHA256 c8e8dbace7b991ef498812b50e71c45cb2d2208ce4387aebf6c818e907fc7f71
 MISC metadata.xml 280 RMD160 1869468fd0838a95533ab1a68f8d50f63ee2f0ac SHA1 2d837eb6e9478ffb08e1c597a3f8a9e456f6be12 SHA256 0924e43f049ea2f507b4f5dfa973fa4cedf4e967c19aa9cb5afb6f4ccdef6cf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3sLAIACgkQVWmRsqeSphPYuwCfXrTX+xaNN+s/AV2KBwLQYC/5
-OWMAn1FA+ff5Y5VpEFDLVqpxbb+aZVXv
-=DJGG
+iJwEAQECAAYFAk3uBzwACgkQIiMqcbOVdxThKwP/Ug/FGzg2p6zuKpDYY10Ijdzo
+pE3fIHg1Z5p1r6WZz4blD/UlF55PetRXDNxIypWnkdpf176CiGmG8acc6MYKOS49
+LqWoqMnYCsw4uDB7BouIjdhDCm4WMr/WtvGDuauuNmo1uooP7je0I6YS9vHDaDev
+zDtugrPXRxKzpToP3ms=
+=UM6W
 -----END PGP SIGNATURE-----
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.1.20.ebuild b/sys-cluster/keepalived/keepalived-1.1.20.ebuild
deleted file mode 100644
index 7e166b77f480..000000000000
--- a/sys-cluster/keepalived/keepalived-1.1.20.ebuild
+++ /dev/null
@@ -1,65 +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.1.20.ebuild,v 1.6 2011/01/29 19:00:30 armin76 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/openssl"
-DEPEND="${RDEPEND}
-	=sys-kernel/linux-headers-2.6*"
-
-PATCHES=( "${FILESDIR}"/${P}-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/
-}
diff --git a/sys-cluster/keepalived/keepalived-1.2.2.ebuild b/sys-cluster/keepalived/keepalived-1.2.2.ebuild
index 43d0b27b46a5..a4aa9a233a61 100644
--- a/sys-cluster/keepalived/keepalived-1.2.2.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2011/06/06 01:23:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.2.2.ebuild,v 1.6 2011/06/07 11:10:43 xarthisius Exp $
 
 EAPI=3
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE="debug"
 
 RDEPEND="dev-libs/popt