Add version 0.72. Removed obsolate conf option (bug #358331)

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

7 files changed, 9 insertions, 192 deletions

diff --git a/net-misc/connman/ChangeLog b/net-misc/connman/ChangeLog
index 6879d639fd61..cd784c427ed6 100644
--- a/net-misc/connman/ChangeLog
+++ b/net-misc/connman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/connman
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.36 2011/03/17 13:50:51 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.37 2011/04/14 08:34:07 dagger Exp $
+
+*connman-0.72 (14 Apr 2011)
+
+  14 Apr 2011; Robert Piasek <dagger@gentoo.org> -connman-0.67.ebuild,
+  -connman-0.67-r1.ebuild, -connman-0.69.ebuild, +connman-0.72.ebuild:
+  Add version 0.72. Disable nm-compat option
 
 *connman-0.71 (17 Mar 2011)
 
diff --git a/net-misc/connman/connman-0.67-r1.ebuild b/net-misc/connman/connman-0.67-r1.ebuild
deleted file mode 100644
index 1e4375d1d6a4..000000000000
--- a/net-misc/connman/connman-0.67-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.67-r1.ebuild,v 1.2 2011/01/25 13:47:16 dev-zero Exp $
-
-EAPI="2"
-
-inherit multilib eutils
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="http://connman.net"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bluetooth +caps debug dnsproxy doc examples +ethernet google ofono ntpd openvpn policykit threads tools +wifi wimax"
-# gps meego ospm openconnect
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=dev-libs/libnl-1.1
-	>=net-firewall/iptables-1.4.8
-	net-libs/gnutls
-	bluetooth? ( net-wireless/bluez )
-	caps? ( sys-libs/libcap-ng )
-	ntpd? ( net-misc/ntp )
-	ofono? ( net-misc/ofono )
-	policykit? ( sys-auth/polkit )
-	openvpn? ( net-misc/openvpn )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
-	wimax? ( net-wireless/wimax )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.30
-	doc? ( dev-util/gtk-doc )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-policy-name.patch"
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-client \
-		--enable-fake \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable caps capng) \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable ntpd ntpd builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable dnsproxy dnsproxy builtin) \
-		$(use_enable google google builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable wimax iwmx builtin) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable threads) \
-		$(use_enable tools) \
-		--disable-iospm \
-		--disable-hh2serial-gps \
-		--disable-portal \
-		--disable-meego \
-		--disable-openconnect
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dobin client/cm || die "client installation failed"
-
-	keepdir /var/"$(get_libdir)"/${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
-}
diff --git a/net-misc/connman/connman-0.67.ebuild b/net-misc/connman/connman-0.67.ebuild
deleted file mode 100644
index 5c1e0edda097..000000000000
--- a/net-misc/connman/connman-0.67.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.67.ebuild,v 1.1 2011/01/21 15:10:00 dagger Exp $
-
-EAPI="2"
-
-inherit multilib eutils
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="http://connman.net"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bluetooth +caps debug dnsproxy doc examples +ethernet google ofono openvpn policykit threads tools +wifi wimax"
-# gps meego ospm openconnect
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=dev-libs/libnl-1.1
-	>=net-firewall/iptables-1.4.8
-	>=sys-kernel/linux-headers-2.6.30
-	bluetooth? ( net-wireless/bluez )
-	caps? ( sys-libs/libcap-ng )
-	ofono? ( net-misc/ofono )
-	policykit? ( sys-auth/polkit )
-	openvpn? ( net-misc/openvpn )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
-	wimax? ( net-wireless/wimax )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )"
-
-#src_prepare() {
-#	epatch "${FILESDIR}/${P}-fix-iptables-test.patch"
-#}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-client \
-		--enable-fake \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable caps capng) \
-		$(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 dnsproxy dnsproxy builtin) \
-		$(use_enable google google builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable wimax iwmx builtin) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable threads) \
-		$(use_enable tools) \
-		--disable-iospm \
-		--disable-hh2serial-gps \
-		--disable-portal \
-		--disable-meego \
-		--disable-openconnect
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dobin client/cm || die "client installation failed"
-
-	keepdir /var/"$(get_libdir)"/${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
-}
diff --git a/net-misc/connman/connman-0.69.ebuild b/net-misc/connman/connman-0.72.ebuild
index b71f75982458..29b4343707f5 100644
--- a/net-misc/connman/connman-0.69.ebuild
+++ b/net-misc/connman/connman-0.72.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/net-misc/connman/connman-0.69.ebuild,v 1.1 2011/02/15 10:35:00 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.72.ebuild,v 1.1 2011/04/14 08:34:07 dagger Exp $
 
 EAPI="2"
 
@@ -39,7 +39,6 @@ src_configure() {
 	econf \
 		--localstatedir=/var \
 		--enable-client \
-		--enable-nmcompat=builtin \
 		--enable-fake \
 		--enable-datafiles \
 		--enable-loopback=builtin \
diff --git a/net-misc/connman/files/connman-0.67-fix-policy-name.patch b/net-misc/connman/files/connman-0.67-fix-policy-name.patch
deleted file mode 100644
index e74293bacfa7..000000000000
--- a/net-misc/connman/files/connman-0.67-fix-policy-name.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 027e7ba2b7e11d4abdebfcccea03644035c06ed1 Mon Sep 17 00:00:00 2001
-From: Robert Piasek <dagger@gentoo.org>
-Date: Fri, 21 Jan 2011 15:55:22 +0000
-Subject: [PATCH] Install polkit policy file as net.connman.policy
-
----
- Makefile.plugins |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.plugins b/Makefile.plugins
-index 025e972..889705a 100644
---- a/Makefile.plugins
-+++ b/Makefile.plugins
-@@ -212,7 +212,7 @@ endif
- if DATAFILES
- policydir = @POLKIT_DATADIR@
- 
--policy_DATA = plugins/connman.policy
-+policy_DATA = plugins/net.connman.policy
- endif
- endif
- 
-@@ -266,7 +266,7 @@ endif
- 
- EXTRA_DIST += plugins/polkit.policy
- 
--plugins/connman.policy: plugins/polkit.policy
-+plugins/net.connman.policy: plugins/polkit.policy
- if POLKIT
- 	$(AM_V_GEN)cp $< $@
- endif
--- 
-1.7.4.rc2
-
diff --git a/net-misc/connman/files/connman.confd b/net-misc/connman/files/connman.confd
index 8b1ea86c46e8..6d0c399e544c 100644
--- a/net-misc/connman/files/connman.confd
+++ b/net-misc/connman/files/connman.confd
@@ -12,4 +12,4 @@
 #    -I, --nodevice=DEV: force ignore of given interface name.
 #    -p, --plugin=NAME: specify plugins to load.
 #    -P, --noplugin=NAME: specify plugins not to load.
-CONNMAN_OPTS="--compat"
+CONNMAN_OPTS=""
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
index 467882102eea..81ddd5ded877 100644
--- a/net-misc/connman/metadata.xml
+++ b/net-misc/connman/metadata.xml
@@ -7,7 +7,6 @@
                 <name>Robert Piasek</name>
         </maintainer>
 	<use>
-		<flag name="dnsproxy">Enable dnsproxy support.</flag>
 		<flag name="ethernet">Enable ethernet support.</flag>
 		<flag name="google">Enable Google Public DNS support.</flag>
 		<flag name="ntpd">Use <pkg>net-misc/ntp</pkg> for nptd plugin.</flag>