Add fix for underlinking when using gold

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

diff --git a/app-admin/gnome-system-tools/ChangeLog b/app-admin/gnome-system-tools/ChangeLog
index 40e3d54151c9f6aff28474d2d369c5c4822b8e5d..054685b9fb999c25892c68e189fe6639e85f2b24 100644 (file)
--- a/app-admin/gnome-system-tools/ChangeLog
+++ b/app-admin/gnome-system-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/gnome-system-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/ChangeLog,v 1.105 2011/10/23 06:49:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/ChangeLog,v 1.106 2011/10/25 07:18:17 jlec Exp $
+
+  25 Oct 2011; Justin Lecher <jlec@gentoo.org>
+  gnome-system-tools-2.32.0-r1.ebuild,
+  +files/gnome-system-tools-2.32.0-gold.patch, metadata.xml:
+  Add fix for underlinking when using gold
 
 *gnome-system-tools-2.32.0-r1 (23 Oct 2011)
 

diff --git a/app-admin/gnome-system-tools/Manifest b/app-admin/gnome-system-tools/Manifest
index d6d3f26dda944d0f00515274b13eaf5e45f3c5df..48f28a9c93889215ed1c7435ba65ac44d8968347 100644 (file)
--- a/app-admin/gnome-system-tools/Manifest
+++ b/app-admin/gnome-system-tools/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX gnome-system-tools-2.32.0-gold.patch 1188 RMD160 912fbf534f59f608e9d30c68e8a100a88151eea9 SHA1 58eb9cdca002385ae70667d9b289eab3c7570381 SHA256 3499635d5f2f0c1dfeca5529a6a1cc4b452baa2b0955d1a21f4a5c27812b450b
 DIST gnome-system-tools-2.32.0.tar.bz2 5433090 RMD160 9d17250a0bc059f5cb319301991a2ea9a1551ad9 SHA1 b7caf7289936a5fa32f027174d39bb399a758bde SHA256 71d52698ccb60bc07d6e4e442b7cb178ebf1152396379500df5ec62da4c4d14a
-EBUILD gnome-system-tools-2.32.0-r1.ebuild 1286 RMD160 6ff6a874d488c196ffbaa50ef54e83cc1ae4c859 SHA1 c869f832d680875cac2c97d8e80f34010c167c21 SHA256 cedd1914e523e099fdf799608ae7d5e2abb187a6e72d70e641e843dddeab0c0a
+EBUILD gnome-system-tools-2.32.0-r1.ebuild 1365 RMD160 5eeaa1527d0c335aa3ced7d84934ab083702a67b SHA1 7ac71531088365a53771addd717b4b38191981ab SHA256 a6acbf01eb06995100ad91e0c48034b7b76e1c836243cdda86cea96b7d20cceb
 EBUILD gnome-system-tools-2.32.0.ebuild 1380 RMD160 66e4e00b309592aaa8da00a1c97e0e59ab34e0fe SHA1 72149b2dfa0f561f1d37701c135f5977b66c26ee SHA256 ad72cb4aadc0037ba4e7d4e93fe15fc7c0c7075d094db51927bd29cb63ee753b
-MISC ChangeLog 15215 RMD160 ff6bcdd1da4aa40bd4d7efe5ff75e058d7988e7c SHA1 9fd0d054e570bd0df8b7ca0de0ecfd722ebec704 SHA256 326d1cacc1583aada70ee9202ff66ef1fdec145dbd1a8e08e3f6df7b5b596e7e
-MISC metadata.xml 559 RMD160 09d36cd55cb4bb7f1711a22f82103fb0c27f2276 SHA1 bfeb976aa50497b3cf362c128a34ea29ffff3598 SHA256 98e5777fa16d14176861c310f5024918c3ea55365bc05865537a02f370277b17
+MISC ChangeLog 15401 RMD160 71f23995a65c8badd75c8e5df2d8a97c865f68f8 SHA1 611de0b20df0a0342442669533b83b67658eba77 SHA256 91a799baa1b661dfbc7b11267a488acb3e02836cad920697856471fca227e185
+MISC metadata.xml 554 RMD160 7c4aaf65deda93966b1539e5b6eb195632442cc3 SHA1 6e1ca12b27d8f061355442bcc680573ca48392d0 SHA256 a79faaeb395a764e35b1900c1ebba2cb598bea806c0fb722c6d9935f26224f45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOo7jAAAoJEEdUh39IaPFNoCUIAIYUF7Ao0ch6bKhvysfaerFX
-gA624E95VKKCmIgaK83SZX/FClMcfEurL1qEw+FK4r9EcPepwCw7STV9CTeXFe68
-ZVF7fOYfo4i/LwsCKjJgrDidGLaHofQAMPudyJSeDDrNfGpG6lQ9p2iJeblDPo1L
-HhsNnt0QhTjPOpy8xO0OflfoW2CjsWax/yXmzpbnBS7PdDIhi08TMJGHMmNro2XL
-QNfWiKkepl0/0hkaM9mXokpXrt3DxYh7a3hliUNQsMMrKOilGIwnCBGxl6Xomjdq
-AimzajJ8RX1CHDNGFRQMbacWdYvAzJH+qSek4LbnhuM+uB7oNQZZDKFjXEuSWsA=
-=4Upe
+iEYEAREKAAYFAk6mYr8ACgkQgAnW8HDreRYwYgCdH34NZSZxdDS/Lt7VE3rc679A
+V1YAoMLjYJMOeNWyb7355T2chc1LKVYo
+=XPlY
 -----END PGP SIGNATURE-----

