Add fix for underlinking, detected by gold; https://bugzilla.gnome.org/show_bug.cgi?id=677445

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

4 files changed, 113 insertions, 5 deletions

diff --git a/net-libs/libsocialweb/ChangeLog b/net-libs/libsocialweb/ChangeLog
index cce890a266b3..0a78cb82ad14 100644
--- a/net-libs/libsocialweb/ChangeLog
+++ b/net-libs/libsocialweb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libsocialweb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/ChangeLog,v 1.8 2012/05/05 02:54:28 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/ChangeLog,v 1.9 2012/06/05 08:19:13 jlec Exp $
+
+  05 Jun 2012; Justin Lecher <jlec@gentoo.org> libsocialweb-0.25.20.ebuild,
+  +files/libsocialweb-0.25.20-gold.patch:
+  Add fix for underlinking, detected by gold;
+  https://bugzilla.gnome.org/show_bug.cgi?id=677445
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> libsocialweb-0.25.19.ebuild,
   libsocialweb-0.25.20.ebuild:
diff --git a/net-libs/libsocialweb/Manifest b/net-libs/libsocialweb/Manifest
index 339e4dfa1991..41d2ae2c978d 100644
--- a/net-libs/libsocialweb/Manifest
+++ b/net-libs/libsocialweb/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX libsocialweb-0.25.20-gold.patch 5004 RMD160 f7da6faab94fb31bf5b2ff06b021d0e68d4d7e73 SHA1 c26b663fde81769f13cfa373467d77f3c4c3f903 SHA256 c61af2d8855e44bdb4e54ebfff874e53d5d7af5ea304a5e8983b2f0a02a71f4d
 DIST libsocialweb-0.25.19.tar.xz 470420 RMD160 7f84a0fcb423b861b22b59de7b44e43d490f051f SHA1 0742c5644cbacd6e5a14eaf377ffe8b5994e8a30 SHA256 377b165fed92e1d4f6c7a2430191388633ad25421a72d640e9e60dfdf1d54625
 DIST libsocialweb-0.25.20.tar.xz 471464 RMD160 55292f28cfaf5edc58df23dacc66b971a6fcc40a SHA1 85021d882e54643ee54df73fbd8f255e9d2353ea SHA256 eb0078f44eb5fc4570fcee26c5670a433ca1bb83be0cead421a4a03e7d838ff5
 EBUILD libsocialweb-0.25.19.ebuild 2245 RMD160 80b42aa7594e2def1d97e48acc38c124bb95c378 SHA1 ce270de6160fc09a128b5815fe69af7c2604e76c SHA256 8322dd997605bfcecffc84ac71d33b46bf37149ce6a01b0f1704018778d081a9
