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

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 94 insertions, 6 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/Manifest b/net-misc/networkmanager-openconnect/Manifest
index 667cd2fc7d67..a71beecd3c7f 100644
--- a/net-misc/networkmanager-openconnect/Manifest
+++ b/net-misc/networkmanager-openconnect/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX networkmanager-openconnect-0.9.2.0-glib-2.31.patch 655 RMD160 e63e6a7a9008c0cc44e1ae0657775c57a3349c4f SHA1 a3552287fa9c095d4c1bb6529b75f348e960dcce SHA256 f38779ed083269f576b22d35cf8a37d33839bf5fa88cdd9d024855ee4906b1ad
 DIST NetworkManager-openconnect-0.8.4.tar.bz2 302338 RMD160 b039b7e8ca78015161228c0ed804d06c5bdd6083 SHA1 c699a9b9af28c72850c686d6bde7276d7fdc5e47 SHA256 33924e63ed483015664aef35960716ee83954f59af429145bed168ee36360096
 DIST NetworkManager-openconnect-0.9.0.tar.xz 260648 RMD160 2fbe5be4e519a6ee8f02e28374b2c7dacc5a5320 SHA1 f35513eff10bdf2b46cc6eb6021728bdf7f515c6 SHA256 0fef61c672265f2b6008d8439ed5b18fe188f2a5f207227fc79a1b78657a6812
 DIST NetworkManager-openconnect-0.9.2.0.tar.xz 261292 RMD160 a9f099300e9a5ad551371df9de4e32ab922ab4a9 SHA1 a5382bfd3ecb6cff9d6b50475116684bf367269b SHA256 169094ae93f982a45e4c57fa7226637eb948ae309a2a6ece88e179ce798a86c0
 EBUILD networkmanager-openconnect-0.8.4.ebuild 1178 RMD160 be6316d9ba7f6d38989962214bfbe5d3b85728fe SHA1 dd106c38f91a42d9b49a93ea3d276db4d086d8ce SHA256 fcde2f81fcd9bf8e3231cc55f9dfc2d1824300cf28ecd17aaed5d6b670fe1c7b
 EBUILD networkmanager-openconnect-0.9.0.ebuild 1036 RMD160 39ddab1a14a9ac4dfafb044aee38b92234de02b8 SHA1 33edb06f3b789e9056fb689b50d07255092845bd SHA256 be5c42cf78a6963a8a11a8acecb286f90d29ecf57702c0b35400f3729167450d
+EBUILD networkmanager-openconnect-0.9.2.0-r1.ebuild 1257 RMD160 acda7448346a7d39443e149d62f8ea06b0e9e6ac SHA1 27b6a85f13de10f138780d151984b80acc4f9656 SHA256 5bac0082bfa7a54989372a3b0d4d06a338ad72c8f4d05fbc66f562a81b5ccd62
 EBUILD networkmanager-openconnect-0.9.2.0.ebuild 1039 RMD160 217fb5d7bf4daba1f5cb8fdf27cdee43c70210ea SHA1 885b5dca6ea23255801ea5be0aa677a4a2a59440 SHA256 f5f79643700bd08d8078c040cee376e25974253af22174c99510b644eac9ed81
-MISC ChangeLog 1102 RMD160 be0dcf695fb2565bedb2d0f4a415baf608611fce SHA1 5e85112f34e5d09895c41579a8e5b220fdf9e283 SHA256 db12004b074909f33c54b1298fd8e1c2146b9ee988e369697db5765b1331ae07
+MISC ChangeLog 1429 RMD160 08d7a05e5d78f76a696b7644ed1dc6c9ed9568d4 SHA1 982458e46b99a1d50d8f8aaf7ddc14baa520b3c6 SHA256 9a852dbf8960e3ea4b1a2a810bef269ad0d053333f4f58697385d361248e170f
 MISC metadata.xml 517 RMD160 400e7c255754bcee547640d99b532aab79610120 SHA1 98c3f5e20fa145a8f16217350ba5f6b254d594f4 SHA256 4349695172dc69f311ffe37b6370714b5feb38cd2fc11cd7adeabe0c3d21e0fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7O/3kACgkQdjK8w9WeBnA1UwEArHjGE70H5p0y2K57rXIwryNm
-j0IoHOTOUsYhDf79cQwA/iNyjp2X677P7hCT+ogR9cgMurgnSp1gnQUByEueDXvl
-=fE4w
+iF4EAREIAAYFAk9goYsACgkQdjK8w9WeBnAkTgD7BXUqOs9PL2Al0fWc90p1g7pB
+ecu/7G7/K+ehSbl5xyQA/3oH/iIyP1Em/juTltqbZYlHxwU67pYd7xucIELExejT
+=4YrG
 -----END PGP SIGNATURE-----
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
+}