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

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

7 files changed, 72 insertions, 128 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/Manifest b/app-admin/gnome-system-tools/Manifest
index a4c4d4bcfb96..4c41da9183a9 100644
--- a/app-admin/gnome-system-tools/Manifest
+++ b/app-admin/gnome-system-tools/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX gnome-system-tools-2.32.0-glib-2.32.patch 1246 SHA256 ac185928eb0e321d54b5de1a067a35b0a8e1f42d60087da7ea805a00eed7a3f7 SHA512 988833c973f3fbe41f606120f1b36876ab08357e5a1b5d1fcb6debe60bf8f2c04e866621d3ac16b0e1795c043a1f00a868cebdbb987d867a3161a324a21a0881 WHIRLPOOL ab3e7e92ac6c459d7e7c384ba47d7432106b7483b2ffea752fc6e13fb754e144afec0c4cc1f8ada4e914190813b987a64a1dc1b44e54ee92a56ddef68695306b
 AUX gnome-system-tools-2.32.0-gold.patch 1188 SHA256 3499635d5f2f0c1dfeca5529a6a1cc4b452baa2b0955d1a21f4a5c27812b450b SHA512 ad4d7662df1185bbced7af8ab78483635c11c66b82b1e3aa1a622f735f5b5aa933950dafbd003a36d4686c3ddc8a1cc351fe739bd31e5c4a1e776e596b6a67a4 WHIRLPOOL c24874eeea926b75192cb16367cca0bb7c45bd6f16953bc4bdf42eb572ce442d2b29ce7d681a0029749f1f3874a4fa948dbf53612c7a6c2c7cadc16fa78415fa
 AUX gnome-system-tools-2.32.0-libtool-intermediate-libs.patch 2986 SHA256 af3e08efc029fe8015748326647f910b33901b330528ff563b730168894706d5 SHA512 70c54bf4788724bd03fcb7dd2d875f4fa0527212020166da2123f4ad32e68631ada3e8bfb8747f12f1fe8ad441fcf72583ed97c99df437d3eb5ccfeb9962a068 WHIRLPOOL af4e5153bb6ba4327f44e0bf4f054b50804e29421f9d445ced2248dabcd07236349615d9eb36822936155a6c46309f5866ee66f7e302fb21502db50bf357daf5
 AUX gnome-system-tools-2.32.0-missing-atk.patch 674 SHA256 3d4ad000d859084cc0a7d348a9ef42627f8a7b323e15082b9a2aa5711dd595d4 SHA512 30dbc6ecdd4a6dae7ec9f9e80db4710f95e4837630b08fed904523eb7a8630a58ac67d7d5a5702a3105a189e06da1ff0384ea077af3313f74c88cba4a48a6067 WHIRLPOOL 6fd286428b9a49b4beaefcdc1657a0eb5a697a68a0620ea2f519033d7f80f14522f3f7ed632bd119c3f889de84aab22694c2cef721253f271ae3b0b2afbec35b
 AUX gnome-system-tools-2.32.0-missing-m.patch 1054 SHA256 93e7d6f335bd87aa1ca7b9d565f5814e36d4192193dd72838eecd9d0dde21849 SHA512 8414b60ce69226a17c47dd5571f31b66d1cf59440e05bb4dc516b0b0114dc9dd87972bd61e6a0d417cca397b36037e805fe218a45897866350341af6e31fb690 WHIRLPOOL 4141f64e96ccd152bd6965294c1dbdf7ebd72ec5932f6fc89923ddb875c82f8b628d961dbc9754cb8f52a5b2c0e926ddcb65083200471ce4a96c38bd2156eb59
 DIST gnome-system-tools-2.32.0.tar.bz2 5433090 SHA256 71d52698ccb60bc07d6e4e442b7cb178ebf1152396379500df5ec62da4c4d14a SHA512 378efabeaf926f130df605bac729da6b7c4374bfe2d845d70144a596bf473eae8583edc43e8ef8f928ce9347f1f305a022ab12e65fd9080ae05664bde5ea8022 WHIRLPOOL 42912cfe112a5101c97748b202f57aad79bdaaf838ac8ed336007c52d07e1abc5db832052ea2d2901ee398b703439b92262607faf2ef2969e110c2569dd4351e
