Version bump.

(Portage version: 2.1.9.5/cvs/Linux x86_64)

3 files changed, 11 insertions, 41 deletions

diff --git a/net-misc/connman/ChangeLog b/net-misc/connman/ChangeLog
index 99db46ebbd1c..9d73e7c02694 100644
--- a/net-misc/connman/ChangeLog
+++ b/net-misc/connman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/connman
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.21 2010/09/10 13:50:25 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.22 2010/09/14 09:55:29 dagger Exp $
+
+*connman-0.61 (14 Sep 2010)
+
+  14 Sep 2010; Robert Piasek <dagger@gentoo.org> -connman-0.57-r2.ebuild,
+  -files/connman-0.57-fix-iptables-test.patch, +connman-0.61.ebuild:
+  Version bump.
 
 *connman-0.60 (10 Sep 2010)
 
diff --git a/net-misc/connman/connman-0.57-r2.ebuild b/net-misc/connman/connman-0.61.ebuild
index 5758be64f155..eab6e534043e 100644
--- a/net-misc/connman/connman-0.57-r2.ebuild
+++ b/net-misc/connman/connman-0.61.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.57-r2.ebuild,v 1.3 2010/09/10 13:50:25 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.61.ebuild,v 1.1 2010/09/14 09:55:29 dagger Exp $
 
 EAPI="2"
 
@@ -30,9 +30,9 @@ RDEPEND=">=dev-libs/glib-2.16
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-iptables-test.patch"
-}
+#src_prepare() {
+#	epatch "${FILESDIR}/${P}-fix-iptables-test.patch"
+#}
 
 src_configure() {
 	econf \
diff --git a/net-misc/connman/files/connman-0.57-fix-iptables-test.patch b/net-misc/connman/files/connman-0.57-fix-iptables-test.patch
deleted file mode 100644
index b3dd5d32f389..000000000000
--- a/net-misc/connman/files/connman-0.57-fix-iptables-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f9745d978e6797c4576b52f602325db02dc48403 Mon Sep 17 00:00:00 2001
-From: Robert Piasek <dagger@gentoo.org>
-Date: Thu, 19 Aug 2010 16:33:59 +0100
-Subject: [PATCH] fix iptables-test to work with iptables 1.4.9
-
-Starting with version 1.4.9 iptables dropped xtables_set_revision
-function. This patch removes any use of it.
----
- tools/iptables-test.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/iptables-test.c b/tools/iptables-test.c
-index 1f3235c..b97c520 100644
---- a/tools/iptables-test.c
-+++ b/tools/iptables-test.c
-@@ -110,7 +110,7 @@ static struct ipt_entry *build_quota_drop_entry(void)
- 		return NULL;
- 	m->m->u.match_size = match_size;
- 	strcpy(m->m->u.user.name, m->name);
--	xtables_set_revision(m->m->u.user.name, m->revision);
-+	m->m->u.user.revision = m->revision;
- 	if (m->init != NULL)
- 		m->init(m->m);
- 
-@@ -125,7 +125,7 @@ static struct ipt_entry *build_quota_drop_entry(void)
- 	t->t = xtables_calloc(1, target_size);
- 	t->t->u.target_size = target_size;
- 	strcpy(t->t->u.user.name, "DROP");
--	xtables_set_revision(t->t->u.user.name, t->revision);
-+	t->t->u.user.revision = t->revision;
- 	if (t->init != NULL)
- 		t->init(t->t);
- 
--- 
-1.7.2
-