New version, removed older versions

10 files changed, 20 insertions, 164 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 2b0868e5a0c3..b40d6a0eca34 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.76 2004/11/12 03:17:49 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.77 2004/11/25 04:41:27 obz Exp $
+
+*gnome-desktop-2.8.1 (25 Nov 2004)
+
+  25 Nov 2004; Mike Gardiner <obz@gentoo.org>
+  -files/gnome-desktop-2.4-no_deprecated_about.patch,
+  -gnome-desktop-2.4.1.1.ebuild, -gnome-desktop-2.6.0.1.ebuild,
+  -gnome-desktop-2.6.1.ebuild, +gnome-desktop-2.8.1.ebuild:
+  New version, removed older versions
 
   12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   gnome-desktop-2.8.0.ebuild:
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index ea0b583c46b5..cf0d81ab64f0 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,13 +1,8 @@
-MD5 c6b1983dade3156fa079051518c478b7 ChangeLog 9416
-MD5 58782ca68f09c2cc2080ad53ac89b54f gnome-desktop-2.4.1.1.ebuild 1518
-MD5 22d3040fcc9a7071adbb3a01f60dc7e4 gnome-desktop-2.6.0.1.ebuild 1232
-MD5 9cb5800c1d982ddb9b78107f2c937ca3 gnome-desktop-2.6.1.ebuild 1235
 MD5 3239687d6f15a5ac8cf1a77f84814297 gnome-desktop-2.6.2.ebuild 1235
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 0f4820d2db1b4d1b00f40ab05ea0e580 gnome-desktop-2.8.0.ebuild 1241
-MD5 66cf0386beeacad0617909c364c6ab37 files/digest-gnome-desktop-2.4.1.1 75
-MD5 8e943c5d49e88e9088c320d48090b4ff files/digest-gnome-desktop-2.6.0.1 75
-MD5 66df6fdf1d0e91cc642b296b823ad2d4 files/digest-gnome-desktop-2.6.1 73
+MD5 0920f78d7e9b02d4ced13271bc959736 ChangeLog 9710
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 d842f31907c93bff26184f5fc6531d46 gnome-desktop-2.8.1.ebuild 1231
 MD5 7da730c589038e00931bb8894d5a9054 files/digest-gnome-desktop-2.6.2 73
-MD5 821d72fd07e396d980c3940523a387be files/gnome-desktop-2.4-no_deprecated_about.patch 1641
 MD5 d2aa408f8ca1d7a5a752c31886b97213 files/digest-gnome-desktop-2.8.0 73
