fix build with gtk2.4

7 files changed, 41 insertions, 81 deletions

diff --git a/gnome-extra/gnome-system-monitor/ChangeLog b/gnome-extra/gnome-system-monitor/ChangeLog
index 6edfe596d36a..bb28b29f59db 100644
--- a/gnome-extra/gnome-system-monitor/ChangeLog
+++ b/gnome-extra/gnome-system-monitor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-system-monitor
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.36 2004/03/21 19:56:20 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.37 2004/04/27 15:16:08 foser Exp $
+
+  27 Apr 2004; foser <foser@gentoo.org> gnome-system-monitor-2.4.0.ebuild :
+  Fix build with gtk+-2.4, patch provided by David Love <dlove@nighton.net> in #46303
+  Fix libgtop dep to 2.0* (api breakage !)
 
 *gnome-system-monitor-2.6.0 (21 Mar 2004)
 
diff --git a/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.0.4-r1 b/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.0.4-r1
deleted file mode 100644
index 41d0ae03610b..000000000000
--- a/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.0.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2a20dc5c87d225d1d28f70a2fc568a74 gnome-system-monitor-2.0.4.tar.bz2 517346
diff --git a/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.0.5 b/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.0.5
deleted file mode 100644
index e58648860094..000000000000
--- a/gnome-extra/gnome-system-monitor/files/digest-gnome-system-monitor-2.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42d4ea444ecda4ba95d27baae3532583 gnome-system-monitor-2.0.5.tar.bz2 527689
diff --git a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.4.0-fix_gtk+-2.4_build.patch b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.4.0-fix_gtk+-2.4_build.patch
new file mode 100644
index 000000000000..87fe191d0aab
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.4.0-fix_gtk+-2.4_build.patch
@@ -0,0 +1,25 @@
+diff -urN gnome-system-monitor-2.4.0-orig/src/Makefile.am gnome-system-monitor-2.4.0/src/Makefile.am
+--- gnome-system-monitor-2.4.0-orig/src/Makefile.am	2004-04-02 11:54:54.000000000 -0500
++++ gnome-system-monitor-2.4.0/src/Makefile.am	2004-04-02 11:56:51.000000000 -0500
+@@ -3,8 +3,7 @@
+ INCLUDES = \
+ 	-DPROCMAN_DATADIR=\"$(datadir)/procman/\" \
+ 	-DDATADIR=\""$(datadir)"\" \
+-	@PROCMAN_CFLAGS@ -DGTK_DISABLE_DEPRECATED=1 \
+-	-DGNOME_DISABLE_DEPRECATED
++	@PROCMAN_CFLAGS@
+ 
+ bin_PROGRAMS = gnome-system-monitor
+ 
+diff -urN gnome-system-monitor-2.4.0-orig/src/Makefile.in gnome-system-monitor-2.4.0/src/Makefile.in
+--- gnome-system-monitor-2.4.0-orig/src/Makefile.in	2004-04-02 11:54:54.000000000 -0500
++++ gnome-system-monitor-2.4.0/src/Makefile.in	2004-04-02 11:56:38.000000000 -0500
+@@ -101,7 +101,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WARN_CXXFLAGS = @WARN_CXXFLAGS@
+ 
+-INCLUDES =  	-DPROCMAN_DATADIR=\"$(datadir)/procman/\" 	-DDATADIR=\""$(datadir)"\" 	@PROCMAN_CFLAGS@ -DGTK_DISABLE_DEPRECATED=1 	-DGNOME_DISABLE_DEPRECATED
++INCLUDES =  	-DPROCMAN_DATADIR=\"$(datadir)/procman/\" 	-DDATADIR=\""$(datadir)"\" 	@PROCMAN_CFLAGS@ 
+ 
+ 
+ bin_PROGRAMS = gnome-system-monitor
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.0.4-r1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.0.4-r1.ebuild
deleted file mode 100644
index 2a914fab2eb1..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# 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.0.4-r1.ebuild,v 1.13 2003/09/06 23:52:56 msterret Exp $
-
-inherit gnome2 eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Procman - The Gnome System Monitor"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha sparc hppa amd64"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/gconf-1.2
-	>=gnome-base/libgtop-2
-	>=x11-libs/libwnck-0.12"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/intltool-0.22
-	${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog COPYING HACKING README INSTALL NEWS TODO"
-
-src_unpack() {
-	unpack ${A}
-
-	# add some eyecandy to the devices view
-#	cd ${S}; epatch ${FILESDIR}/${PN}-devicesviewimprovements.patch
-	# disabled since it causes weird make order related problems
-	# on different systems
-}
-
-# fix some possible problem patchrelated
-#MAKEOPTS="-j1"
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.0.5.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.0.5.ebuild
deleted file mode 100644
index c4bf4acedb44..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.0.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# 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.0.5.ebuild,v 1.7 2003/09/23 15:51:24 darkspecter Exp $
-
-inherit gnome2 eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gnome System Monitor"
-HOMEPAGE="http://www.gnome.org/"
-
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~alpha ~sparc ~hppa ~amd64"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/gconf-1.2
-	>=gnome-base/libgtop-2
-	>=x11-libs/libwnck-0.12"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/intltool-0.22
-	${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog COPYING HACKING README INSTALL NEWS TODO"
-
-src_unpack() {
-	unpack ${A}
-
-	# Fix a crash at startup - <azarah@gentoo.org> 29 Jun 2003
-	cd ${S}; epatch ${FILESDIR}/${P}-fix-startup-crash.patch
-}
-
-# fix some possible problem patchrelated
-#MAKEOPTS="-j1"
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.4.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.4.0.ebuild
index ad2ebe4e36dc..8bafde7067ad 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.4.0.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.4.0.ebuild,v 1.9 2004/03/14 18:15:03 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.4.0.ebuild,v 1.10 2004/04/27 15:16:08 foser Exp $
 
 inherit gnome2
 
@@ -15,7 +15,7 @@ RDEPEND=">=x11-libs/gtk+-2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libgnome-2
 	>=gnome-base/gconf-2
-	>=gnome-base/libgtop-2
+	=gnome-base/libgtop-2.0*
 	>=x11-libs/libwnck-0.12"
 
 DEPEND=">=dev-util/pkgconfig-0.12.0
@@ -25,3 +25,12 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 
 DOCS="AUTHORS ChangeLog COPYING HACKING README INSTALL NEWS TODO"
 
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# fix issues with gtk+-2.4
+	epatch ${FILESDIR}/${P}-fix_gtk+-2.4_build.patch
+
+}