minor fixes and cleanup

7 files changed, 28 insertions, 289 deletions

diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index 25fe88db5d3c..ab68251be039 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for gnome-base/gnome
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.83 2003/12/14 15:01:18 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.84 2003/12/14 18:11:09 foser Exp $
 
 *gnome-2.4.1 (14 Dec 2003)
 
+  14 Dec 2003; foser <foser@gentoo.org> gnome-2.2.4.ebuild :
+  minor dep fixes
+
   14 Dec 2003; Mike Gardiner <obz@gentoo.org> gnome-2.2.2-r1.ebuild,
   gnome-2.4.1.ebuild, gnome-2.4.ebuild:
   2.2.2-r1, removed hppa keyword, dependency xscreensaver isnt marked on that
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index c5999ff19a0e..d423e89d457a 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,18 +1,14 @@
-MD5 08b6a34924a07481ed91e144b43b8df0 gnome-2.4_rc1.ebuild 4857
 MD5 71dfac7255f7183c2e6dc2a6786e07af gnome-2.2.2-r1.ebuild 3461
 MD5 a884c8a07bc7dad2edfe1e1bd6168032 gnome-2.4.ebuild 3403
-MD5 d98b191d352b51cf9febb8942f8710df gnome-2.4.1.ebuild 3551
-MD5 829e58075181f24871af3529b98fd377 gnome-2.2.2.ebuild 2823
+MD5 50c77fea6a678a899a56807e06effdb5 gnome-2.4.1.ebuild 3553
 MD5 62587f12a4bf9171c69dda499286c525 gnome-1.4-r3.ebuild 546
 MD5 6c88b8de6fd0ddc5e9e2ed0dcc5a1042 gnome-2.0.2-r1.ebuild 2508
 MD5 8f82155cd8e32aa46906ea912c14b021 gnome-2.2-r2.ebuild 3250
 MD5 cf259f67a6df17377ef98537d600d199 gnome-2.2.1.ebuild 3223
