Add fix for underlinking, detected by gold

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

4 files changed, 74 insertions, 12 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index ac58c1c00af0..8441c14d4245 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.353 2012/05/14 06:06:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.354 2012/06/07 10:49:51 jlec Exp $
+
+  07 Jun 2012; Justin Lecher <jlec@gentoo.org> gnome-panel-3.2.1.ebuild,
+  +files/gnome-panel-3.2.1-gold.patch:
+  Add fix for underlinking, detected by gold
 
 *gnome-panel-3.4.1 (14 May 2012)
 
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index e090ab163e30..94c26c7cc1c1 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,10 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX gnome-panel-2.32.1-as-needed.patch 1030 RMD160 4c22c1f159fdf618d10ba6a0290beb3389f2c61d SHA1 3836698dfd6650873220e448f5a5e1ff0ba8b2c7 SHA256 c311d13448ced0c74470f9c655fda55fc056245831f5a800f5493a5a4de19bf5
 AUX gnome-panel-2.32.1-evo-month.patch 810 RMD160 d454e7609af4997dc73bfa06b3d45c1bf3986de5 SHA1 a039eb21e74f0d02c654affa1a839a21ef9a8ce2 SHA256 1b2854b64df8b628654a91b563b3846914a8ba7c9f2f5bf9f890e5a9a18f9238
 AUX gnome-panel-2.32.1-fix-multiscreen.patch 7513 RMD160 a211a3cbed6c572ae98377f34afae33b3bd0b840 SHA1 679f8f263c1f8de2a9aac159fad81bbbaa20098b SHA256 5bdb4fe08e79bc504b29aa4752bfb563b26870571f419cef447ebfe8c639dcb2
 AUX gnome-panel-2.32.1-fix-multiscreen2.patch 1451 RMD160 dcf898a075215ee807960b91d671fb6be8b6598f SHA1 d3433f9559060fbb99bbfb8ab66b8f0c637e9a80 SHA256 fd9cf2e5a0374fc8d68f9f30117d5c502e510eb8eb11fcea021594f7549bca89
+AUX gnome-panel-3.2.1-gold.patch 6508 RMD160 6d180077e8d6a27c56d1f14d1715c0f03d2f4a9b SHA1 d00ee32a39cb8fb3df833c20047c409fa50a206c SHA256 19b867d126d12c5e26da141b6f21433dbf82f28e5aa1f172f157b4eb2a677da4
 DIST gnome-panel-2.32.1-patches.tar.bz2 6686 RMD160 b5b4c18d36ad135eb49c154a4539b815b33cc73d SHA1 7c13dad85a3e8ffe861d05e1560d715052e92a6e SHA256 b0e2f59e370a2a7da2cd5fd1513cc50cf2bf210fac765e05603d81f91e7bbcea
 DIST gnome-panel-2.32.1.tar.bz2 3132156 RMD160 03a440cee7e219b42a0375ae2d2d53fbd17b604b SHA1 561ec56307854b5cbd6b0d0a0b7f9e0e6c2a0127 SHA256 8f7828eb7a21c817a73b697844a4e20256059b32386414a10f97d51e7d9fca5f
 DIST gnome-panel-3.2.1.tar.xz 2424632 RMD160 29d2ccb1b87e3bcbef4259995476cb0705db902e SHA1 ae0b3c21097dd9580338585846b6af07945a1a2c SHA256 ae5ed578f9f54ad763bf5e46fd5431cdbc06fa2eefea03b390c90a3ffb18870d
@@ -13,18 +14,15 @@ DIST introspection-20110205.m4.tar.bz2 1220 RMD160 c520adf7edf0e56012138208b45be
 EBUILD gnome-panel-2.32.1-r1.ebuild 3575 RMD160 57a14ffb54a6cf150982de1ce06d03dee68cbc9d SHA1 76ad56d75d9140b776fd5122ffd4b709a5e2b5da SHA256 3f8888b2c055c1ea6b0dc5a3f6eec2c50e2aae5b85c34b75fe6a6d670f8e69b7
 EBUILD gnome-panel-2.32.1-r2.ebuild 3597 RMD160 b1fe28eef5b4991bae5cf466d431d600d11d0b14 SHA1 29f5fe3f93c1781a0c02721f2153a0ab8f7f7a19 SHA256 a15c266dc9b47fc8dd218f9a1c4a80b4e292438b9d1950430bedfde76c782ae4
 EBUILD gnome-panel-2.32.1-r3.ebuild 3653 RMD160 18a3583a76bfdea5f9874eca3515d7037dc49020 SHA1 0e7cc7abae5736b960c274a0574059da1d686352 SHA256 58208d520fbf87d9fd97dc09d15f98bdc0ca3b756f1593b26416913933dee64c
