Version bump to 0.79 and 0.80 as requested by Vadim Efimov & Alessandro Capogna in bug #407563.

(Portage version: 2.1.10.56/cvs/Linux x86_64)

5 files changed, 41 insertions, 110 deletions

diff --git a/net-misc/connman/ChangeLog b/net-misc/connman/ChangeLog
index 4916a8867070..7fbbdadf35c8 100644
--- a/net-misc/connman/ChangeLog
+++ b/net-misc/connman/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/connman
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.49 2012/04/18 17:52:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.50 2012/04/20 10:32:50 chainsaw Exp $
+
+*connman-0.80 (20 Apr 2012)
+*connman-0.79 (20 Apr 2012)
+
+  20 Apr 2012; Tony Vroon <chainsaw@gentoo.org> -connman-0.73.ebuild,
+  -connman-0.75.ebuild, +connman-0.79.ebuild,
+  +files/connman-0.79-glib-include.patch, +connman-0.80.ebuild,
+  -files/fix-for-iptables-1.4.11.patch:
+  Version bump to 0.79 and 0.80 as requested by Vadim Efimov & Alessandro
+  Capogna in bug #407563.
 
   18 Apr 2012; Agostino Sarubbo <ago@gentoo.org> connman-0.78.ebuild:
   Stable for amd64, wrt bug #410613
diff --git a/net-misc/connman/connman-0.75.ebuild b/net-misc/connman/connman-0.79.ebuild
index 1cdf0bb50625..e621e40ea44d 100644
--- a/net-misc/connman/connman-0.75.ebuild
+++ b/net-misc/connman/connman-0.79.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.75.ebuild,v 1.4 2011/10/08 14:18:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.79.ebuild,v 1.1 2012/04/20 10:32:50 chainsaw Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit eutils systemd
+inherit base eutils systemd
 
 DESCRIPTION="Provides a daemon for managing internet connections"
 HOMEPAGE="http://connman.net"
@@ -12,9 +12,8 @@ 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
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="bluetooth +caps debug doc examples +ethernet google ofono openvpn policykit threads tools vpnc +wifi wimax"
 
 RDEPEND=">=dev-libs/glib-2.16
 	>=sys-apps/dbus-1.2.24
@@ -23,7 +22,6 @@ RDEPEND=">=dev-libs/glib-2.16
 	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 )
@@ -35,9 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-2.6.39
 	doc? ( dev-util/gtk-doc )"
 
-src_prepare() {
-	epatch "${FILESDIR}"/fix-for-iptables-1.4.11.patch
-}
+PATCHES=( "${FILESDIR}/${P}-glib-include.patch" )
 
 src_configure() {
 	econf \
@@ -51,7 +47,6 @@ src_configure() {
 		$(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) \
@@ -64,7 +59,6 @@ src_configure() {
 		$(use_enable tools) \
 		--disable-iospm \
 		--disable-hh2serial-gps \
-		--disable-portal \
 		--disable-meego \
 		--disable-openconnect \
 		"$(systemd_with_unitdir systemdunitdir)"
diff --git a/net-misc/connman/connman-0.73.ebuild b/net-misc/connman/connman-0.80.ebuild
index 2ddea975fbb5..ba4332ebc02f 100644
--- a/net-misc/connman/connman-0.73.ebuild
+++ b/net-misc/connman/connman-0.80.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.73.ebuild,v 1.1 2011/04/19 08:19:38 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.80.ebuild,v 1.1 2012/04/20 10:32:50 chainsaw Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit multilib eutils
+inherit eutils systemd
 
 DESCRIPTION="Provides a daemon for managing internet connections"
 HOMEPAGE="http://connman.net"
@@ -12,9 +12,8 @@ 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
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="bluetooth +caps debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax"
 
 RDEPEND=">=dev-libs/glib-2.16
 	>=sys-apps/dbus-1.2.24
@@ -23,7 +22,6 @@ RDEPEND=">=dev-libs/glib-2.16
 	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 )
@@ -32,7 +30,7 @@ RDEPEND=">=dev-libs/glib-2.16
 	wimax? ( net-wireless/wimax )"
 
 DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.30
+	>=sys-kernel/linux-headers-2.6.39
 	doc? ( dev-util/gtk-doc )"
 
 src_configure() {
@@ -47,9 +45,7 @@ src_configure() {
 		$(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) \
@@ -60,16 +56,15 @@ src_configure() {
 		$(use_enable tools) \
 		--disable-iospm \
 		--disable-hh2serial-gps \
-		--disable-portal \
-		--disable-meego \
-		--disable-openconnect
+		--disable-openconnect \
+		"$(systemd_with_unitdir systemdunitdir)"
 }
 
 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/connman-0.79-glib-include.patch b/net-misc/connman/files/connman-0.79-glib-include.patch
new file mode 100644
index 000000000000..2814e008f5a0
--- /dev/null
+++ b/net-misc/connman/files/connman-0.79-glib-include.patch
@@ -0,0 +1,13 @@
+diff -uNr connman-0.79.ORIG/plugins/vpn.c connman-0.79/plugins/vpn.c
+--- connman-0.79.ORIG/plugins/vpn.c	2012-04-20 11:17:28.698899674 +0100
++++ connman-0.79/plugins/vpn.c	2012-04-20 11:19:37.368896124 +0100
+@@ -37,8 +37,7 @@
+ 
+ #include <dbus/dbus.h>
+ 
+-#include <glib/ghash.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ 
+ #include <connman/provider.h>
+ #include <connman/log.h>
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
deleted file mode 100644
index b63c93ba85a7..000000000000
--- a/net-misc/connman/files/fix-for-iptables-1.4.11.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-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
-