-MD5 83ed4c338fed7d5e21f0ced5181e0133 ChangeLog 12956
+MD5 46b014a9d31585dd405f6652293c96d9 ChangeLog 13038
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2.1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2.2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4.1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4_rc1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.0.2-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2.2-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4 0
diff --git a/gnome-base/gnome/files/digest-gnome-2.2.2 b/gnome-base/gnome/files/digest-gnome-2.2.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnome-base/gnome/files/digest-gnome-2.2.2
+++ /dev/null
diff --git a/gnome-base/gnome/files/digest-gnome-2.4_rc1 b/gnome-base/gnome/files/digest-gnome-2.4_rc1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnome-base/gnome/files/digest-gnome-2.4_rc1
+++ /dev/null
diff --git a/gnome-base/gnome/gnome-2.2.2.ebuild b/gnome-base/gnome/gnome-2.2.2.ebuild
deleted file mode 100644
index 19fb3a77d0cb..000000000000
--- a/gnome-base/gnome/gnome-2.2.2.ebuild
+++ /dev/null
@@ -1,92 +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-base/gnome/gnome-2.2.2.ebuild,v 1.2 2003/09/06 23:51:37 msterret Exp $
-
-S=${WORKDIR}
-DESCRIPTION="Meta package for the GNOME desktop."
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
-SLOT="2.0"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa"
-
-#  Note to developers:
-#  This is a wrapper for the complete Gnome2 desktop,
-#  This means all components that a user expects in Gnome2 are present
-#  please do not reduce this list further unless
-#  dependencies pull in what you remove.
-#  With "emerge gnome" a user expects the full "standard" distribution of Gnome and should be provided with that, consider only installing the parts needed for smaller installations.
-
-RDEPEND="!gnome-base/gnome-core
-
-	>=dev-util/intltool-0.26
-
-	>=x11-wm/metacity-2.4.55
-	>=gnome-base/gnome-session-2.2.1
-	>=gnome-extra/bug-buddy-2.2.106
-	>=gnome-base/control-center-2.2.2
-	>=gnome-base/gdm-2.4.1.4
-	>=media-gfx/eog-2.2.2
-	>=app-editors/gedit-2.2.2
-	>=gnome-extra/yelp-2.2.3
-	>=gnome-base/nautilus-2.2.4
-	>=x11-terms/gnome-terminal-2.2.2
-	>=gnome-base/gnome-applets-2.2.2
-	>=gnome-extra/gnome-utils-2.2.3
-	>=gnome-extra/gnome-system-monitor-2.0.5
-	>=gnome-extra/gnome-games-2.2.1
-	>=gnome-extra/gconf-editor-0.4.1
-	>=gnome-extra/gnome2-user-docs-2.0.6
-	>=gnome-base/gnome-mime-data-2.2.1
-
-	>=x11-libs/gtk+-2.2.2
-	>=x11-libs/pango-1.2.3
-	>=dev-libs/atk-1.2.4
-	>=dev-libs/glib-2.2.2
-
-	>=gnome-base/ORBit2-2.6.2
-	>=gnome-base/bonobo-activation-2.2.2
-	>=gnome-base/libbonobo-2.2.3
-	>=gnome-base/libbonoboui-2.2.2
-
-	>=gnome-base/gconf-2.2.1
-	>=gnome-base/gnome-panel-2.2.2.2
-	>=gnome-base/gnome-desktop-2.2.2
-	>=gnome-base/gnome-vfs-2.2.5
-	>=gnome-base/librsvg-2.2.5
-	>=gnome-base/libgnome-2.2.3
-	>=gnome-base/libgnomeui-2.2.2
-	>=gnome-base/libgnomecanvas-2.2.1
-	>=gnome-base/libglade-2.0.1
-
-	>=net-libs/linc-1.0.3
-
-	>=x11-libs/libwnck-2.2.2
-	>=gnome-base/libgnomeprint-2.2.1.3
-	>=gnome-base/libgnomeprintui-2.2.1.3
-	>=gnome-extra/libgail-gnome-1.0.2
-
-	>=x11-themes/gnome-icon-theme-1.0.6
-	>=x11-themes/gnome-themes-2.2.2
-
-	>=app-arch/file-roller-2.2.5
-	>=gnome-extra/acme-2.0.4
-	>=app-text/ggv-2.0.1
-
-	!hppa? ( !alpha? (
-		>=gnome-extra/gnome-media-2.2.2
-		>=gnome-extra/nautilus-media-0.2.2
-		>=media-libs/gst-plugins-0.6.2
-		>=media-libs/gstreamer-0.6.2 ) )"
-
-# The packages marked !alpha above don't build yet on alpha.  We
-# haven't given up, but there's no reason for them to hold up Gnome
-# 2.2 for alpha.
-
-pkg_postinst () {
-	einfo "note that to change windowmanager to metacity do: "
-	einfo " export WINDOW_MANAGER=\"/usr/bin/metacity\""
-	einfo "of course this works for all other window managers as well"
-}
diff --git a/gnome-base/gnome/gnome-2.4.1.ebuild b/gnome-base/gnome/gnome-2.4.1.ebuild
index cdfd7acc4161..18518f3eeea9 100644
--- a/gnome-base/gnome/gnome-2.4.1.ebuild
+++ b/gnome-base/gnome/gnome-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.4.1.ebuild,v 1.1 2003/12/14 15:01:18 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.4.1.ebuild,v 1.2 2003/12/14 18:11:11 foser Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop."
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="as-is"
 SLOT="2.0"
 
-IUSE="cdr doc accessibility"
+IUSE="cdr doc accessibility samba"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
@@ -26,7 +26,7 @@ KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc ~hppa"
 RDEPEND="!gnome-base/gnome-core
 
 	>=gnome-base/gconf-2.4.0.1
-	>=gnome-base/ORBit2-2.8.2
+	>=gnome-base/ORBit2-2.8.3
 	>=dev-libs/atk-1.4.1
 	>=media-libs/audiofile-0.2.4
 	>=media-sound/esound-0.2.32
