version bump. drop old

(Portage version: 2.1.9.42/cvs/Linux x86_64)

3 files changed, 13 insertions, 37 deletions

diff --git a/sys-cluster/ipvsadm/ChangeLog b/sys-cluster/ipvsadm/ChangeLog
index 241b33d85ab1..2f828de4e978 100644
--- a/sys-cluster/ipvsadm/ChangeLog
+++ b/sys-cluster/ipvsadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/ipvsadm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.45 2010/09/17 09:39:16 robbat2 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.46 2011/03/07 19:44:12 ultrabug Exp $
+
+*ipvsadm-1.26 (07 Mar 2011)
+
+  07 Mar 2011; Ultrabug <ultrabug@gentoo.org> -ipvsadm-1.25-r1.ebuild,
+  -files/ipvsadm-1.25-netlink-conns.diff, +ipvsadm-1.26.ebuild:
+  version bump. drop old
 
   17 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> ipvsadm-1.21-r1.ebuild,
   ipvsadm-1.24.ebuild:
diff --git a/sys-cluster/ipvsadm/files/ipvsadm-1.25-netlink-conns.diff b/sys-cluster/ipvsadm/files/ipvsadm-1.25-netlink-conns.diff
deleted file mode 100644
index 4a25e6dbdfbb..000000000000
--- a/sys-cluster/ipvsadm/files/ipvsadm-1.25-netlink-conns.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-------------------------------------------------------------------------
-r64 | wensong | 2010-07-22 01:50:58 +0200 (Thu, 22 Jul 2010) | 11 lines
-
-This fixes what appears to be a typo in the netlink client code
-whereby the activeconns is read as activeconns and then
-overwritten by persistentconns. The result is that the active
-connection count reported by ipvsadm -L is wrong if the
-code is compiled to use the netlink interface.
-
-Tested-by: Nigel Kukard <nkukard@lbsd.net>
-Signed-off-by: Simon Horman <horms@verge.net.au>
-Signed-off-by: Wensong Zhang <wensong@linux-vs.org>
-
-
-------------------------------------------------------------------------
-
-Index: ipvsadm/libipvs/libipvs.c
-===================================================================
---- ipvsadm/libipvs/libipvs.c	(revision 63)
-+++ ipvsadm/libipvs/libipvs.c	(revision 64)
-@@ -748,7 +748,7 @@
- 	d->entrytable[i].l_threshold = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_L_THRESH]);
- 	d->entrytable[i].activeconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_ACTIVE_CONNS]);
- 	d->entrytable[i].inactconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_INACT_CONNS]);
--	d->entrytable[i].activeconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_PERSIST_CONNS]);
-+	d->entrytable[i].persistconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_PERSIST_CONNS]);
- 	d->entrytable[i].af = d->af;
- 
- 	if (ipvs_parse_stats(&(d->entrytable[i].stats),
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.25-r1.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.26.ebuild
index fc185a91fd6e..4e51dde3fcd9 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.25-r1.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.26.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.25-r1.ebuild,v 1.1 2010/09/09 09:40:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.26.ebuild,v 1.1 2011/03/07 19:44:12 ultrabug Exp $
 
-EAPI=2
+EAPI=3
 inherit linux-info toolchain-funcs eutils
 
 DESCRIPTION="utility to administer the IP virtual server services offered by the Linux kernel"
@@ -11,7 +11,7 @@ SRC_URI="http://www.linuxvirtualserver.org/software/kernel-2.6/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5.2
@@ -26,8 +26,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PF}-build-fixup.diff \
-		"${FILESDIR}"/${P}-netlink-conns.diff
+	epatch "${FILESDIR}"/${PN}-1.25-r1-build-fixup.diff
 }
 
 src_compile() {