Fix configure switch, bug #516716 by tux_mind; drop old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 38 insertions, 47 deletions

diff --git a/gnome-extra/gnome-system-monitor/ChangeLog b/gnome-extra/gnome-system-monitor/ChangeLog
index 82bc9a512835..29e5351712fb 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.249 2014/05/31 10:27:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.250 2014/07/14 18:33:50 pacho Exp $
+
+  14 Jul 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-system-monitor-3.12.2-configure-wnck.patch,
+  -gnome-system-monitor-3.12.1.ebuild, gnome-system-monitor-3.12.2.ebuild:
+  Fix configure switch, bug #516716 by tux_mind; drop old
 
   31 May 2014; Pacho Ramos <pacho@gentoo.org>
   gnome-system-monitor-3.12.2.ebuild:
diff --git a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.12.2-configure-wnck.patch b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.12.2-configure-wnck.patch
new file mode 100644
index 000000000000..760fc4b800e4
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.12.2-configure-wnck.patch
@@ -0,0 +1,23 @@
+From 30fb8a4a95228d57cc154afc0dd8a0ed55224a3d Mon Sep 17 00:00:00 2001
+From: Stefano Facchini <stefano.facchini@gmail.com>
+Date: Wed, 9 Jul 2014 11:37:53 +0200
+Subject: Fix --disable-wnck option
+
+https://bugzilla.gnome.org/show_bug.cgi?id=732942
+
+diff --git a/configure.ac b/configure.ac
+index 5ebae8a..b6a1748 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,7 +56,7 @@ PKG_CHECK_MODULES(GSM,
+ AC_PATH_PROG(APPDATA_VALIDATE, appdata-validate)
+ AC_PATH_PROG(DESKTOP_FILE_VALIDATE, desktop-file-validate)
+ 
+-AC_ARG_ENABLE(wnck, AS_HELP_STRING([--enable-wnck], [enable wnck support]),enable_wnck=yes,enable_wnck=no)
++AC_ARG_ENABLE(wnck, AS_HELP_STRING([--enable-wnck], [enable wnck support]),enable_wnck="$enableval",enable_wnck=no)
+ if test "x$enable_wnck" != "xno"; then
+         PKG_CHECK_MODULES(WNCK, libwnck-3.0 >= $LIBWNCK_REQUIRED)
+         AC_DEFINE(HAVE_WNCK, 1, [Define if libwnck is available])
+-- 
+cgit v0.10.1
+
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.12.1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.12.1.ebuild
deleted file mode 100644
index 406189238cb6..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.12.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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-3.12.1.ebuild,v 1.1 2014/04/27 17:17:28 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="systemd +X"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=gnome-base/libgtop-2.28.2:2
-	>=x11-libs/gtk+-3.9.5:3[X(+)]
-	>=x11-themes/gnome-icon-theme-2.31
-	>=dev-cpp/gtkmm-3.3.18:3.0
-	>=dev-cpp/glibmm-2.34:2
-	>=dev-libs/libxml2-2.0:2
-	>=gnome-base/librsvg-2.35:2
-
-	systemd? ( >=sys-apps/systemd-38:0= )
-	X? ( >=x11-libs/libwnck-2.91.0:3 )
-"
-DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.20
-	>=dev-util/intltool-0.41.0
-	virtual/pkgconfig
-
-	systemd? ( !=sys-apps/systemd-43* )
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable systemd) \
-		$(use_enable X wnck) \
-		ITSTOOL=$(type -P true)
-}
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.12.2.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.12.2.ebuild
index dccb7afd2485..b20410e42511 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.12.2.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.12.2.ebuild
@@ -1,11 +1,11 @@
 # 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-3.12.2.ebuild,v 1.2 2014/05/31 10:27:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.12.2.ebuild,v 1.3 2014/07/14 18:33:50 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="The Gnome System Monitor"
 HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
@@ -36,6 +36,13 @@ DEPEND="${RDEPEND}
 	systemd? ( !=sys-apps/systemd-43* )
 "
 
+src_prepare() {
+	# From 'master', bug #516716
+	epatch "${FILESDIR}/${PN}-3.12.2-configure-wnck.patch"
+	eautoreconf
+	gnome2_src_prepare
+}
+
 src_configure() {
 	gnome2_src_configure \
 		$(use_enable systemd) \