@@ -47,27 +47,27 @@ RDEPEND="!gnome-base/gnome-core
 	>=dev-libs/libIDL-0.8.2
 	>=dev-libs/libxml2-2.5.11
 	>=dev-libs/libxslt-1.0.33
-	>=x11-libs/pango-1.2.5
+	>=x11-libs/pango-1.2.5-r1
 
-	>=gnome-extra/acme-2.4.1
+	>=gnome-extra/acme-2.4.2
 	>=gnome-extra/bug-buddy-2.4.1
 
 	>=gnome-base/control-center-2.4
 
 	>=gnome-base/eel-2.4.1
-	>=gnome-base/nautilus-2.4.1
+	>=gnome-base/nautilus-2.4.1-r2
 	>=gnome-extra/nautilus-media-0.3.3.1
 
 	>=media-gfx/eog-2.4.1
-	>=net-www/epiphany-1.0.5
+	>=net-www/epiphany-1.0.6
 	>=app-arch/file-roller-2.4.1.1
 	>=gnome-extra/gcalctool-4.3.16
 	>=gnome-extra/gconf-editor-2.4
-	>=gnome-base/gdm-2.4.1.6
+	>=gnome-base/gdm-2.4.1.7
 	>=app-editors/gedit-2.4.1
 	>=app-text/ggv-2.4.0.2
 	>=app-text/gpdf-0.111
-	>=gnome-base/gnome-applets-2.4.1-r1
+	>=gnome-base/gnome-applets-2.4.1-r2
 	>=gnome-base/gnome-desktop-2.4.1.1
 	>=gnome-extra/gnome-games-2.4.1.1
 
@@ -85,11 +85,11 @@ RDEPEND="!gnome-base/gnome-core
 	>=media-libs/gstreamer-0.6.4
 	>=media-libs/gst-plugins-0.6.4
 	>=x11-libs/gtksourceview-0.7
-	>=gnome-extra/gucharmap-1
-	>=gnome-base/libgnomeprint-2.4
-	>=gnome-base/libgnomeprintui-2.4
+	>=gnome-extra/gucharmap-1.2
+	>=gnome-base/libgnomeprint-2.4.2
+	>=gnome-base/libgnomeprintui-2.4.2
 	=gnome-extra/libgtkhtml-2.4*
-	>=gnome-base/libgtop-2.0.7
+	>=gnome-base/libgtop-2.0.6
 	>=gnome-base/librsvg-2.4
 	>=x11-libs/libwnck-2.4.0.1-r1
 	>=x11-wm/metacity-2.6.3
@@ -97,7 +97,7 @@ RDEPEND="!gnome-base/gnome-core
 
 	>=x11-libs/startup-notification-0.5
 
-	>=gnome-extra/yelp-2.4.1
+	>=gnome-extra/yelp-2.4.2
 	>=x11-libs/vte-0.11.10
 
 	>=app-text/scrollkeeper-0.3.12
@@ -108,14 +108,18 @@ RDEPEND="!gnome-base/gnome-core
 	doc? ( >=dev-util/gtk-doc-1.1 )
 
 	accessibility? ( >=gnome-extra/libgail-gnome-1.0.2
-		>=gnome-extra/at-spi-1.3.8
-		>=gnome-extra/gnome-speech-0.2.7
-		>=gnome-extra/gnome-mag-0.10.3
+		>=gnome-extra/at-spi-1.3.9
+		>=gnome-extra/gnome-speech-0.2.8
+		>=gnome-extra/gnome-mag-0.10.4
 		>=gnome-extra/gok-0.8.4
-		>=gnome-extra/gnopernicus-0.7.1 )"
+		>=gnome-extra/gnopernicus-0.7.1 )
+
+	samba? ( >=gnome-extra/gnome-vfs-extras-0.99.11 )"
 
 pkg_postinst () {
+
 	einfo "note that to change windowmanager to metacity do: "
 	einfo " export WINDOW_MANAGER=\"/usr/bin/metacity\""
 	einfo "of course this works for all other window managers as well"
+
 }
