Moved back to libglade-2.4, as 2.4.1 is buggy/incompatible, see bug #73868

5 files changed, 20 insertions, 168 deletions

diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index 78e7d30fb2c8..9b708b0bb6df 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.134 2004/12/08 04:42:31 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.135 2004/12/11 03:15:25 obz Exp $
+
+  11 Dec 2004; Mike Gardiner <obz@gentoo.org> gnome-2.8.1-r1.ebuild,
+  -gnome-2.8.1.ebuild:
+  Moved back to libglade-2.4, as 2.4.1 is buggy/incompatible, see bug #73868
 
 *gnome-2.8.1-r1 (08 Dec 2004)
 
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index f1ad73c24faa..0f8a222c2d06 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,22 +1,20 @@
+MD5 accb81830d0720476ba27aae980b2fa1 ChangeLog 19834
+MD5 2fe803743f19c25a33184caaba050e9c gnome-1.4-r3.ebuild 545
+MD5 4495d2bff6b870f43e26ca07f4103a5b gnome-2.4.2.ebuild 3757
+MD5 c837bf2a7248f18f79c58b6bcb8a4b9f gnome-2.6.1_p1.ebuild 3892
+MD5 8e2735e5d17f484f64a993802bd1bbc4 gnome-2.6.1_rc1.ebuild 3887
 MD5 40ea32d04f2550a993e7d8815f719df5 gnome-2.6.2-r1.ebuild 4220
-MD5 a0a237a4e1867d205a05adaa80c00262 gnome-2.8.0-r1.ebuild 3640
 MD5 f638a960c11abe03544f275393cb9398 gnome-2.6.3_pre0.ebuild 4249
-MD5 8e2735e5d17f484f64a993802bd1bbc4 gnome-2.6.1_rc1.ebuild 3887
-MD5 d009feb6cc5064cfc8717b66f73b949d gnome-2.8.1.ebuild 3859
 MD5 8a6b244abaa40ac400b8f3390a4920d0 gnome-2.6.ebuild 3762
-MD5 2fe803743f19c25a33184caaba050e9c gnome-1.4-r3.ebuild 545
-MD5 b4d9f44d49e31cf41ed2b4fb8bb239b1 ChangeLog 19664
-MD5 7b70fa9e6f82297a28ec8fa1e50aa1f0 gnome-2.8.1-r1.ebuild 3862
+MD5 a0a237a4e1867d205a05adaa80c00262 gnome-2.8.0-r1.ebuild 3640
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 4495d2bff6b870f43e26ca07f4103a5b gnome-2.4.2.ebuild 3757
-MD5 c837bf2a7248f18f79c58b6bcb8a4b9f gnome-2.6.1_p1.ebuild 3892
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.8.0-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.8.1-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.3_pre0 0
+MD5 e1d1fa64d40d27c677726b75d01d03ac gnome-2.8.1-r1.ebuild 3860
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-1.4-r3 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4.2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.8.1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.1_rc1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-1.4-r3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.2-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.1_p1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.1_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.2-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.3_pre0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.8.0-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.8.1-r1 0
diff --git a/gnome-base/gnome/files/digest-gnome-2.8.1 b/gnome-base/gnome/files/digest-gnome-2.8.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnome-base/gnome/files/digest-gnome-2.8.1
+++ /dev/null
diff --git a/gnome-base/gnome/gnome-2.8.1-r1.ebuild b/gnome-base/gnome/gnome-2.8.1-r1.ebuild
index 3bfe12cb3bc6..81f21a3bfbb2 100644
--- a/gnome-base/gnome/gnome-2.8.1-r1.ebuild
+++ b/gnome-base/gnome/gnome-2.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.8.1-r1.ebuild,v 1.1 2004/12/08 04:42:31 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.8.1-r1.ebuild,v 1.2 2004/12/11 03:15:25 obz Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop"
@@ -42,7 +42,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=gnome-base/libgnome-2.8
 	>=gnome-base/libgnomeui-2.8
 	>=gnome-base/libgnomecanvas-2.8
-	>=gnome-base/libglade-2.4.1
+	>=gnome-base/libglade-2.4
 
 	>=gnome-extra/bug-buddy-2.8
 	>=gnome-base/control-center-2.8.1-r1
