Create nm-openconnect user (bug #408141, thanks to Berthold Humkamp). Fix building with glib-2.31.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

3 files changed, 88 insertions, 2 deletions

diff --git a/net-misc/networkmanager-openconnect/ChangeLog b/net-misc/networkmanager-openconnect/ChangeLog
index d5c1338183fd..a9525d8008fd 100644
--- a/net-misc/networkmanager-openconnect/ChangeLog
+++ b/net-misc/networkmanager-openconnect/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/networkmanager-openconnect
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/ChangeLog,v 1.3 2011/11/25 02:37:39 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/ChangeLog,v 1.4 2012/03/14 13:47:49 tetromino Exp $
+
+*networkmanager-openconnect-0.9.2.0-r1 (14 Mar 2012)
+
+  14 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +networkmanager-openconnect-0.9.2.0-r1.ebuild,
+  +files/networkmanager-openconnect-0.9.2.0-glib-2.31.patch:
+  Create nm-openconnect user (bug #408141, thanks to Berthold Humkamp). Fix
+  building with glib-2.31.
 
 *networkmanager-openconnect-0.9.2.0 (25 Nov 2011)
 
diff --git a/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.2.0-glib-2.31.patch b/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.2.0-glib-2.31.patch
new file mode 100644
index 000000000000..ec6b1f2fe4e0
--- /dev/null
+++ b/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.2.0-glib-2.31.patch
@@ -0,0 +1,20 @@
+commit ca8a39d1bb999ba98ead45e53041fc3ea28ecd5c
+Author: David Woodhouse <David.Woodhouse@intel.com>
+Date:   Thu Nov 10 23:19:32 2011 +0000
+
+    Fix build failure: include <glib.h>, not <glib/gtypes.h> directly.
+
+diff --git a/src/nm-openconnect-service.h b/src/nm-openconnect-service.h
+index e454f82..684a5b3 100644
+--- a/src/nm-openconnect-service.h
++++ b/src/nm-openconnect-service.h
+@@ -25,8 +25,7 @@
+ #ifndef NM_OPENCONNECT_PLUGIN_H
+ #define NM_OPENCONNECT_PLUGIN_H
+ 
+-#include <glib/gtypes.h>
+-#include <glib-object.h>
++#include <glib.h>
+ #include <nm-vpn-plugin.h>
+ 
+ #define NM_TYPE_OPENCONNECT_PLUGIN            (nm_openconnect_plugin_get_type ())
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.2.0-r1.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.2.0-r1.ebuild
new file mode 100644
index 000000000000..468075a19223
--- /dev/null
+++ b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.2.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.2.0-r1.ebuild,v 1.1 2012/03/14 13:47:49 tetromino Exp $
+
+EAPI="4"
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit eutils gnome.org user
+
+DESCRIPTION="NetworkManager OpenConnect plugin"
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome"
+
+RDEPEND="
+	>=net-misc/networkmanager-${PV}
+	>=dev-libs/dbus-glib-0.74
+	dev-libs/libxml2:2
+	net-misc/openconnect
+	gnome? (
+		>=x11-libs/gtk+-2.91.4:3
+		gnome-base/gconf:2
+		gnome-base/gnome-keyring
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+src_prepare() {
+	# Upstream patch for glib-2.31 compatibility
+	epatch "${FILESDIR}/${P}-glib-2.31.patch"
+}
+
+src_configure() {
+	ECONF="--disable-more-warnings
+		--disable-static
+		--with-gtkver=3
+		$(use_with gnome)
+		$(use_with gnome authdlg)"
+
+	econf ${ECONF}
+}
+
+src_install() {
+	default
+	# Remove useless .la files
+	find "${D}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_postinst() {
+	enewgroup nm-openconnect
+	enewuser nm-openconnect -1 -1 -1 nm-openconnect
+}