diff --git a/gnome-base/gnome/gnome-2.4_rc1.ebuild b/gnome-base/gnome/gnome-2.4_rc1.ebuild
deleted file mode 100644
index d525e01f3a9d..000000000000
--- a/gnome-base/gnome/gnome-2.4_rc1.ebuild
+++ /dev/null
@@ -1,172 +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-base/gnome/gnome-2.4_rc1.ebuild,v 1.4 2003/10/17 13:59:46 brad_mssw Exp $
-
-S=${WORKDIR}
-DESCRIPTION="Meta package for the GNOME desktop."
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
-SLOT="2.0"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa"
-
-#  Note to developers:
-#  This is a wrapper for the complete Gnome2 desktop,
-#  This means all components that a user expects in Gnome2 are present
-#  please do not reduce this list further unless
-#  dependencies pull in what you remove.
-#  With "emerge gnome" a user expects the full "standard" distribution of Gnome and should be provided with that, consider only installing the parts needed for smaller installations.
-
-RDEPEND="!gnome-base/gnome-core
-
-	>=gnome-base/gconf-2.3.3
-	>=gnome-base/ORBit2-2.8
-	>=dev-libs/atk-1.4
-	>=media-libs/audiofile-0.2.3
-	>=media-sound/esound-0.2.32
-	>=gnome-base/gail-1.4
-	>=dev-libs/glib-2.2.3
-	>=gnome-base/gnome-mime-data-2.3.2
-	>=gnome-base/gnome-vfs-2.3.90
-	>=x11-libs/gtk+-2.2.4
-	>=media-libs/libart_lgpl-2.3.15
-
-	>=gnome-base/libbonobo-2.4
-	>=gnome-base/libbonoboui-2.4
-	>=gnome-base/libglade-2.0.1
-	>=gnome-base/libgnome-2.4
-	>=gnome-base/libgnomecanvas-2.4
-	>=gnome-base/libgnomeui-2.4
-
-	>=dev-libs/libxml2-2.5.10
-	>=dev-libs/libxslt-1.0.32
-	>=x11-libs/pango-1.2.5
-
-
-	>=gnome-extra/acme-2.0.6
-	>=gnome-extra/bug-buddy-2.4
-
-	>=gnome-base/control-center-2.3.6
-
-	>=gnome-base/eel-2.3.90
-	>=gnome-base/nautilus-2.3.90
-	>=gnome-extra/nautilus-media-0.3.3
-
-	>=media-gfx/eog-2.3.90
-	>=net-www/epiphany-0.9.3
-	>=app-arch/file-roller-2.3.6
-	>=gnome-extra/gcalctool-4.3.2
-	>=gnome-extra/gconf-editor-2.4
-	>=gnome-base/gdm-2.2
-	>=app-editors/gedit-2.3.5
-	>=app-text/ggv-2.3.99
-	>=app-text/gpdf-0.106
-	>=gnome-base/gnome-applets-2.3.90
-	>=gnome-base/gnome-desktop-2.3.90
-	>=gnome-extra/gnome-games-2.3.90
-	>=x11-themes/gnome-icon-theme-1.0.8
-	>=gnome-extra/gnome-media-2.3.90
-	>=gnome-base/gnome-panel-2.3.90
-	>=gnome-base/gnome-session-2.3.90
-	>=gnome-extra/gnome-system-monitor-2.3.1
-	>=x11-terms/gnome-terminal-2.3.2
-	>=x11-themes/gnome-themes-2.3.4
-	>=gnome-extra/gnome2-user-docs-2.0.6
-	>=gnome-extra/gnome-utils-2.3.90
-	>=media-libs/gstreamer-0.6.3
-	>=media-libs/gst-plugins-0.6.3
-	>=x11-libs/gtksourceview-0.6
-	>=gnome-extra/gucharmap-0.9
-	>=gnome-extra/libgail-gnome-1.0.2
-	>=gnome-base/libgnomeprint-2.3.1
-	>=gnome-base/libgnomeprintui-2.3.1
-	=gnome-extra/libgtkhtml-2.4*
-	>=gnome-base/libgtop-2.0.4
-	>=gnome-base/librsvg-2.3.1
-	>=x11-libs/libwnck-2.3.1
-	>=x11-wm/metacity-2.5.5
-
-	>=x11-libs/startup-notification-0.5
-
-	>=gnome-extra/yelp-2.3.90
-	>=x11-libs/vte-0.11.10"
-
-# zenity scrollkeeper nautilus-cd-burner
-
-
-
-
-#RDEPEND="!gnome-base/gnome-core
-#
-#	>=dev-util/intltool-0.26
-#
-#	>=x11-wm/metacity-2.4.55
-#	>=gnome-base/gnome-session-2.2.2
-#	>=gnome-extra/bug-buddy-2.2.106
-#	>=gnome-base/control-center-2.2.2
-#	>=gnome-base/gdm-2.4.1.6
-#	>=media-gfx/eog-2.2.2
-#	>=app-editors/gedit-2.2.2
-#	>=gnome-extra/yelp-2.2.3
-#	>=gnome-base/nautilus-2.2.4
-#	>=x11-terms/gnome-terminal-2.2.2
-#	>=gnome-base/gnome-applets-2.2.2
-#	>=gnome-extra/gnome-utils-2.2.3
-#	>=gnome-extra/gnome-system-monitor-2.0.5
-#	>=gnome-extra/gnome-games-2.2.1
-#	>=gnome-extra/gconf-editor-0.4.1
-#	>=gnome-extra/gnome2-user-docs-2.0.6
-#	>=gnome-base/gnome-mime-data-2.2.1
-#
-#	>=x11-libs/gtk+-2.2.1-r1
-#	>=x11-libs/pango-1.2.3
-#	>=dev-libs/atk-1.2.4
-#	>=dev-libs/glib-2.2.2
-#
-#	>=gnome-base/ORBit2-2.6.3
-#	>=gnome-base/bonobo-activation-2.2.4
-#	>=gnome-base/libbonobo-2.2.3
-#	>=gnome-base/libbonoboui-2.2.4
-
-#	>=gnome-base/gconf-2.2.1
-#	>=gnome-base/gnome-panel-2.2.2.2
-#	>=gnome-base/gnome-desktop-2.2.2
-#	>=gnome-base/gnome-vfs-2.2.5
-#	>=gnome-base/librsvg-2.2.5
-#	>=gnome-base/libgnome-2.2.3
-#	>=gnome-base/libgnomeui-2.2.2
-#	>=gnome-base/libgnomecanvas-2.2.1
-#	>=gnome-base/libglade-2.0.1
-#	>=gnome-base/libgtop-2.0.3
-#
-#	>=net-libs/linc-1.0.3
-#
-#	>=x11-libs/libwnck-2.2.2
-#	>=gnome-base/libgnomeprint-2.2.1.3
-#	>=gnome-base/libgnomeprintui-2.2.1.3
-#	>=gnome-extra/libgail-gnome-1.0.2
-#
-#	>=x11-themes/gnome-icon-theme-1.0.6
-#	>=x11-themes/gnome-themes-2.2.2
-#
-#	>=app-arch/file-roller-2.2.5
-#	>=gnome-extra/acme-2.0.6
-#	>=app-text/ggv-2.0.1
-#
-#	!hppa? ( !alpha? (
-#		>=gnome-extra/gnome-media-2.2.2
-#		>=gnome-extra/nautilus-media-0.2.2
-#		>=media-libs/gst-plugins-0.6.2-r1
-#		>=media-libs/gstreamer-0.6.2 ) )"
-
-# The packages marked !alpha above don't build yet on alpha.  We
-# haven't given up, but there's no reason for them to hold up Gnome
-# 2.2 for alpha.
-
-pkg_postinst () {
-	einfo "note that to change windowmanager to metacity do: "
-	einfo " export WINDOW_MANAGER=\"/usr/bin/metacity\""
-	einfo "of course this works for all other window managers as well"
-}