Version bump

(Portage version: 2.1.9.1/cvs/Linux x86_64)

4 files changed, 17 insertions, 11 deletions

diff --git a/net-misc/connman/ChangeLog b/net-misc/connman/ChangeLog
index ac53339a4f85..99db46ebbd1c 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.20 2010/08/23 16:20:51 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.21 2010/09/10 13:50:25 dagger Exp $
+
+*connman-0.60 (10 Sep 2010)
+
+  10 Sep 2010; Robert Piasek <dagger@gentoo.org> -connman-0.55.ebuild,
+  +connman-0.60.ebuild:
+  Version bump
 
   23 Aug 2010; Robert Piasek <dagger@gentoo.org> connman-0.57-r2.ebuild:
   Removed unneeded package from RDEPEND
diff --git a/net-misc/connman/connman-0.57-r2.ebuild b/net-misc/connman/connman-0.57-r2.ebuild
index c97e60c82bdc..5758be64f155 100644
--- a/net-misc/connman/connman-0.57-r2.ebuild
+++ b/net-misc/connman/connman-0.57-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.57-r2.ebuild,v 1.3 2010/09/10 13:50:25 dagger Exp $
 
 EAPI="2"
 
diff --git a/net-misc/connman/connman-0.55.ebuild b/net-misc/connman/connman-0.60.ebuild
index 4f86d951ba36..1331d8faee7f 100644
--- a/net-misc/connman/connman-0.55.ebuild
+++ b/net-misc/connman/connman-0.60.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.60.ebuild,v 1.1 2010/09/10 13:50:25 dagger Exp $
 
 EAPI="2"
 
-inherit multilib
+inherit multilib eutils
 
 DESCRIPTION="Provides a daemon for managing internet connections"
 HOMEPAGE="http://connman.net"
@@ -12,8 +12,8 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth +caps debug +dhclient dnsproxy doc examples +ethernet google ofono policykit resolvconf threads tools +udev +wifi wimax"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bluetooth +caps debug +dhclient dnsproxy doc examples +ethernet google ofono policykit threads tools +udev +wifi wimax"
 # gps meego ospm openconnect
 
 RDEPEND=">=dev-libs/glib-2.16
@@ -23,7 +23,6 @@ RDEPEND=">=dev-libs/glib-2.16
 	dhclient? ( net-misc/dhcp )
 	ofono? ( net-misc/ofono )
 	policykit? ( >=sys-auth/policykit-0.7 )
-	resolvconf? ( net-dns/openresolv )
 	udev? ( >=sys-fs/udev-141 )
 	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
 	wimax? ( net-wireless/wimax )"
@@ -31,6 +30,10 @@ RDEPEND=">=dev-libs/glib-2.16
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix-iptables-test.patch"
+}
+
 src_configure() {
 	econf \
 		--localstatedir=/var \
@@ -39,13 +42,12 @@ src_configure() {
 		--enable-datafiles \
 		--enable-loopback=builtin \
 		$(use_enable caps capng) \
-		$(use_enable example test) \
+		$(use_enable examples test) \
 		$(use_enable ethernet ethernet builtin) \
 		$(use_enable wifi wifi builtin) \
 		$(use_enable bluetooth bluetooth builtin) \
 		$(use_enable ofono ofono builtin) \
 		$(use_enable dhclient dhclient builtin) \
-		$(use_enable resolvconf resolvconf builtin) \
 		$(use_enable dnsproxy dnsproxy builtin) \
 		$(use_enable google google builtin) \
 		$(use_enable policykit polkit builtin) \
@@ -55,7 +57,6 @@ src_configure() {
 		$(use_enable threads) \
 		$(use_enable tools) \
 		$(use_enable udev) \
-		--disable-udhcp \
 		--disable-iospm \
 		--disable-hh2serial-gps \
 		--disable-portal \
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
index 3218a77a7848..e174205aff66 100644
--- a/net-misc/connman/metadata.xml
+++ b/net-misc/connman/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="ethernet">Enable ethernet support.</flag>
 		<flag name="google">Enable Google Public DNS support.</flag>
 		<flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
-		<flag name="resolvconf">Use <pkg>rnet-dns/openresolv</pkg> for resolvconf support.</flag>
 		<flag name="tools">Enable testing tools.</flag>
 		<flag name="udev">Enable udev support.</flag>
 		<flag name="wimax">Use <pkg>net-wireless/wimax</pkg> for WiMAX support.</flag>