+MD5 39610cc4df959402bbc9a7426eb94566 files/digest-gnome-desktop-2.8.1 73
diff --git a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.4.1.1 b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.4.1.1
deleted file mode 100644
index d76c51467f72..000000000000
--- a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.4.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c85489c7befc79b5cc9bda1b2006cacc gnome-desktop-2.4.1.1.tar.bz2 1054097
diff --git a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.6.0.1 b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.6.0.1
deleted file mode 100644
index 700c58718f47..000000000000
--- a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.6.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d40b7d7a15f23770265246979529327 gnome-desktop-2.6.0.1.tar.bz2 1077853
diff --git a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.6.1 b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.6.1
deleted file mode 100644
index 48b4210ff826..000000000000
--- a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63aa021d420ce14877f6a1dd3f0eeb16 gnome-desktop-2.6.1.tar.bz2 1074516
diff --git a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.8.1 b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.8.1
new file mode 100644
index 000000000000..b6df202f7170
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.8.1
@@ -0,0 +1 @@
+MD5 47f9b9508c4a0349d66fa1138b521794 gnome-desktop-2.8.1.tar.bz2 1132666
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.4-no_deprecated_about.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.4-no_deprecated_about.patch
deleted file mode 100644
index 321b4c3420e1..000000000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-2.4-no_deprecated_about.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -uNr gnome-desktop-2.4.1.1/gnome-about/Makefile.am gnome-desktop-2.4.1.1.patched/gnome-about/Makefile.am
---- gnome-desktop-2.4.1.1/gnome-about/Makefile.am	2003-06-06 15:00:57.000000000 +0200
-+++ gnome-desktop-2.4.1.1.patched/gnome-about/Makefile.am	2004-03-21 23:42:39.821531616 +0100
-@@ -6,12 +6,12 @@
- 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps\""
- 
- # Flags to make sure we're not using any deprecated functions
--DISABLE_DEPRECATED_CFLAGS =					\
--	-DG_DISABLE_DEPRECATED					\
--	-DGDK_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED				\
--	-DGDK_PIXBUF_DISABLE_DEPRECATED				\
--	-DGNOME_DISABLE_DEPRECATED
-+#DISABLE_DEPRECATED_CFLAGS =					\
-+#	-DG_DISABLE_DEPRECATED					\
-+#	-DGDK_DISABLE_DEPRECATED				\
-+#	-DGTK_DISABLE_DEPRECATED				\
-+#	-DGDK_PIXBUF_DISABLE_DEPRECATED				\
-+#	-DGNOME_DISABLE_DEPRECATED
- 
- LDADD = \
- 	$(GNOME_ABOUT_LIBS)
-diff -uNr gnome-desktop-2.4.1.1/gnome-about/Makefile.in gnome-desktop-2.4.1.1.patched/gnome-about/Makefile.in
---- gnome-desktop-2.4.1.1/gnome-about/Makefile.in	2003-10-15 15:02:21.000000000 +0200
-+++ gnome-desktop-2.4.1.1.patched/gnome-about/Makefile.in	2004-03-21 23:53:57.296539760 +0100
-@@ -155,12 +155,12 @@
- 
- 
- # Flags to make sure we're not using any deprecated functions
--DISABLE_DEPRECATED_CFLAGS = \
--	-DG_DISABLE_DEPRECATED					\
--	-DGDK_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED				\
--	-DGDK_PIXBUF_DISABLE_DEPRECATED				\
--	-DGNOME_DISABLE_DEPRECATED
-+#DISABLE_DEPRECATED_CFLAGS = \
-+#	-DG_DISABLE_DEPRECATED					\
-+#	-DGDK_DISABLE_DEPRECATED				\
-+#	-DGTK_DISABLE_DEPRECATED				\
-+#	-DGDK_PIXBUF_DISABLE_DEPRECATED				\
-+#	-DGNOME_DISABLE_DEPRECATED
- 
- 
- LDADD = \
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.4.1.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.4.1.1.ebuild
deleted file mode 100644
index 21cce9f029a1..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.4.1.1.ebuild
+++ /dev/null
@@ -1,55 +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-desktop/gnome-desktop-2.4.1.1.ebuild,v 1.15 2004/11/08 19:40:19 vapier Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Libraries for the gnome desktop that is not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64 mips arm"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.1.2
-	>=gnome-base/libgnomeui-2.1
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/gnome-vfs-2
-	>=x11-libs/startup-notification-0.5
-	>=gnome-base/libbonoboui-2.3
-	>=gnome-base/libbonobo-2
-	!gnome-base/gnome-core"
-
-# ugh, we don't need libbonobo really, but people bug about it. 
-# remove in 2.4.1 release.
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7.2
-	>=sys-devel/autoconf-2.58
-	>=dev-util/intltool-0.22
-	>=dev-util/pkgconfig-0.12.0
-	>=sys-apps/sed-4"
-
-DOCS="AUTHORS ChangeLog README INSTALL NEWS HACKING"
-
-src_unpack() {
-
-	unpack ${A}
-	# Set vendor info
-	cd ${S}
-	sed -i 's:GNOME.Org:Gentoo Linux:' configure.in \
-	|| die "sed failed (1)"
-
-	# fix issues with gtk+-2.4 (#45258)
-	epatch ${FILESDIR}/${PN}-2.4-no_deprecated_about.patch
-
-	# Fix bug 16853 by building gnome-about with IEEE to prevent
-	# floating point exceptions on alpha
-	if use alpha; then
-		sed -i '/^CFLAGS/s/$/ -mieee/' ${S}/gnome-about/Makefile.in \
-		|| die "sed failed (2)"
-	fi
-
-	WANT_AUTOMAKE=1.4 automake || die
-	WANT_AUTOCONF=2.5 autoconf || die
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.6.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.6.1.ebuild
deleted file mode 100644
index c2d75424e4d0..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.6.1.ebuild
+++ /dev/null
@@ -1,47 +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-desktop/gnome-desktop-2.6.1.ebuild,v 1.5 2004/11/08 19:40:19 vapier Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Libraries for the gnome desktop that is not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa amd64 ~ia64 ~mips ~arm"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.1.2
-	>=gnome-base/libgnomeui-2.1
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/gnome-vfs-2
-	>=x11-libs/startup-notification-0.5
-	!gnome-base/gnome-core"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	sys-devel/gettext
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.12.0
-	sys-devel/autoconf"
-
-DOCS="AUTHORS ChangeLog README INSTALL NEWS HACKING"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Set vendor info
-	sed -i 's:GNOME.Org:Gentoo Linux:' configure.in \
-	|| die "sed failed (1)"
-
-	WANT_AUTOCONF=2.5 autoconf || die
-
-	# Fix bug 16853 by building gnome-about with IEEE to prevent
-	# floating point exceptions on alpha
-	if use alpha; then
-		sed -i '/^CFLAGS/s/$/ -mieee/' ${S}/gnome-about/Makefile.in \
-		|| die "sed failed (2)"
-	fi
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.6.0.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.8.1.ebuild
index 28cd3f1bf738..c6be82db40df 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.6.0.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.8.1.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-desktop/gnome-desktop-2.6.0.1.ebuild,v 1.11 2004/11/08 19:40:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.8.1.ebuild,v 1.1 2004/11/25 04:41:27 obz Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc alpha ~sparc hppa amd64 ~ia64 mips arm"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~arm"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.1.2
@@ -26,15 +26,15 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	sys-devel/autoconf"
 
-DOCS="AUTHORS ChangeLog README INSTALL NEWS HACKING"
+DOCS="AUTHORS ChangeLog README NEWS HACKING"
 
 src_unpack() {
+
 	unpack ${A}
 	cd ${S}
 
 	# Set vendor info
-	sed -i 's:GNOME.Org:Gentoo Linux:' configure.in \
-	|| die "sed failed (1)"
+	sed -i 's:GNOME.Org:Gentoo Linux:' configure.in || die "sed failed (1)"
 
 	WANT_AUTOCONF=2.5 autoconf || die
 
@@ -44,4 +44,5 @@ src_unpack() {
 		sed -i '/^CFLAGS/s/$/ -mieee/' ${S}/gnome-about/Makefile.in \
 		|| die "sed failed (2)"
 	fi
+
 }