Add version 0.75. Use systemd eclass

(Portage version: 2.1.10.3/cvs/Linux x86_64)

5 files changed, 98 insertions, 157 deletions

diff --git a/net-misc/connman/ChangeLog b/net-misc/connman/ChangeLog
index 3179ae17e7f8..da81b5848551 100644
--- a/net-misc/connman/ChangeLog
+++ b/net-misc/connman/ChangeLog
@@ -1,6 +1,13 @@
 # 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.38 2011/04/19 08:19:38 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.39 2011/06/16 12:11:51 dagger Exp $
+
+*connman-0.75 (16 Jun 2011)
+
+  16 Jun 2011; Robert Piasek <dagger@gentoo.org> -connman-0.70.ebuild,
+  -connman-0.71.ebuild, -connman-0.72.ebuild, +connman-0.75.ebuild,
+  +files/fix-for-iptables-1.4.11.patch:
+  Add version 0.75. Use systemd eclasas
 
 *connman-0.73 (19 Apr 2011)
 
diff --git a/net-misc/connman/connman-0.71.ebuild b/net-misc/connman/connman-0.71.ebuild
deleted file mode 100644
index 053050dfab67..000000000000
--- a/net-misc/connman/connman-0.71.ebuild
+++ /dev/null
@@ -1,76 +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.71.ebuild,v 1.1 2011/03/17 13:50:51 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 doc examples +ethernet google ofono ntpd openvpn policykit threads tools vpnc +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 )
-	vpnc? ( net-misc/vpnc )
-	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_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-client \
-		--enable-nmcompat=builtin \
-		--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 google google builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable vpnc vpnc 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.72.ebuild b/net-misc/connman/connman-0.72.ebuild
deleted file mode 100644
index 29b4343707f5..000000000000
--- a/net-misc/connman/connman-0.72.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.72.ebuild,v 1.1 2011/04/14 08:34:07 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 doc examples +ethernet google ofono ntpd openvpn policykit threads tools vpnc +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 )
-	vpnc? ( net-misc/vpnc )
-	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_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 google google builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable vpnc vpnc 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.70.ebuild b/net-misc/connman/connman-0.75.ebuild
index 6b359683089d..072e123080fa 100644
--- a/net-misc/connman/connman-0.70.ebuild
+++ b/net-misc/connman/connman-0.75.ebuild
@@ -1,10 +1,10 @@
 # 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.70.ebuild,v 1.1 2011/02/22 13:55:32 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.75.ebuild,v 1.1 2011/06/16 12:11:51 dagger Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils systemd
 
 DESCRIPTION="Provides a daemon for managing internet connections"
 HOMEPAGE="http://connman.net"
@@ -35,11 +35,14 @@ DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-2.6.30
 	doc? ( dev-util/gtk-doc )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/fix-for-iptables-1.4.11.patch
+}
+
 src_configure() {
 	econf \
 		--localstatedir=/var \
 		--enable-client \
-		--enable-nmcompat=builtin \
 		--enable-fake \
 		--enable-datafiles \
 		--enable-loopback=builtin \
@@ -63,14 +66,15 @@ src_configure() {
 		--disable-hh2serial-gps \
 		--disable-portal \
 		--disable-meego \
-		--disable-openconnect
+		--disable-openconnect \
+		--with-systemdunitdir="$(systemd_get_unitdir)"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dobin client/cm || die "client installation failed"
 
-	keepdir /var/"$(get_libdir)"/${PN} || die
+	keepdir /var/lib/${PN} || die
 	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
 	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
 }
diff --git a/net-misc/connman/files/fix-for-iptables-1.4.11.patch b/net-misc/connman/files/fix-for-iptables-1.4.11.patch
new file mode 100644
index 000000000000..b63c93ba85a7
--- /dev/null
+++ b/net-misc/connman/files/fix-for-iptables-1.4.11.patch
@@ -0,0 +1,81 @@
+From 88c1dba4f9d28df97c996672f0267f6b2eb03f32 Mon Sep 17 00:00:00 2001
+From: Robert Piasek <dagger@gentoo.org>
+Date: Thu, 16 Jun 2011 12:42:25 +0100
+Subject: [PATCH] Fix compilation against iptables 1.4.11
+
+---
+ src/iptables.c        |   16 ++++++++++++----
+ tools/iptables-test.c |   16 ++++++++++++----
+ 2 files changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/src/iptables.c b/src/iptables.c
+index c799c25..f70be45 100644
+--- a/src/iptables.c
++++ b/src/iptables.c
+@@ -1088,9 +1088,13 @@ static int iptables_command(int argc, char *argv[])
+ 			if (xt_t->init != NULL)
+ 				xt_t->init(xt_t->t);
+ 			iptables_globals.opts =
+-				xtables_merge_options(iptables_globals.opts,
+-						     xt_t->extra_opts,
+-						     &xt_t->option_offset);
++				xtables_merge_options(
++#if XTABLES_VERSION_CODE > 5
++						iptables_globals.orig_opts,
++#endif
++						iptables_globals.opts,
++						xt_t->extra_opts,
++						&xt_t->option_offset);
+ 			if (iptables_globals.opts == NULL)
+ 				goto out;
+ 
+@@ -1112,7 +1116,11 @@ static int iptables_command(int argc, char *argv[])
+ 				xt_m->init(xt_m->m);
+ 			if (xt_m != xt_m->next) {
+ 				iptables_globals.opts =
+-				xtables_merge_options(iptables_globals.opts,
++				xtables_merge_options(
++#if XTABLES_VERSION_CODE > 5
++						iptables_globals.orig_opts,
++#endif
++						iptables_globals.opts,
+ 						xt_m->extra_opts,
+ 						&xt_m->option_offset);
+ 				if (iptables_globals.opts == NULL)
+diff --git a/tools/iptables-test.c b/tools/iptables-test.c
+index e316cc9..7c5f05e 100644
+--- a/tools/iptables-test.c
++++ b/tools/iptables-test.c
+@@ -1075,9 +1075,13 @@ int main(int argc, char *argv[])
+ 			if (xt_t->init != NULL)
+ 				xt_t->init(xt_t->t);
+ 			connman_iptables_globals.opts =
+-				xtables_merge_options(connman_iptables_globals.opts,
+-						     xt_t->extra_opts,
+-						     &xt_t->option_offset);
++				xtables_merge_options(
++#if XTABLES_VERSION_CODE > 5
++						connman_iptables_globals.orig_opts,
++#endif
++						connman_iptables_globals.opts,
++						xt_t->extra_opts,
++						&xt_t->option_offset);
+ 			if (connman_iptables_globals.opts == NULL)
+ 				goto out;
+ 
+@@ -1101,7 +1105,11 @@ int main(int argc, char *argv[])
+ 				xt_m->init(xt_m->m);
+ 			if (xt_m != xt_m->next) {
+ 				connman_iptables_globals.opts =
+-					xtables_merge_options(connman_iptables_globals.opts,
++					xtables_merge_options(
++#if XTABLES_VERSION_CODE > 5
++						connman_iptables_globals.orig_opts,
++#endif
++						connman_iptables_globals.opts,
+ 						xt_m->extra_opts,
+ 						&xt_m->option_offset);
+ 				if (connman_iptables_globals.opts == NULL)
+-- 
+1.7.5.3
+