diff --git a/app-admin/gnome-system-tools/files/gnome-system-tools-2.32.0-gold.patch b/app-admin/gnome-system-tools/files/gnome-system-tools-2.32.0-gold.patch
new file mode 100644 (file)
index 0000000..147bde1
--- /dev/null
+++ b/app-admin/gnome-system-tools/files/gnome-system-tools-2.32.0-gold.patch
@@ -0,0 +1,30 @@
+ src/time/Makefile.am |    2 +-
+ src/time/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/time/Makefile.am b/src/time/Makefile.am
+index e9adaf4..eacd0d6 100644
+--- a/src/time/Makefile.am
++++ b/src/time/Makefile.am
+@@ -15,7 +15,7 @@ INCLUDES += $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS)
+ CLEANFILES = $(GST_TOOL_CLEANFILES)
+ EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
+ 
+-time_admin_LDADD = $(GST_TOOL_LIBS) $(DBUS_LIBS) ./e-map/libemap.a
++time_admin_LDADD = $(GST_TOOL_LIBS) $(DBUS_LIBS) ./e-map/libemap.a -lm
+ time_admin_DEPENDENCIES = $(GST_TOOL_DEPENDENCIES) ./e-map/libemap.a
+ time_admin_SOURCES = \
+       time-tool.c     time-tool.h \
+diff --git a/src/time/Makefile.in b/src/time/Makefile.in
+index b6d917a..99dfb68 100644
+--- a/src/time/Makefile.in
++++ b/src/time/Makefile.in
+@@ -339,7 +339,7 @@ toolname = time
+ SUBDIRS = e-map
+ CLEANFILES = $(GST_TOOL_CLEANFILES)
+ EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
+-time_admin_LDADD = $(GST_TOOL_LIBS) $(DBUS_LIBS) ./e-map/libemap.a
++time_admin_LDADD = $(GST_TOOL_LIBS) $(DBUS_LIBS) ./e-map/libemap.a -lm
+ time_admin_DEPENDENCIES = $(GST_TOOL_DEPENDENCIES) ./e-map/libemap.a
+ time_admin_SOURCES = \
+       time-tool.c     time-tool.h \

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
index 02ec2778d3250432017ced5910c17f46fef47b9b..d289005c93e37d08183be50f5b578b175a3867d2 100644 (file)
--- 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
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 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.1 2011/10/23 06:23:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r1.ebuild,v 1.2 2011/10/25 07:18:17 jlec Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
 HOMEPAGE="http://www.gnome.org/projects/gst/"
@@ -49,3 +49,8 @@ pkg_setup() {
                G2CONF="${G2CONF} --disable-shares"
        fi
 }
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-gold.patch
+       gnome2_src_prepare
+}

diff --git a/app-admin/gnome-system-tools/metadata.xml b/app-admin/gnome-system-tools/metadata.xml
index 7e9348f3054639abe4bdb94ff828ba09a770cd62..2deabb1288987f00d7adc76a8006e38844a9c871 100644 (file)
--- a/app-admin/gnome-system-tools/metadata.xml
+++ b/app-admin/gnome-system-tools/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
-  <longdescription>
+       <herd>gnome</herd>
+       <longdescription>
     Formerly known as the Ximian Setup Tools, the GST are a fully
     integrated set of tools aimed to make easy the job that means the
     computer administration on an UNIX or Linux system. They're
     thought to help from the new Linux or UNIX user to the system
     administrators.
   </longdescription>
-  <use>
-         <flag name='nfs'>Adds support for NFS shares</flag>
-  </use>
+       <use>
+               <flag name="nfs">Adds support for NFS shares</flag>
+       </use>
 </pkgmetadata>