Add version 0.75. Use systemd eclass

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

6 files changed, 102 insertions, 164 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/Manifest b/net-misc/connman/Manifest
index 2f726806f9c8..35d43d7f57ee 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,12 +1,9 @@
 AUX connman.confd 728 RMD160 a97340dcc14f20a875d9d4cfd9590d75c85d7c2e SHA1 a6a01bf69ffbdefc555e522e46d2e0e67b10ba9f SHA256 767a160c1b3392f0a12d3908a937548a2f604a9a121e744c309ee6f478420b02
 AUX connman.initd 578 RMD160 5648875b3ff9f94f13725e16189a4cfee4faa475 SHA1 efd731b8771d97435d1740941363e1fbc7e7bf3d SHA256 10deff4d07f2a631ef7d797ed420a917c00312381ee69f60346e94cf9a3fa25a
-DIST connman-0.70.tar.gz 612614 RMD160 1016a426ca2b92c9ff6cab27a7643dc80af143f1 SHA1 9ddfd57d957d9266af81b9db1c23da3ae8ff53a6 SHA256 710fddfe0fdad5bf026bdaf836d1db00d62329ee539a6ddcc48e212128a85ebc
-DIST connman-0.71.tar.gz 615778 RMD160 edc683986d6113af048776387dd2be65dd4687e0 SHA1 2a382d5a31d2edc9af088d4f6d3c7da3ee125c7f SHA256 0c8a34e012ff78c70ffbc54bd47b12699149ba9f0e0a77829fe76111b363a5ad
-DIST connman-0.72.tar.gz 623643 RMD160 bd0f20e9c4368beb8c3a8816fcc1a18bd1831998 SHA1 ed619490538ce16a2289b266eadba4a41d12fff3 SHA256 9c8ad312573683fc9f50d5042d4a87ddc8e0700b27ac1b0fb8dc2e8b7424a60f
+AUX fix-for-iptables-1.4.11.patch 2576 RMD160 a4f20df2a0b7287f4099d888dca0866815fd132e SHA1 d4705f7cb64849c83cff9f0d29c8b8fa35689914 SHA256 10f7329fae84058d8bc37d12d93ed50d6cc56e24dd35f39d9453d6b2f9b1250b
 DIST connman-0.73.tar.gz 633003 RMD160 6970531bb0b580a513329f0422f6a4f4acc3c4fe SHA1 a6349e38a544f14c1a12d3657cb9483969731f32 SHA256 b71ff2c3925ea82a7ebf818685f809e595d5c47d767005dfb149c6264b098417
-EBUILD connman-0.70.ebuild 2231 RMD160 7d6fdf27fbec0b68b5f148f5d64625ee11c0b02f SHA1 b38ff0ca0be0f6171cfd5bf29cf7b9e9df511c99 SHA256 2ea8a0901edc423dfb603b7c0164504c4b07c687a270c464dbe931830bc81961
-EBUILD connman-0.71.ebuild 2231 RMD160 354e6719236e66907f18346b777d220cd2be435c SHA1 d10aa1ab30fbddee661a1b0c926be7c0aa3675cc SHA256 5cce3fb581f3d5987b120938aaf987a65b290a68e301391b1bbb0b4fc8d5e3db
-EBUILD connman-0.72.ebuild 2201 RMD160 40a7bb58a997305abd5c5e20b462b395935aed64 SHA1 95debeb4dce6bcddb1070088904890b0f4475eac SHA256 d44f4acb9169b9ea50f595cd3c59ed5954f02bd18f0a6365190a7888b9560334
+DIST connman-0.75.tar.gz 647148 RMD160 866ec3d95dccdd740571b851feaf92f62632bf7c SHA1 e706dca044aff99cfdcce0b96173d955c55b2669 SHA256 b15361237f7ec8092fb0e55d4585550ab35491485edaf10ddd032d6e36299db7
 EBUILD connman-0.73.ebuild 2201 RMD160 e74d1b3b4695abf13264caa688da7def2df475f9 SHA1 d3debdf905c091d4b4f6e34bc11b7b0d037d3dc4 SHA256 1e345c79f9c5552043e00cf06bd5908bf925be0972e9627ef130246352663fc5
-MISC ChangeLog 6958 RMD160 7455a7b2571cb754711f84c1b555be2ceadbd628 SHA1 9a804b19fead5c7336d728d82be00c0093c87c2f SHA256 dcf7a9e59af3d3c56aa24f8f62be6434d8baed751a65005d1fe76ecef0784a4d
+EBUILD connman-0.75.ebuild 2310 RMD160 2e1b78b26bb8541918de8fd72bf8fda3d5a59da2 SHA1 941fd4db04d38bfa124e0254264e6eb43a46f492 SHA256 531d7b61601a36e59772d8a51772afba4b49af4bf987297b5c04ef87ebe94e53
+MISC ChangeLog 7207 RMD160 451c217f7eb8990addc7f8cc94d7d812b05a7ddd SHA1 fa1bd79c1ca80189cbe2c3dc79a87b94afc85dd2 SHA256 dad196d8f9edf63d677ee22912d9ee6f146473d54da0dd702452bc35b35936b1
 MISC metadata.xml 876 RMD160 9b30aff3c043943661d9584cc83696facb5acae8 SHA1 6ae69a57d5fd9e7eb01bf0675fc57f0838109172 SHA256 26a4f0d7d8f129c7b3f8adaa7a6e776acff5560d98eb6bcc61c3e83be74ab163
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
+