New version 'n cleanup

8 files changed, 17 insertions, 60 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index c2bd88cce1a0..05ee0e7cd320 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.28 2003/04/09 15:37:43 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.29 2003/05/15 17:35:31 foser Exp $
+
+*gnome-desktop-2.2.2 (15 May 2003)
+
+  15 May 2003; foser <foser@gentoo.org> gnome-desktop-2.2.2.ebuild :
+  New version : fixed vendor stuff, now actually works
 
 *gnome-desktop-2.2.1-r1 (02 apr 2003)
 
diff --git a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.0.10 b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.0.10
deleted file mode 100644
index 87695e7a6374..000000000000
--- a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a04d472ce8c6be6a823d348362a6d0b gnome-desktop-2.0.10.tar.bz2 1084473
diff --git a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.0.9 b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.0.9
deleted file mode 100644
index 007443841bc5..000000000000
--- a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b1435b76f191a6e0c8051afd24443ef4 gnome-desktop-2.0.9.tar.bz2 1078483
diff --git a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.2.1 b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.2.1
deleted file mode 100644
index 09ccc06f1ba7..000000000000
--- a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 95e6cf32afb647fdbb14d5c782b4ea9d gnome-desktop-2.2.1.tar.bz2 1053666
diff --git a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.2.2 b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.2.2
new file mode 100644
index 000000000000..2a7d952898fd
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.2.2
@@ -0,0 +1 @@
+MD5 335e6109abc5a04e69ab574464af1900 gnome-desktop-2.2.2.tar.bz2 1059658
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.0.10.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.0.10.ebuild
deleted file mode 100644
index 7b08689c6c12..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.0.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2002 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.0.10.ebuild,v 1.5 2003/01/03 19:55:42 bjb Exp $
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Libraries for the gnome desktop that is not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc alpha"
-LICENSE="GPL-2 FDL-1.1 LGPL-2.1"
-
-RDEPEND=">=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2
-	>=x11-libs/gtk+-2.0.6
-	>=gnome-base/gnome-vfs-2
-	!gnome-base/gnome-core"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.22
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog COPYING*  README* INSTALL NEWS HACKING"
-
-
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.0.9.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.0.9.ebuild
deleted file mode 100644
index 3c39d9e1e956..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.0.9.ebuild
+++ /dev/null
@@ -1,27 +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-desktop/gnome-desktop-2.0.9.ebuild,v 1.6 2003/02/13 12:08:07 vapier Exp $
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Libraries for the gnome desktop that is not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc alpha"
-LICENSE="GPL-2 FDL-1.1 LGPL-2.1"
-
-RDEPEND=">=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2
-	>=x11-libs/gtk+-2.0.6
-	>=gnome-base/gnome-vfs-2
-	!gnome-base/gnome-core"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.22
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog COPYING*  README* INSTALL NEWS HACKING"
-
-
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.2.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.2.2.ebuild
index 8a4271f6fb16..fcdab5409e17 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.2.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.2.2.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-desktop/gnome-desktop-2.2.1.ebuild,v 1.4 2003/04/09 15:37:43 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.2.2.ebuild,v 1.1 2003/05/15 17:35:31 foser Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ DESCRIPTION="Libraries for the gnome desktop that is not part of the UI"
 HOMEPAGE="http://www.gnome.org/"
 
 SLOT="0"
-KEYWORDS="x86 ~ppc ~alpha sparc"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 
 RDEPEND=">=x11-libs/gtk+-2.1.2
@@ -30,9 +30,17 @@ 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
+
+	WANT_AUTOCONF_2_5=1 autoconf || die
+	automake || 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
+
 }