Fix underlinking failure (bug #497108, thanks to d_dart).

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 30 insertions, 7 deletions

diff --git a/gnome-extra/gnome-system-monitor/ChangeLog b/gnome-extra/gnome-system-monitor/ChangeLog
index b9927e4bbf85..ae863c415449 100644
--- a/gnome-extra/gnome-system-monitor/ChangeLog
+++ b/gnome-extra/gnome-system-monitor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-system-monitor
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.239 2013/12/24 16:59:11 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.240 2014/01/05 07:54:15 tetromino Exp $
+
+  05 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-system-monitor-2.28.2-r1.ebuild,
+  +files/gnome-system-monitor-2.28.2-gmodule.patch:
+  Fix underlinking failure (bug #497108, thanks to d_dart).
 
 *gnome-system-monitor-3.10.2 (24 Dec 2013)
 
diff --git a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.28.2-gmodule.patch b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.28.2-gmodule.patch
new file mode 100644
index 000000000000..142ca62d588c
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.28.2-gmodule.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.in b/configure.in
+index b60062b..1133b65 100644
+--- a/configure.in
++++ b/configure.in
+@@ -37,7 +37,7 @@ LIBXML_REQUIRED=2.0
+ RSVG_REQUIRED=2.12
+ DBUS_REQUIRED=0.7
+ 
+-PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gtkmm-2.4 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED)
++PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED gmodule-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gtkmm-2.4 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED)
+ 
+ 
+ AC_ARG_ENABLE(more-warnings,
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2-r1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2-r1.ebuild
index 0e4acc3213dd..4a21ff8bb04d 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2-r1.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2-r1.ebuild,v 1.6 2012/05/05 06:25:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2-r1.ebuild,v 1.7 2014/01/05 07:54:15 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit gnome2 eutils
+inherit autotools gnome2 eutils
 
 DESCRIPTION="Process viewer and system resource monitor for Gnome."
 HOMEPAGE="http://library.gnome.org/users/gnome-system-monitor/"
@@ -41,8 +41,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Apply multiple fixes from 2.32 and master branches
 	epatch "${WORKDIR}/${P}-patches"/*.patch
+
+	# Underlinking, bug #497108
+	epatch "${FILESDIR}/${P}-gmodule.patch"
+
+	rm missing || die # missing script too old, causes autoreconf warnings
+	eautoreconf
+	gnome2_src_prepare
 }