diff --git a/gnome-base/gnome/gnome-2.8.1.ebuild b/gnome-base/gnome/gnome-2.8.1.ebuild
deleted file mode 100644
index 4dec83416316..000000000000
--- a/gnome-base/gnome/gnome-2.8.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.8.1.ebuild,v 1.5 2004/12/08 04:42:31 obz Exp $
-
-S=${WORKDIR}
-DESCRIPTION="Meta package for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
-SLOT="2.0"
-
-IUSE="accessibility cdr dvdr hal"
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips ~hppa ~ia64 ~alpha"
-
-RDEPEND="!gnome-base/gnome-core
-
-	>=dev-libs/glib-2.4.8
-	>=dev-libs/atk-1.8
-	>=x11-libs/gtk+-2.4.13-r1
-	>=x11-libs/pango-1.6
-
-	hppa? ( >=dev-libs/libxml2-2.6.9 )
-	!hppa? ( >=dev-libs/libxml2-2.6.15-r1 )
-	>=dev-libs/libxslt-1.1.9-r1
-
-	>=x11-libs/libxklavier-1.04-r1
-	>=media-libs/audiofile-0.2.6-r1
-	>=media-sound/esound-0.2.34
-	>=gnome-base/gnome-mime-data-2.4.2
-	>=media-libs/libart_lgpl-2.3.16
-
-	>=dev-libs/libIDL-0.8.4
-	>=gnome-base/orbit-2.12
-
-	>=gnome-base/gconf-2.8.1-r1
-	>=gnome-base/gnome-keyring-0.4
-	>=gnome-base/gnome-vfs-2.8.3-r1
-
-	>=gnome-base/libbonobo-2.8
-	>=gnome-base/libbonoboui-2.8
-	>=gnome-base/libgnome-2.8
-	>=gnome-base/libgnomeui-2.8
-	>=gnome-base/libgnomecanvas-2.8
-	>=gnome-base/libglade-2.4.1
-
-	>=gnome-extra/bug-buddy-2.8
-	>=gnome-base/control-center-2.8.1-r1
-
-	>=gnome-base/eel-2.8.2
-	>=gnome-base/nautilus-2.8.2-r1
-
-	>=media-libs/gstreamer-0.8.7
-	>=media-libs/gst-plugins-0.8.5-r1
-	>=gnome-extra/gnome-media-2.8
-
-	>=media-gfx/eog-2.8.2
-	!hppa? ( !mips? ( >=net-www/epiphany-1.4.6 ) )
-	>=app-arch/file-roller-2.8.3
-	>=gnome-extra/gcalctool-4.4.20
-	>=gnome-extra/gconf-editor-2.8.2
-	>=gnome-base/gdm-2.6.0.6
-	>=app-editors/gedit-2.8.2
-
-	>=app-text/ggv-2.8.1
-	>=app-text/gpdf-2.8.1
-
-	>=gnome-base/gnome-session-2.8.1
-	>=gnome-base/gnome-desktop-2.8.1
-	>=gnome-base/gnome-applets-2.8.1.1
-	>=gnome-base/gnome-panel-2.8.2
-
-	>=x11-themes/gnome-icon-theme-2.8
-	>=x11-themes/gnome-themes-2.8.1
-
-	>=x11-terms/gnome-terminal-2.8
-	>=gnome-extra/gnome2-user-docs-2.8.1
-
-	>=x11-libs/gtksourceview-1.1.1
-	>=gnome-extra/gucharmap-1.4.2
-	>=gnome-base/libgnomeprint-2.8.1
-	>=gnome-base/libgnomeprintui-2.8.1
-
-	>=gnome-extra/gnome-utils-2.8.1
-	>=gnome-extra/gnome-games-2.8.1-r1
-
-	>=gnome-base/libgtop-2.8.1
-	>=gnome-extra/gnome-system-monitor-2.8
-
-	>=gnome-base/librsvg-2.8.1
-	>=x11-libs/libwnck-2.8.1
-	>=x11-wm/metacity-2.8.6-r1
-
-	>=x11-libs/startup-notification-0.7
-
-	>=gnome-extra/yelp-2.6.4
-	>=x11-libs/vte-0.11.11-r2
-	>=gnome-extra/zenity-2.8.1
-	>=net-analyzer/gnome-netstatus-2.8
-
-	cdr? ( >=gnome-extra/nautilus-cd-burner-2.8.5 )
-	dvdr? ( >=gnome-extra/nautilus-cd-burner-2.8.5 )
-
-	hal? ( >=gnome-base/gnome-volume-manager-1.0.2-r1 )
-
-	>=gnome-extra/evolution-data-server-1.0.2
-	>=mail-client/evolution-2.0.2
-	>=gnome-extra/evolution-webcal-2.0.1
-	>=gnome-extra/gal-2.2.3
-	>=gnome-extra/libgtkhtml-3.2.3
-
-	>=net-misc/vino-2.8.0.1
-
-	>=app-admin/gnome-system-tools-1
-
-	accessibility? (
-		>=gnome-extra/libgail-gnome-1.1
-		>=gnome-base/gail-1.8.1
-		>=gnome-extra/at-spi-1.6.1
-		>=app-accessibility/gnome-mag-0.11.10
-		>=app-accessibility/gok-0.11.16
-		>=app-accessibility/gnopernicus-0.9.17 )"
-
-# freetts not stable yet
-#		>=app-accessibility/gnome-speech-0.3.5
-
-# unrelated
-# scrollkeeper
-# pkgconfig
-# intltool
-# gtk-doc
-
-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"
-	echo
-	einfo "To take full advantage of GNOME's functionality, please start"
-	einfo "the File Alteration Monitoring service (famd) before using"
-	einfo "GNOME, unless you have a specific reason for not doing so."
-	echo
-	einfo "To start famd now use:"
-	einfo "'/etc/init.d/famd start'"
-	echo
-	einfo "And please ensure you add it to the default runlevel using:"
-	einfo "'rc-update add famd default'"
-	echo
-
-}