new release

6 files changed, 29 insertions, 39 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 7ff55fbc54c8..f47f337feb8d 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.57 2004/04/17 09:55:48 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.58 2004/04/21 13:47:18 foser Exp $
+
+*gnome-desktop-2.6.1 (21 Apr 2004)
+
+  21 Apr 2004; foser <foser@gentoo.org> gnome-desktop-2.6.1.ebuild :
+  New release
 
   17 Apr 2004; Travis Tilley <lv@gentoo.org> gnome-desktop-2.4.1.1.ebuild:
   stable on amd64
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index dcf2a620ea8b..100b96be23ad 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,10 +1,12 @@
-MD5 ceb0d664a88d75440dba45cf52023545 ChangeLog 7503
 MD5 5aae51d19cb7d91ecf69150336646aa9 gnome-desktop-2.4.0.ebuild 1433
-MD5 915a2b4e4d97b96ed969b261d9f01e22 gnome-desktop-2.4.1.1.ebuild 1529
+MD5 2ac539e7a9c9a132f32b4bb54fd80eae gnome-desktop-2.6.1.ebuild 1255
 MD5 2ac539e7a9c9a132f32b4bb54fd80eae gnome-desktop-2.6.0.1.ebuild 1255
+MD5 915a2b4e4d97b96ed969b261d9f01e22 gnome-desktop-2.4.1.1.ebuild 1529
+MD5 ceb0d664a88d75440dba45cf52023545 ChangeLog 7503
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 ae9938d0ae2bab5488efbec5b205eb22 files/00_all_gentoo-vendor.patch 272
-MD5 563fc396af7466178c556e249112ec6b files/digest-gnome-desktop-2.4.0 73
 MD5 66cf0386beeacad0617909c364c6ab37 files/digest-gnome-desktop-2.4.1.1 75
 MD5 8e943c5d49e88e9088c320d48090b4ff files/digest-gnome-desktop-2.6.0.1 75
+MD5 563fc396af7466178c556e249112ec6b files/digest-gnome-desktop-2.4.0 73
+MD5 66df6fdf1d0e91cc642b296b823ad2d4 files/digest-gnome-desktop-2.6.1 73
 MD5 821d72fd07e396d980c3940523a387be files/gnome-desktop-2.4-no_deprecated_about.patch 1641
+MD5 ae9938d0ae2bab5488efbec5b205eb22 files/00_all_gentoo-vendor.patch 272
diff --git a/gnome-base/gnome-desktop/files/00_all_gentoo-vendor.patch b/gnome-base/gnome-desktop/files/00_all_gentoo-vendor.patch
deleted file mode 100644
index c41316c1b694..000000000000
--- a/gnome-base/gnome-desktop/files/00_all_gentoo-vendor.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old	2003-04-02 15:37:50.000000000 +0200
-+++ configure	2003-04-02 15:38:42.000000000 +0200
-@@ -8175,7 +8175,7 @@
- GNOME_PLATFORM=2
- GNOME_MINOR=2
- GNOME_MICRO=1
--GNOME_VENDOR="Gnome.Org"
-+GNOME_VENDOR="Gentoo Linux"
- GNOME_DATE="Tuesday, March 11th 2003"
- 
- 
diff --git a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.4.0 b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.4.0
deleted file mode 100644
index 8ca874be9492..000000000000
--- a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 183c14d192bdd41bd34578e8e7dc55f1 gnome-desktop-2.4.0.tar.bz2 1043460
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
new file mode 100644
index 000000000000..48b4210ff826
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.6.1
@@ -0,0 +1 @@
+MD5 63aa021d420ce14877f6a1dd3f0eeb16 gnome-desktop-2.6.1.tar.bz2 1074516
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.4.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.6.1.ebuild
index 8cb3082e06db..5e52031e76c6 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.4.0.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.6.1.ebuild
@@ -1,53 +1,47 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.4.0.ebuild,v 1.12 2004/03/21 23:23:31 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.6.1.ebuild,v 1.1 2004/04/21 13:47:18 foser 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"
 
+IUSE=""
 SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
 
 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
+	app-text/scrollkeeper
+	sys-devel/gettext
+	>=dev-util/intltool-0.29
 	>=dev-util/pkgconfig-0.12.0
-	>=sys-apps/sed-4"
+	sys-devel/autoconf"
 
 DOCS="AUTHORS ChangeLog COPYING* README INSTALL NEWS HACKING"
 
 src_unpack() {
 	unpack ${A}
-
-	# Set vendor info
 	cd ${S}
-	sed -i 's:GNOME.Org:Gentoo Linux:' configure.in
 
-	#45258
-	epatch ${FILESDIR}/${PN}-2.4-no_deprecated_about.patch
+	# Set vendor info
+	sed -i 's:GNOME.Org:Gentoo Linux:' configure.in \
+	|| die "sed failed (1)"
 
-	WANT_AUTOCONF=2.5 autoconf || die
-	WANT_AUTOMAKE=1.4 automake || die
+	WANT_AUTOCONF_2_5=1 autoconf || die
 
 	# Fix bug 16853 by building gnome-about with IEEE to prevent
 	# floating point exceptions on alpha
-	use alpha || return
-	cd ${S}/gnome-about
-	sed -i '/^CFLAGS/s/$/ -mieee/' Makefile.in
-
+	if use alpha; then
+		sed -i '/^CFLAGS/s/$/ -mieee/' ${S}/gnome-about/Makefile.in \
+		|| die "sed failed (2)"
+	fi
 }