Patch against underlinking when using gold, #369959

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

4 files changed, 54 insertions, 10 deletions

diff --git a/gnome-extra/sensors-applet/ChangeLog b/gnome-extra/sensors-applet/ChangeLog
index d59f708276e9..5c599c1d7ddb 100644
--- a/gnome-extra/sensors-applet/ChangeLog
+++ b/gnome-extra/sensors-applet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/sensors-applet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/ChangeLog,v 1.55 2011/04/29 17:34:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/ChangeLog,v 1.56 2011/11/24 14:34:22 jlec Exp $
+
+  24 Nov 2011; Justin Lecher <jlec@gentoo.org> sensors-applet-2.2.7-r1.ebuild,
+  +files/sensors-applet-2.2.7-underlinking.patch:
+  Patch against underlinking when using gold, #369959
 
   29 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org>
   sensors-applet-2.2.7-r1.ebuild:
diff --git a/gnome-extra/sensors-applet/Manifest b/gnome-extra/sensors-applet/Manifest
index 6c8776098080..f2a57963e454 100644
--- a/gnome-extra/sensors-applet/Manifest
+++ b/gnome-extra/sensors-applet/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX sensors-applet-2.2.7-libnotify-0.7.patch 3201 RMD160 3e20a50514d31ddd57ad43b3bee5caa5996fa4cb SHA1 14790a7158a7ac36f60f7367d2d5707f7d7f976d SHA256 fb32d1063c0efe06c291d13e810d49b0872c99b3194bb24b6857a0bd7c198c12
+AUX sensors-applet-2.2.7-underlinking.patch 1482 RMD160 03f317a89d3a9b8fac83196fdf2ff1487b14fae9 SHA1 3c7b7c8f9ba90f1b9ca3b874e3a9d680e624f9b3 SHA256 cea4f60e7d463ac57e6adb7453cc0daeafb863547cfe5058ab6a5a853286a8be
 DIST sensors-applet-2.2.7.tar.gz 484828 RMD160 1a800b7b9a228f51a26a10ae4c31ac0df5d2610a SHA1 82f5b9176f81aa7060b302d9f50b2a76564ad7b5 SHA256 368bae3baf983e192a0751f89d563ab9052c3ab2ab28bf62002a0d78d1ffcefe
-EBUILD sensors-applet-2.2.7-r1.ebuild 2012 RMD160 f6a2265aeda683b486bcb4a6f45dee26a0253aa5 SHA1 a0c751de6191fc74ed31df8adefdd676074ce75b SHA256 edd80dfc2ac045ff62da768f1cd8ae288a31fa2935eae4516d8358aa96c73468
-MISC ChangeLog 10304 RMD160 7af45ab907755cc56d51e6cdd53062bd7cf62748 SHA1 4f6337f5cf28eed81981c9dce3310b55149813e2 SHA256 8f27ab7c63b65984cf9e790352235e06a582b17413c2c5682a35f2ef6a849613
+EBUILD sensors-applet-2.2.7-r1.ebuild 2052 RMD160 37fd399ca12b2344c3375294cb4778a2083c3b51 SHA1 b671438f0d92906171ba90ca98d776426348ae44 SHA256 d49708ace3ab7b4d029cf22713a321f995874c11cdb7a979dc29fa08b5578102
+MISC ChangeLog 10482 RMD160 44cf98d117663418b5590501a824c7f10057b09d SHA1 15a532ff04f8bacbbc084503bf086e40373400a3 SHA256 30269e85cd70c819d698fbbffa22d97c82437fb214aaee46a84666711dd0c0a5
 MISC metadata.xml 254 RMD160 11ab79285c200fa4a399c81f38424a688f6d0368 SHA1 d4cd78843485a5d33cbffb165b440e03f255759a SHA256 70a2f644f9cec99ff692b0d9c9c6a84c675c5051b01c4ce4225693dcc17c7d86
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk26+TQACgkQXkR9YqOcLPF0nwD/XALQhMgeMnl+pnv63weMaVN+
-pa91y/TVj94mys5vzo8A/RPYLbi5PAj36gOoyA19lvY83eMObqD9cBnW7N96vCTV
-=vtDj
+iEYEAREKAAYFAk7OVfQACgkQgAnW8HDreRYKOQCdGXNp/GD+mY3TV4z44aWngwhw
+Dv4An3o7s9l9VAKPlWAVL8j4wUDEVgU8
+=TiaY
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/sensors-applet/files/sensors-applet-2.2.7-underlinking.patch b/gnome-extra/sensors-applet/files/sensors-applet-2.2.7-underlinking.patch
new file mode 100644
index 000000000000..8df1953b7b40
--- /dev/null
+++ b/gnome-extra/sensors-applet/files/sensors-applet-2.2.7-underlinking.patch
@@ -0,0 +1,37 @@
+ sensors-applet/Makefile.am |    4 ++--
+ sensors-applet/Makefile.in |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/sensors-applet/Makefile.am b/sensors-applet/Makefile.am
+index a87feb0..097122e 100644
+--- a/sensors-applet/Makefile.am
++++ b/sensors-applet/Makefile.am
+@@ -11,7 +11,7 @@ INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \
+ 	$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(CAIRO_CFLAGS) $(LIBNOTIFY_CFLAGS)
+ 
+ 
+-LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(CAIRO_LIBS) $(LIBNOTIFY_LIBS)
++LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(CAIRO_LIBS) $(LIBNOTIFY_LIBS) -ldl
+ 
+ if LIBNOTIFY
+ libnotify_SRC = active-sensor-libnotify.c \
+@@ -47,4 +47,4 @@ headerdir = $(prefix)/include/sensors-applet
+ header_DATA = $(INST_H_FILES)
+ 
+ # since it is separate
+-EXTRA_DIST = sensors-applet-plugin.h
+\ No newline at end of file
++EXTRA_DIST = sensors-applet-plugin.h
+diff --git a/sensors-applet/Makefile.in b/sensors-applet/Makefile.in
+index dd6765f..3b0b8ac 100644
+--- a/sensors-applet/Makefile.in
++++ b/sensors-applet/Makefile.in
+@@ -167,7 +167,7 @@ LIBATASMART_LIBS = @LIBATASMART_LIBS@
+ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
+ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(CAIRO_LIBS) $(LIBNOTIFY_LIBS)
++LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(CAIRO_LIBS) $(LIBNOTIFY_LIBS) -ldl
+ LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@
+ LIBSENSORS_LIBS = @LIBSENSORS_LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild b/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild
index 82a802b31ca7..2b6b46e3c0ca 100644
--- a/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild
+++ b/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild,v 1.6 2011/04/29 17:34:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild,v 1.7 2011/11/24 14:34:22 jlec Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -65,7 +65,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	epatch \
+		"${FILESDIR}"/${P}-libnotify-0.7.patch \
+		"${FILESDIR}"/${P}-underlinking.patch
 	gnome2_src_prepare
 }