-EBUILD gnome-panel-3.2.1.ebuild 2638 RMD160 05ef13cb0e1de12c466723d59ac080c19f298700 SHA1 d9d66e058aae52d804358038636726e66b3fd397 SHA256 656303b0514be96087e44b06ba5b3ac82922b07d7fe1d1f954259825c7589de4
+EBUILD gnome-panel-3.2.1.ebuild 2713 RMD160 1e7ba16cbac417746309527138e49e1d1f1ee83f SHA1 027d2ce0d2a9dcf49e2f7bbf720104b20f29a339 SHA256 cde24d89c7a812cbdcac27e1c689d38cb4112733b5c8d1c44659ca20dc176148
 EBUILD gnome-panel-3.4.1.ebuild 2668 RMD160 757621552fad6c7a571045e95f10dc934f6dd39d SHA1 2be0f23d44d522fd0b46348bcc662d43a323e135 SHA256 24b3653650a9c7952555aa9ec37fde7b897c4e22b00f19da1b9ebab93eb1a565
-MISC ChangeLog 50106 RMD160 b84100f7a9b00b983033fe40c7f067b69b8c21aa SHA1 ce9f92c7374321d3c022d0bef87d4318613446ec SHA256 79982108da433037745cca30e21a0200c90ce89b8be7ecd1b76785608cafde27
+MISC ChangeLog 50259 RMD160 830774cac6522080a9c447dd13d5d63840be06e7 SHA1 1171f5efb276357093e15d010278cc03fb2b226d SHA256 36da52b26048d4cd1217034f62d783b95a8b3432936d47703d3f74e90d58224b
 MISC metadata.xml 374 RMD160 9f8a135b00284a040f08bf8e7899cccab4151f16 SHA1 bbb2909c690abb23de3685b93e48c1497adbf688 SHA256 69c9f86e95c7553d0ff7f84838cde89d1537206aa0de8869ee6a1aeec3cde403
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQEcBAEBAgAGBQJPsKDbAAoJEJ0WA1zPCt1hAPUH/iwI/BceUwXiS36xwt6vlN52
-y7x9oHp0pTtS+/UJSB/UVyra7cqQ57XUvDJqOfIfswp+dGIugitdVcw2vOw0UQub
-raZ8anXuhwYiuCjdkCZuOuaFV+iRTYQkhxAsAaP/2Q/4TyGvQof+dkvp/4M9DIRP
-s+64THLLWAZIOv9vLiolQaZHOK7lT9rJsc6/lBAY8fnmId1CSlW3txCdCNVE4VvF
-O7m1+EKbZ7bRTambCILeDr6jzGcVGEXqUoQ2uYwwcc5EZeXRylLLlhcY6W2+NHv7
-C9jTZrQE1jFPyGUc/NOLqwGyllexpfhFFuARExmKc+Z9iwzv0aHMHM74Bfxi/RY=
-=OnDP
+iEYEAREKAAYFAk/Qh1QACgkQgAnW8HDreRaLVwCgl7IyTrTOLdK28XEmTxlQ8u9M
+f1oAn30s14OCFhVCx9DosYbLJB+aaSNP
+=btFy
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-panel/files/gnome-panel-3.2.1-gold.patch b/gnome-base/gnome-panel/files/gnome-panel-3.2.1-gold.patch
new file mode 100644
index 000000000000..d6b39fa841a7
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-3.2.1-gold.patch
@@ -0,0 +1,55 @@
+ configure    |   12 ++++++------
+ configure.ac |    2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure b/configure
+index e4c9423..21bfa66 100755
+--- a/configure
++++ b/configure
+@@ -13057,12 +13057,12 @@ if test -n "$PANEL_LIBS"; then
+     pkg_cv_PANEL_LIBS="$PANEL_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-3.0 >= \$GTK_REQUIRED cairo-xlib glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED gnome-desktop-3.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu-3.0 >= \$LIBGNOME_MENU_REQUIRED dconf\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-3.0 >= \$GTK_REQUIRED cairo-xlib glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED gnome-desktop-3.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu-3.0 >= \$LIBGNOME_MENU_REQUIRED dconf\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>/dev/null`
++  pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -13082,14 +13082,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>&1`
++	        PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>&1`
+         else
+-	        PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>&1`
++	        PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$PANEL_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf) were not met:
++	as_fn_error $? "Package requirements (gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf) were not met:
+ 
+ $PANEL_PKG_ERRORS
+ 
+diff --git a/configure.ac b/configure.ac
+index 73d198e..93c9f80 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,7 +77,7 @@ dnl pkg-config dependency checks
+ 
+ PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-3.0)
+ 
+-PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf)
++PKG_CHECK_MODULES(PANEL, gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf)
+ AC_SUBST(PANEL_CFLAGS)
+ AC_SUBST(PANEL_LIBS)
+ 
diff --git a/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild b/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild
index 5ab372c99784..2ce2c3523563 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.2.1.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/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild,v 1.2 2012/05/05 05:38:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild,v 1.3 2012/06/07 10:49:51 jlec Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -68,6 +68,11 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gold.patch
+	gnome2_src_prepare
+}
+
 pkg_postinst() {
 	local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries"
 	local gconftool="${EROOT}usr/bin/gconftool-2"