From 9c6b5a602824dfec6521e0f4facfa5a11d64a37b Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Fri, 15 Apr 2011 09:53:58 +0000 Subject: Apply multiple fixes from 2.32 and master branches: multiple gtk+ related fixes, remove duplicate label in File System tab, moved rsvg_init and rsvg_term into main to fix upstream bug #613752, added close button to memory map dialog, fix to show cpu model on ARM, make maximum nice value 19 instead of 20 on Linux. Remove old. (Portage version: 2.1.9.45/cvs/Linux x86_64) --- gnome-extra/gnome-system-monitor/ChangeLog | 12 +++++- .../gnome-system-monitor-2.28.1.ebuild | 45 -------------------- .../gnome-system-monitor-2.28.2-r1.ebuild | 48 ++++++++++++++++++++++ 3 files changed, 59 insertions(+), 46 deletions(-) delete mode 100644 gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.1.ebuild create mode 100644 gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2-r1.ebuild (limited to 'gnome-extra') diff --git a/gnome-extra/gnome-system-monitor/ChangeLog b/gnome-extra/gnome-system-monitor/ChangeLog index d3e083491e37..947b151a76e5 100644 --- a/gnome-extra/gnome-system-monitor/ChangeLog +++ b/gnome-extra/gnome-system-monitor/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for gnome-extra/gnome-system-monitor # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.218 2011/03/22 19:27:23 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.219 2011/04/15 09:53:58 pacho Exp $ + +*gnome-system-monitor-2.28.2-r1 (15 Apr 2011) + + 15 Apr 2011; Pacho Ramos + -gnome-system-monitor-2.28.1.ebuild, +gnome-system-monitor-2.28.2-r1.ebuild: + Apply multiple fixes from 2.32 and master branches: multiple gtk+ related + fixes, remove duplicate label in File System tab, moved rsvg_init and + rsvg_term into main to fix upstream bug #613752, added close button to memory + map dialog, fix to show cpu model on ARM, make maximum nice value 19 instead + of 20 on Linux. Remove old. 22 Mar 2011; Brent Baude gnome-system-monitor-2.28.2.ebuild: diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.1.ebuild deleted file mode 100644 index ef768aacf381..000000000000 --- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2011 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.1.ebuild,v 1.10 2011/03/21 22:45:06 nirbheek Exp $ - -EAPI="2" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="The Gnome System Monitor" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=dev-libs/glib-2.16:2 - >=gnome-base/gconf-2:2 - >=x11-libs/libwnck-2.5:1 - >=gnome-base/libgtop-2.23.1:2 - >=x11-libs/gtk+-2.16.0:2 - >=x11-themes/gnome-icon-theme-2.15.3 - >=dev-cpp/gtkmm-2.8:2.4 - >=dev-cpp/glibmm-2.16:2 - dev-libs/libxml2:2 - >=gnome-base/librsvg-2.12:2 - >=dev-libs/dbus-glib-0.70" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.19 - >=app-text/scrollkeeper-0.3.11 - >=dev-util/intltool-0.35 - app-text/gnome-doc-utils" - -DOCS="AUTHORS ChangeLog NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} --disable-scrollkeeper" -} - -src_prepare() { - # Fix intltoolize broken file, see upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed" -} 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 new file mode 100644 index 000000000000..05044abf3ce2 --- /dev/null +++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2011 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.1 2011/04/15 09:53:58 pacho Exp $ + +EAPI="3" +GCONF_DEBUG="no" + +inherit gnome2 eutils + +DESCRIPTION="Process viewer and system resource monitor for Gnome." +HOMEPAGE="http://library.gnome.org/users/gnome-system-monitor/" + +SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND=">=dev-libs/glib-2.20:2 + >=gnome-base/gconf-2:2 + >=x11-libs/libwnck-2.5:1 + >=gnome-base/libgtop-2.23.1:2 + >=x11-libs/gtk+-2.20:2 + >=x11-themes/gnome-icon-theme-2.15.3 + >=dev-cpp/gtkmm-2.8:2.4 + >=dev-cpp/glibmm-2.16:2 + dev-libs/libxml2:2 + >=gnome-base/librsvg-2.12:2 + >=dev-libs/dbus-glib-0.70" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.19 + >=app-text/scrollkeeper-0.3.11 + >=dev-util/intltool-0.35 + app-text/gnome-doc-utils" + +pkg_setup() { + DOCS="AUTHORS ChangeLog NEWS README" + G2CONF="${G2CONF} --disable-scrollkeeper" +} + +src_prepare() { + gnome2_src_prepare + + # Apply multiple fixes from 2.32 and master branches + epatch "${WORKDIR}/${P}-patches"/*.patch +} -- cgit v1.2.3-65-gdbad