Fix build failure with glib-2.32 (bug #438474, thanks to Sergey Bobrov). Update license. Drop old.

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

6 files changed, 59 insertions, 118 deletions

diff --git a/app-admin/gnome-system-tools/ChangeLog b/app-admin/gnome-system-tools/ChangeLog
index ae261fe0cce1..47b28c3ef14a 100644
--- a/app-admin/gnome-system-tools/ChangeLog
+++ b/app-admin/gnome-system-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/gnome-system-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/ChangeLog,v 1.118 2012/07/15 16:17:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/ChangeLog,v 1.119 2012/10/17 10:34:08 tetromino Exp $
+
+  17 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-system-tools-2.32.0.ebuild, -gnome-system-tools-2.32.0-r1.ebuild,
+  gnome-system-tools-2.32.0-r2.ebuild, gnome-system-tools-2.32.0-r3.ebuild,
+  +files/gnome-system-tools-2.32.0-glib-2.32.patch:
+  Fix build failure with glib-2.32 (bug #438474, thanks to Sergey Bobrov).
+  Update license. Drop old.
 
   15 Jul 2012; Raúl Porcel <armin76@gentoo.org>
   gnome-system-tools-2.32.0-r3.ebuild:
diff --git a/app-admin/gnome-system-tools/files/gnome-system-tools-2.32.0-glib-2.32.patch b/app-admin/gnome-system-tools/files/gnome-system-tools-2.32.0-glib-2.32.patch
new file mode 100644
index 000000000000..6ad359f42dee
--- /dev/null
+++ b/app-admin/gnome-system-tools/files/gnome-system-tools-2.32.0-glib-2.32.patch
@@ -0,0 +1,45 @@
+From 437d0f671a07361e79dd9ce2a1064855efba3308 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 17 Oct 2012 06:19:46 -0400
+Subject: [PATCH] Do not call g_thread_init()
+
+It's not needed with >=glib-2.34 since gst_init_tool() calls gtk_init(),
+which calls g_type_init(), which initializes the threading system
+automatically.
+
+With >=glib-2.32, using g_thread_init() is deprecated and results in a
+linking error.
+
+https://bugs.gentoo.org/show_bug.cgi?id=438474
+---
+ src/network/main.c | 1 -
+ src/shares/main.c  | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/network/main.c b/src/network/main.c
+index 8d302b4..0438b26 100644
+--- a/src/network/main.c
++++ b/src/network/main.c
+@@ -185,7 +185,6 @@ main (int argc, gchar *argv[])
+     { NULL }
+   };
+ 
+-  g_thread_init (NULL);
+   gst_init_tool ("network-admin", argc, argv, entries);
+   tool = gst_network_tool_new ();
+ 
+diff --git a/src/shares/main.c b/src/shares/main.c
+index f859ecc..beee15a 100644
+--- a/src/shares/main.c
++++ b/src/shares/main.c
+@@ -104,7 +104,6 @@ main (int argc, char *argv[])
+ 		{ NULL }
+ 	};
+ 
+-	g_thread_init (NULL);
+ 	gst_init_tool ("shares-admin", argc, argv, entries);
+ 	tool = GST_TOOL (gst_shares_tool_new ());
+ 
+-- 
+1.7.12.3
+
diff --git a/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r1.ebuild b/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r1.ebuild
deleted file mode 100644
index ab587264b68a..000000000000
--- a/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r1.ebuild,v 1.3 2012/05/03 18:02:21 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
-HOMEPAGE="http://www.gnome.org/projects/gst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="nfs samba" # policykit
-
-RDEPEND="
-	>=app-admin/system-tools-backends-2.10.1
-	>=dev-libs/liboobs-2.31.91
-	>=x11-libs/gtk+-2.19.7:2
-	>=dev-libs/glib-2.25.3:2
-	dev-libs/dbus-glib
-	>=gnome-base/nautilus-2.9.90
-	sys-libs/cracklib
-	nfs? ( net-fs/nfs-utils )
-	samba? ( >=net-fs/samba-3 )"
-#	policykit? (
-#		>=sys-auth/polkit-0.92
-#		>=gnome-extra/polkit-gnome-0.92 )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.3.2
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.0"
-
-pkg_setup() {
-	DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-polkit-gtk"
-#		$(use_enable policykit polkit-gtk)"
-
-	if ! use nfs && ! use samba; then
-		G2CONF="${G2CONF} --disable-shares"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gold.patch
-	gnome2_src_prepare
-}
diff --git a/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild b/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild
index 2624c15e0ce9..5dcce6e6a9e7 100644
--- a/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild
+++ b/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild,v 1.7 2012/05/03 18:02:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild,v 1.8 2012/10/17 10:34:08 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ inherit eutils gnome2
 DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
 HOMEPAGE="http://www.gnome.org/projects/gst/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="nfs policykit samba"
diff --git a/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r3.ebuild b/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r3.ebuild
index 1d1bfa714190..140ea2d16d59 100644
--- a/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r3.ebuild
+++ b/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r3.ebuild,v 1.6 2012/07/15 16:17:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r3.ebuild,v 1.7 2012/10/17 10:34:08 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit autotools eutils gnome2
 DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
 HOMEPAGE="http://www.gnome.org/projects/gst/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="nfs policykit samba"
@@ -53,7 +53,8 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libtool-intermediate-libs.patch \
 		"${FILESDIR}"/${P}-missing-atk.patch \
-		"${FILESDIR}"/${P}-missing-m.patch
+		"${FILESDIR}"/${P}-missing-m.patch \
+		"${FILESDIR}"/${P}-glib-2.32.patch
 	eautoreconf
 	gnome2_src_prepare
 }
diff --git a/app-admin/gnome-system-tools/gnome-system-tools-2.32.0.ebuild b/app-admin/gnome-system-tools/gnome-system-tools-2.32.0.ebuild
deleted file mode 100644
index b230cf0a5bc1..000000000000
--- a/app-admin/gnome-system-tools/gnome-system-tools-2.32.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-2.32.0.ebuild,v 1.7 2012/05/03 18:02:21 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
-HOMEPAGE="http://www.gnome.org/projects/gst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="nfs policykit samba"
-
-RDEPEND="
-	>=app-admin/system-tools-backends-2.10.1
-	>=dev-libs/liboobs-2.31.91
-	>=x11-libs/gtk+-2.19.7:2
-	>=dev-libs/glib-2.25.3:2
-	dev-libs/dbus-glib
-	>=gnome-base/nautilus-2.9.90
-	sys-libs/cracklib
-	nfs? ( net-fs/nfs-utils )
-	samba? ( >=net-fs/samba-3 )
-	policykit? (
-		>=sys-auth/polkit-0.92
-		>=gnome-extra/polkit-gnome-0.92 )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.3.2
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.0"
-
-pkg_setup() {
-	DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable policykit polkit-gtk)"
-
-	if ! use nfs && ! use samba; then
-		G2CONF="${G2CONF} --disable-shares"
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	# No la files needed for nautilus-extensions
-	find "${ED}" -name "*.la" -delete || die "failed to delete *.la files"
-}