-EBUILD gnome-system-tools-2.32.0-r1.ebuild 1366 SHA256 8c2cf27da071fbf5c5e6b8a0fb2a654825b28549f3571d0098a9331ae3f13acf SHA512 40b20d2583c707ecfce9690c9beb3db68253070a05855277c7dfc4673c23c5caab11ccdd3defbd0023f2683078fdcf71419817f9e326504454758e5b667de466 WHIRLPOOL 1c5f31c50319d8d2b3c900e8e914313f9de1755fd1a0541d5bd1993edeea7be2ff1da284ecd2266cc430d3f5a62fd254cce82ff71830a5f9cddac3e29d57d478
-EBUILD gnome-system-tools-2.32.0-r2.ebuild 1371 SHA256 b7a3c0ecb316b5953ebfaaa5b66b3c46d159df91af29ccf15ddec635f747117a SHA512 d365a72c10039322a22fbe497877f4cd8034e19c894d3e8913a748a5d13c09aba7d47104e2fb092c560d0e0e5aaa911f5b4efc5e8bc5db257ad0e8cff7571860 WHIRLPOOL 8e66e2bf3bb2d2674efb707d38a0b6799ee0db8c6e28e28c5128712e383d9db3db6f71cb070e350208cff92470c9e87bb7ebc6460bd1f7ccb33cbefbcf83aba9
-EBUILD gnome-system-tools-2.32.0-r3.ebuild 1523 SHA256 120bb191ad58e91f830860a8b33346727a4cd7f25428e26c99e19252b7a5bf6e SHA512 7a8c035b13382e3eb5b9f75749fea22d3972c359dd4c31b80786f3a26d5c34787650cc1efb2687aa63b28f75498a7f75a9ba20e3ea663d87f8d8e05fe9f4a3ce WHIRLPOOL 9314229685e0780496d13f05691da5068be9fbf5cd21d1fc8c4c6baaeac33cafa5050902aa7d9c94ee5383e627d6c89d7f143809bd0b4fc28b8ab65f5e63974e
-EBUILD gnome-system-tools-2.32.0.ebuild 1379 SHA256 03ee11fafec0541935b70d0ecd2e33eb7439fbd635e3b2a15e4d90ed6675ef07 SHA512 fc832a328072bf824c1f93bf3d5e59f2245b30e4261d39b39e1ae6dda99671ecf723f723527004f9a74f328e3d39eca7a93e8c8d22ae7f3f6e7e7f1144f7197f WHIRLPOOL 603bfd2c3f87a071d3117db3989e7de7a5e44d68134efb73ed227e3128589dd911d0c7a35db88535ab3da252a74b6fd19d5ff1796c4b50cdc735879b5567654d
-MISC ChangeLog 17352 SHA256 14ce78707695de0d9159d2db5f6693bceffc59c5ed12799f982f8308e182ee0b SHA512 45875cbd3937af715cfd86daf63b9932441f449cb1aad5d9e066b5fd13c94b562561103256eb3be7d5c998ca3906defc32853b1dfc1d26ae034f618c2a458f0f WHIRLPOOL 779e438626c409b9236ef90a930ea16ea57ad765ca5a03eadc20150536efc6f8067f899a97cfc5e668b8680742e4d1dabf2801bdb35669d07111128b6b4911b8
+EBUILD gnome-system-tools-2.32.0-r2.ebuild 1375 SHA256 57652993904deb62c3d9e3d666f79537da9417a4131d6e58704e85162f112d00 SHA512 a76ebf9485c21732fb2ce96d351a9fd9896e92ac48ceeb25538c893cabd560b512a776bf3d1f552b665c14611f4a82a0a0e848e6af3dc7833e0a474bb92d98ad WHIRLPOOL 1abf03f78177082e0696ea1f5c3eb74cea0a4b37e30a7998fdcdecf1a79b831464616d04948ebf6f109f478aa794085330ba7a7f56b963d4313c5297b4f6aac9
+EBUILD gnome-system-tools-2.32.0-r3.ebuild 1565 SHA256 bb14b4ad90c222ccddcbb6a813d0e078aa331414fa4e413d5832a9293b57bd92 SHA512 941d075013eb164f01170b3294f0e10cbaacf853fb28566d0da7e04f27d8eac640ce7a01e9beff0166d55ad69dba9ad3010ea3da64c7e27b53969891633a92b6 WHIRLPOOL 4fa49ee545ec5dc5218a5a1c90d841da8be2ee8d944216e680bb094f0cfe90f8f6f1872828a12d7eb80da3a9d94c1bf3f7e2000ab9a92596fefba1ef6a90daa8
+MISC ChangeLog 17720 SHA256 0fe8ab50fb08d71b61ff26f142092c7c546b1e7d61e8557339efce8e95e23d2e SHA512 d7c89208fcf6d076052945010d56a294b20a95f16f4619fb01a444e6b6c24db3d309cf62a17a8f0c37abe659556c482d932a27230061acc746ac27ff65fe5bf0 WHIRLPOOL 2099c1d74701280f7145594c726b5ebf838cd1d33307ab06fbbe54c84dbe4b1f9643a2bd58106977617aa4599f193d51b042237d189498eb2d565b80d4511e44
 MISC metadata.xml 554 SHA256 a79faaeb395a764e35b1900c1ebba2cb598bea806c0fb722c6d9935f26224f45 SHA512 f7e88f2811013385b3cce64adf2bc902ead44ca15c5612c1715c05c1fcf0b3b6209dac558058fdbd5bb19e43fd157e87d2ac1da8c2ab611a90ddc6fae5cca448 WHIRLPOOL addedb9e70fa49c8a2afaa207c07b3fc9c2d284fcbf1003c6e86dedaf90cf1add3218d7f721c77e596b65bfdce1d5589e28ee8bbe4e20f93f79cd8fe3f24cb68
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAC7RYACgkQuQc30/atMkBLuQCgoXvh5klcTvIrbIgJsla0SsSC
-mr0An1f+ZkgvDKoZfIvfCNvc8cJltjB/
-=dLnW
+iQEcBAEBCAAGBQJQfomhAAoJEJ0WA1zPCt1h1qEIALndjNda3tOJVCjBZAdRkWCt
+Z7RuQQBpmHlRYZAn3b6Np72SxOVjPqb1AlcE7WoSevAJzulV+VoP4iGfEILCEzBp
+An6U7dbU24kGaKGEprQcOWLR080Pz7HdjmUt/qgW50eJYTwQtXWLDgf89ZhlaGoE
+tdTKitz9hMuIGnsg3I34/5ELwoXCwuAABe8f4Tkqgg3IZSGdmB7WXML8JN2tj314
+RwlVq99w3xJmchZfxhgQLuiNsphzgv7Kmh2HfdcubOoPm6cBeUxxNdOclAxk8aO2
+BduMH9TFKCc5xaF/dSxnpHO+8IbiZQOkvAdpgyLc7p7+A3xHgzaccaIWtbwJsxk=
+=4wzX
 -----END PGP SIGNATURE-----
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"
-}