-EBUILD libsocialweb-0.25.20.ebuild 2030 RMD160 0535e3d9f8ddf950343c2bba238cb3d43e544635 SHA1 74284d54085ad14d7ee2a46338a767e1473b3ede SHA256 33169e877fce7e98f1f79277650babcb1841271c41148167f286f9615ab86e6f
-MISC ChangeLog 1696 RMD160 ba489a0215787df79ad4e4381f6ec8cb21b6bdd9 SHA1 244d8a504773dcbfea07280a26e7dd59a00bc00e SHA256 a48dfac1b7953830eed6fb4827935fdc67131be8e492af1c1a98cc1607cc397e
+EBUILD libsocialweb-0.25.20.ebuild 2108 RMD160 20ca97937cd4f0ff415b81eea96c7e010ee64c44 SHA1 df3d886326a7a5c024091ff3af6d6f8dd2356ab5 SHA256 11e09cf75542c3af2bfa70bd04086363047191ffb288158482062bb198af0f90
+MISC ChangeLog 1911 RMD160 0a3a152d693e0061f7abed36ac58095f6103969e SHA1 4f461b7f0e6d632c17b78578680969ff0e6c6411 SHA256 4f9e676a4182932133cff02ab664f2ee02dc5f0fa4a066151921b8339283e5e6
 MISC metadata.xml 556 RMD160 39c8463f2b9bed271b7579685ca5d28d80ab235e SHA1 84f44951299dec0c1ff993a203cead2871e08b3b SHA256 105ea0ba3827c13d8e3feea95034e64d682ecf6a3f17e62a396873a79fa32e18
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/NwQMACgkQgAnW8HDreRaQZACffYHHovrZhEcoT/sinx/ALing
+ZK4AoJ39/5OvL0Z3MT7gIbNxvIcZ3GAX
+=pXZT
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libsocialweb/files/libsocialweb-0.25.20-gold.patch b/net-libs/libsocialweb/files/libsocialweb-0.25.20-gold.patch
new file mode 100644
index 000000000000..d0800d6b81b2
--- /dev/null
+++ b/net-libs/libsocialweb/files/libsocialweb-0.25.20-gold.patch
@@ -0,0 +1,89 @@
+ src/Makefile.am   |    2 +-
+ src/Makefile.in   |    2 +-
+ tests/Makefile.am |    8 ++++----
+ tests/Makefile.in |    8 ++++----
+ 4 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index fe1e9ba..9e2f40d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,7 +2,7 @@ libexec_PROGRAMS = libsocialweb-core
+ 
+ libsocialweb_core_CFLAGS = -I$(top_srcdir) $(DBUS_GLIB_CFLAGS) $(SOUP_CFLAGS) $(GCOV_CFLAGS)
+ libsocialweb_core_SOURCES = main.c poll.h poll.c
+-libsocialweb_core_LDADD = ../libsocialweb/libsocialweb.la $(DBUS_GLIB_LIBS) $(SOUP_LIBS) $(GCOV_LDFLAGS)
++libsocialweb_core_LDADD = ../libsocialweb/libsocialweb.la $(DBUS_GLIB_LIBS) $(SOUP_LIBS) $(GCOV_LDFLAGS) $(GLIB_LIBS)
+ 
+ %.service: %.service.in ../config.log
+ 	$(AM_V_GEN)sed -e "s|\@dir\@|$(libexecdir)|" $< > $@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 4d06f31..a029caf 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -314,7 +314,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ libsocialweb_core_CFLAGS = -I$(top_srcdir) $(DBUS_GLIB_CFLAGS) $(SOUP_CFLAGS) $(GCOV_CFLAGS)
+ libsocialweb_core_SOURCES = main.c poll.h poll.c
+-libsocialweb_core_LDADD = ../libsocialweb/libsocialweb.la $(DBUS_GLIB_LIBS) $(SOUP_LIBS) $(GCOV_LDFLAGS)
++libsocialweb_core_LDADD = ../libsocialweb/libsocialweb.la $(DBUS_GLIB_LIBS) $(SOUP_LIBS) $(GCOV_LDFLAGS) $(GLIB_LIBS)
+ servicedir = $(datadir)/dbus-1/services/
+ service_in_files = libsocialweb.service.in
+ service_DATA = libsocialweb.service
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index e40cafd..59aa612 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -2,7 +2,7 @@ noinst_PROGRAMS = test-online test-client-online test-download test-download-asy
+ 
+ test_online_SOURCES = test-online.c
+ test_online_CFLAGS = -I$(top_srcdir) $(GOBJECT_CFLAGS)
+-test_online_LDADD = $(GOBJECT_LIBS) ../libsocialweb/libsocialweb.la
++test_online_LDADD = $(GOBJECT_LIBS) ../libsocialweb/libsocialweb.la $(GLIB_LIBS)
+ 
+ test_client_online_SOURCES = test-client-online.c
+ test_client_online_CFLAGS = -I$(top_srcdir) $(GOBJECT_CFLAGS)
+@@ -10,12 +10,12 @@ test_client_online_LDADD = $(GOBJECT_LIBS) ../libsocialweb-client/libsocialweb-c
+ 
+ test_download_SOURCES = test-download.c
+ test_download_CFLAGS = -I$(top_srcdir) $(GOBJECT_CFLAGS) $(SOUP_CFLAGS) $(DBUS_GLIB_CFLAGS)
+-test_download_LDADD = $(GOBJECT_LIBS) $(SOUP_LIBS) ../libsocialweb/libsocialweb.la
++test_download_LDADD = $(GOBJECT_LIBS) $(SOUP_LIBS) ../libsocialweb/libsocialweb.la $(GLIB_LIBS)
+ 
+ test_download_async_SOURCES = test-download-async.c
+ test_download_async_CFLAGS = -I$(top_srcdir) $(GOBJECT_CFLAGS) $(SOUP_CFLAGS) $(DBUS_GLIB_CFLAGS)
+-test_download_async_LDADD = $(GOBJECT_LIBS) $(SOUP_LIBS) ../libsocialweb/libsocialweb.la
++test_download_async_LDADD = $(GOBJECT_LIBS) $(SOUP_LIBS) ../libsocialweb/libsocialweb.la $(GLIB_LIBS)
+ 
+ test_upload_SOURCES = test-upload.c
+ test_upload_CFLAGS = -I$(top_srcdir) $(GOBJECT_CFLAGS) $(SOUP_CFLAGS) $(DBUS_GLIB_CFLAGS)
+-test_upload_LDADD = $(GOBJECT_LIBS) $(SOUP_LIBS) ../libsocialweb/libsocialweb.la ../libsocialweb-client/libsocialweb-client.la
++test_upload_LDADD = $(GOBJECT_LIBS) $(SOUP_LIBS) ../libsocialweb/libsocialweb.la ../libsocialweb-client/libsocialweb-client.la $(GLIB_LIBS)
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 9a7bb5b..77feaa3 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -326,19 +326,19 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ test_online_SOURCES = test-online.c
+ test_online_CFLAGS = -I$(top_srcdir) $(GOBJECT_CFLAGS)
+-test_online_LDADD = $(GOBJECT_LIBS) ../libsocialweb/libsocialweb.la
++test_online_LDADD = $(GOBJECT_LIBS) ../libsocialweb/libsocialweb.la $(GLIB_LIBS)
+ test_client_online_SOURCES = test-client-online.c
+ test_client_online_CFLAGS = -I$(top_srcdir) $(GOBJECT_CFLAGS)
+ test_client_online_LDADD = $(GOBJECT_LIBS) ../libsocialweb-client/libsocialweb-client.la
+ test_download_SOURCES = test-download.c
+ test_download_CFLAGS = -I$(top_srcdir) $(GOBJECT_CFLAGS) $(SOUP_CFLAGS) $(DBUS_GLIB_CFLAGS)
+-test_download_LDADD = $(GOBJECT_LIBS) $(SOUP_LIBS) ../libsocialweb/libsocialweb.la
++test_download_LDADD = $(GOBJECT_LIBS) $(SOUP_LIBS) ../libsocialweb/libsocialweb.la $(GLIB_LIBS)
+ test_download_async_SOURCES = test-download-async.c
+ test_download_async_CFLAGS = -I$(top_srcdir) $(GOBJECT_CFLAGS) $(SOUP_CFLAGS) $(DBUS_GLIB_CFLAGS)
+-test_download_async_LDADD = $(GOBJECT_LIBS) $(SOUP_LIBS) ../libsocialweb/libsocialweb.la
++test_download_async_LDADD = $(GOBJECT_LIBS) $(SOUP_LIBS) ../libsocialweb/libsocialweb.la $(GLIB_LIBS)
+ test_upload_SOURCES = test-upload.c
+ test_upload_CFLAGS = -I$(top_srcdir) $(GOBJECT_CFLAGS) $(SOUP_CFLAGS) $(DBUS_GLIB_CFLAGS)
+-test_upload_LDADD = $(GOBJECT_LIBS) $(SOUP_LIBS) ../libsocialweb/libsocialweb.la ../libsocialweb-client/libsocialweb-client.la
++test_upload_LDADD = $(GOBJECT_LIBS) $(SOUP_LIBS) ../libsocialweb/libsocialweb.la ../libsocialweb-client/libsocialweb-client.la $(GLIB_LIBS)
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild b/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild
index 9917c49109e7..345275376dee 100644
--- a/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild
+++ b/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild,v 1.4 2012/05/05 02:54:28 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild,v 1.5 2012/06/05 08:19:13 jlec Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2"
 
-inherit gnome2 python
+inherit eutils gnome2 python
 
 DESCRIPTION="Social web services integration framework"
 HOMEPAGE="http://git.gnome.org/browse/libsocialweb"
@@ -71,6 +71,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Sent upstream, gnome bug 677445
+	epatch "${FILESDIR}"/${P}-gold.patch
 	gnome2_src_prepare
 
 	python_convert_shebangs 2 "${S}/tools/glib-ginterface-gen.py"