GNOME 2.1.2 commit

49 files changed, 781 insertions, 26 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index aef170e94aa6..e5fa125458fe 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.15 2002/10/27 14:42:11 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.16 2002/11/13 00:25:14 foser Exp $
+
+*control-center-2.1.2 (12 Nov 2002)
+
+  12 Nov 2002; foser <foser@gentoo.org> control-center-2.1.2.ebuild :
+  GNOME 2.1.2 release
 
 *control-center-2.1.1 (27 Oct 2002)
 
diff --git a/gnome-base/control-center/control-center-2.1.2.ebuild b/gnome-base/control-center/control-center-2.1.2.ebuild
new file mode 100644
index 000000000000..495c0670185d
--- /dev/null
+++ b/gnome-base/control-center/control-center-2.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.1.2.ebuild,v 1.1 2002/11/13 00:25:14 foser Exp $
+
+inherit gnome2 debug
+
+S=${WORKDIR}/${P}
+DESCRIPTION="the gnome2 Desktop configuration tool"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+
+RDEPEND="=x11-libs/gtk+-2.1*
+	>=dev-libs/glib-2.0.6
+	>=gnome-base/gconf-1.2.1
+	=gnome-base/libgnomeui-2.1*
+	>=gnome-base/libglade-2.0.1
+	=gnome-base/libbonobo-2.1*
+	=gnome-base/libbonoboui-2.1*
+	=gnome-base/gnome-vfs-2.1*
+	=gnome-base/gnome-desktop-2.1*
+	>=app-text/scrollkeeper-0.3.11"
+																		
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0" 
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix font capplet not linking to the right libXft
+	cd ${S}/capplets/font
+	cp Makefile.in Makefile.in.orig
+	sed -e "s:FONT_CAPPLET_LIBS =:FONT_CAPPLET_LIBS = -L/usr/lib:" \
+		Makefile.in.orig > Makefile.in
+
+}
+
+DOCS="AUTHORS ChangeLog COPYING README* TODO INSTALL NEWS"
+
diff --git a/gnome-base/control-center/files/digest-control-center-2.1.2 b/gnome-base/control-center/files/digest-control-center-2.1.2
new file mode 100644
index 000000000000..59bb0842b3b5
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.1.2
@@ -0,0 +1 @@
+MD5 4af11b122187b1d4a2b097a0587cb327 control-center-2.1.2.tar.bz2 1188423
diff --git a/gnome-base/eel/ChangeLog b/gnome-base/eel/ChangeLog
index 03283094ffb9..0f0941468c77 100644
--- a/gnome-base/eel/ChangeLog
+++ b/gnome-base/eel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/eel
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/eel/ChangeLog,v 1.20 2002/10/27 14:42:12 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/eel/ChangeLog,v 1.21 2002/11/13 00:25:15 foser Exp $
+
+*eel-2.1.2 (12 Nov 2002)
+
+  12 Nov 2002; foser <foser@gentoo.org> eel-2.1.2.ebuild :
+  GNOME 2.1.2 release
 
 *eel-2.1.1 (27 Oct 2002)
 
diff --git a/gnome-base/eel/eel-2.1.2.ebuild b/gnome-base/eel/eel-2.1.2.ebuild
new file mode 100644
index 000000000000..02dabfd345f0
--- /dev/null
+++ b/gnome-base/eel/eel-2.1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/eel/eel-2.1.2.ebuild,v 1.1 2002/11/13 00:25:15 foser Exp $
+
+inherit gnome2 debug
+
+S=${WORKDIR}/${P}
+DESCRIPTION="EEL is the Eazel Extentions Library"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="2"
+LICENSE="GPL-2 LGPL-2.1" 
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+
+RDEPEND=">=dev-libs/glib-2.0.6-r1
+	>=gnome-base/gconf-1.2.1
+	=x11-libs/gtk+-2.1*
+	>=media-libs/libart_lgpl-2.3.10
+	>=dev-libs/libxml2-2.4.24
+	=gnome-base/gnome-vfs-2.1*
+	>=dev-libs/popt-1.6.3
+	=gnome-base/libbonobo-2.1*
+	=gnome-base/libbonoboui-2.1*
+	=gnome-base/bonobo-activation-2.1*
+	=gnome-base/libgnome-2.1*
+	=gnome-base/libgnomeui-2.1*
+	=gnome-base/libgnomecanvas-2.1*
+	=gnome-base/gail-1.1*"
+
+DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0"		
+
+LIBTOOL_FIX="1"
+
+DOCS="AUTHORS ChangeLog COPYING* HACKING THANKS README* INSTALL NEWS TODO MAINTAINERS"
+
+src_compile() {
+	gnome2_src_compile --enable-platform-gnome-2
+}
+
diff --git a/gnome-base/eel/files/digest-eel-2.1.2 b/gnome-base/eel/files/digest-eel-2.1.2
new file mode 100644
index 000000000000..255f72b95ef3
--- /dev/null
+++ b/gnome-base/eel/files/digest-eel-2.1.2
@@ -0,0 +1 @@
+MD5 a1b4b29ddfe0e25cfea56bc29d318f86 eel-2.1.2.tar.bz2 472609
diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 73cd59d990f6..c3acd915debe 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.15 2002/11/08 13:18:42 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.16 2002/11/13 00:25:15 foser Exp $
+
+*gnome-applets-2.1.1 (12 Nov 2002)
+
+  12 Nov 2002; foser <foser@gentoo.org> gnome-applets-2.1.1.ebuild :
+  GNOME 2.1.2 release
 
 *gnome-applets-2.0.3 (14 Sep 2002)
 
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.1.1 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.1.1
new file mode 100644
index 000000000000..205b873c93cb
--- /dev/null
+++ b/gnome-base/gnome-applets/files/digest-gnome-applets-2.1.1
@@ -0,0 +1 @@
+MD5 f8e24f9480b13815215d626ee36cff17 gnome-applets-2.1.1.tar.bz2 1791805
diff --git a/gnome-base/gnome-applets/gnome-applets-2.1.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.1.1.ebuild
new file mode 100644
index 000000000000..7294985d8889
--- /dev/null
+++ b/gnome-base/gnome-applets/gnome-applets-2.1.1.ebuild
@@ -0,0 +1,94 @@
+# 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-applets/gnome-applets-2.1.1.ebuild,v 1.1 2002/11/13 00:25:15 foser Exp $
+
+IUSE="doc"
+
+inherit libtool gnome2 debug
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Applets for the Gnome2 Desktop and Panel"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="2"
+LICENSE="GPL-2 FDL-1.1" 
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+
+RDEPEND=">=x11-libs/gtk+-2.0.6
+	>=x11-libs/libwnck-0.17
+	>=x11-libs/libzvt-2.0.1
+	>=app-text/scrollkeeper-0.3.11
+	>=sys-libs/ncurses-5.2-r3
+	=gnome-base/gail-1.1*
+	>=gnome-base/gconf-1.2.1
+	=gnome-base/gnome-vfs-2.1*
+	>=gnome-base/libgtop-2.0.0
+	=gnome-base/gnome-panel-2.1*
+	>=gnome-base/libglade-2.0.1"
+											
+DEPEND=">=dev-util/pkgconfig-0.12.0
+	doc? ( dev-util/gtk-doc )
+	${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	
+	# fix wrong path
+	cd ${S}/multiload
+	cp GNOME_MultiLoadApplet_Factory.server.in GNOME_MultiLoadApplet_Factory.server.in.old
+	sed -e "s:/home/hadess/garnome//libexec:/usr/libexec:" GNOME_MultiLoadApplet_Factory.server.in.old > GNOME_MultiLoadApplet_Factory.server.in
+}
+		
+src_compile() {
+	elibtoolize
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--disable-install-schemas \
+		--enable-platform-gnome-2 \
+		--enable-panelmenu=yes || die
+	make || die
+}
+
+src_install() {
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	make prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		infodir=${D}/usr/share/info \
+		mandir=${D}/usr/share/man \
+		localstatedir=${D}/var \
+		install || die
+	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+    
+	dodoc AUTHORS ChangeLog COPYING* README* INSTALL NEWS message-of-doom 
+	docinto battstat
+	dodoc battstat/AUTHORS battstat/ChangeLog battstat/README battstat/TODO
+	docinto cdplayer
+	dodoc cdplayer/ChangeLog
+	docinto charpic
+	dodoc charpic/ChangeLog
+	docinto drivemount
+	dodoc drivemount/AUTHORS drivemount/ChangeLog
+	docinto geyes
+	dodoc geyes/AUTHORS geyes/ChangeLog geyes/NEWS geyes/README*
+	docinto gkb-new
+	dodoc gkb-new/AUTHORS gkb-new/ChangeLog gkb-new/README gkb-new/TODO
+	docinto gtik
+	dodoc gtik/AUTHORS gtik/README gtik/ChangeLog gtik/NEWS
+	docinto gweather
+	dodoc gweather/AUTHORS gweather/ChangeLog gweather/NEWS gweather/README gweather/TODO
+	docinto mini-commander
+	dodoc mini-commander/AUTHORS mini-commander/ChangeLog mini-commander/NEWS mini-commander/README mini-commander/TODO
+	docinto mixer
+	dodoc mixer/AUTHORS mixer/ChangeLog
+	docinto modemlights
+	dodoc modemlights/AUTHORS modemlights/ChangeLog modemlights/TODO
+	docinto multiload
+	dodoc multiload/AUTHORS multiload/ChangeLog
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	scrollkeeper-update -p /var/lib/scrollkeeper
+}
diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index ce6ef3f14c7d..0e1dc816b42e 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 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.14 2002/10/27 14:42:12 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.15 2002/11/13 00:25:15 foser Exp $
+
+*gnome-desktop-2.1.2 (12 Nov 2002)
+
+  12 Nov 2002; foser <foser@gentoo.org> gnome-desktop-2.1.2.ebuild :
+  GNOME 2.1.2 release
 
 *gnome-desktop-2.1.0 (27 Oct 2002)
 
diff --git a/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.1.2 b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.1.2
new file mode 100644
index 000000000000..500462377e6a
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/digest-gnome-desktop-2.1.2
@@ -0,0 +1 @@
+MD5 0eaf376f65f3a7790056d1a6a83244f4 gnome-desktop-2.1.2.tar.bz2 1057276
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.1.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.1.2.ebuild
new file mode 100644
index 000000000000..8d389fce6dc0
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.1.2.ebuild
@@ -0,0 +1,27 @@
+# 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.1.2.ebuild,v 1.1 2002/11/13 00:25:15 foser Exp $
+
+inherit gnome2 debug
+
+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 sparc64 alpha"
+LICENSE="GPL-2 FDL-1.1 LGPL-2.1"
+
+RDEPEND="=gnome-base/libgnomeui-2.1*
+	=gnome-base/libgnomecanvas-2.1*
+	=x11-libs/gtk+-2.1*
+	=gnome-base/gnome-vfs-2.1*
+	!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-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index a4d3eda96847..3c6d0d4ef811 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.25 2002/10/30 01:21:28 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.26 2002/11/13 00:25:15 foser Exp $
+
+*gnome-panel-2.1.2 (12 Nov 2002)
+
+  12 Nov 2002; foser <foser@gentoo.org> gnome-panel-2.1.2.ebuild :
+  GNOME 2.1.2 release
 
 *gnome-panel-1.4.2-r1 (29 Oct 2002)
 
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.1.2 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.1.2
new file mode 100644
index 000000000000..21b5724df364
--- /dev/null
+++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.1.2
@@ -0,0 +1 @@
+MD5 71c73c9685c2e9c89422eafa9d60b220 gnome-panel-2.1.2.tar.bz2 1734427
diff --git a/gnome-base/gnome-panel/gnome-panel-2.1.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.1.2.ebuild
new file mode 100644
index 000000000000..d7f0a409cc41
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-2.1.2.ebuild
@@ -0,0 +1,40 @@
+# 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-panel/gnome-panel-2.1.2.ebuild,v 1.1 2002/11/13 00:25:15 foser Exp $
+
+IUSE="doc"
+
+MAKEOPTS="-j1"
+inherit gnome2 debug
+
+S=${WORKDIR}/${P}
+DESCRIPTION="The Panel for Gnome2"
+HOMEPAGE="http://www.gnome.org/"
+
+SLOT="0"
+LICENSE="GPL-2 FDL-1.1 LGPL-2.1"
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+
+RDEPEND="=x11-libs/gtk+-2.1*
+	>=dev-libs/libxml2-2.4.24
+	>=dev-libs/glib-2.0.6-r1
+	=x11-libs/libwnck-2.1*
+	>=app-text/scrollkeeper-0.3.11
+	>=gnome-base/ORBit2-2.4.3
+	=gnome-base/bonobo-activation-2.1*
+	>=gnome-base/gconf-1.2.1
+	>=gnome-base/gnome-vfs-2.0.4
+	=gnome-base/gnome-desktop-2.1*
+	>=gnome-base/libbonobo-2
+	>=gnome-base/libbonoboui-2.0
+	>=gnome-base/libglade-2.0.1
+	=gnome-base/libgnome-2.1*
+	=gnome-base/libgnomecanvas-2.1*
+	=gnome-base/libgnomeui-2.1*"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.22
+	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
+
+DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS  README*"
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index a77ae06e9ab7..c8a449369381 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.15 2002/10/27 14:42:12 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.16 2002/11/13 00:25:15 foser Exp $
+
+*gnome-session-2.1.2 (12 Nov 2002)
+
+  12 Nov 2002; foser <foser@gentoo.org> gnome-session-2.1.2.ebuild :
+  GNOME 2.1.2 release
 
 *gnome-session-2.1.1 (27 Oct 2002)
 
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.1.2 b/gnome-base/gnome-session/files/digest-gnome-session-2.1.2
new file mode 100644
index 000000000000..b45faa3a5a7d
--- /dev/null
+++ b/gnome-base/gnome-session/files/digest-gnome-session-2.1.2
@@ -0,0 +1 @@
+MD5 294e863a834d152b207c40c135fb3a92 gnome-session-2.1.2.tar.bz2 820400
diff --git a/gnome-base/gnome-session/gnome-session-2.1.2.ebuild b/gnome-base/gnome-session/gnome-session-2.1.2.ebuild
new file mode 100644
index 000000000000..d383db42762d
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.1.2.ebuild
@@ -0,0 +1,43 @@
+# 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-session/gnome-session-2.1.2.ebuild,v 1.1 2002/11/13 00:25:15 foser Exp $
+
+inherit gnome2 debug
+
+S=${WORKDIR}/${P}
+DESCRIPTION="the Gnome2 session manager"
+HOMEPAGE="http://www.gnome.org/"
+
+SLOT="0"
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
+
+RDEPEND=">=dev-libs/glib-2
+	=x11-libs/gtk+-2.1*
+	>=media-sound/esound-0.2.29
+	=gnome-base/libgnomeui-2.1*
+	=gnome-base/libgnomecanvas-2.1*
+	>=sys-devel/gettext-0.10.40
+	>=sys-apps/tcp-wrappers-7.6
+	>=gnome-base/gconf-1.2.1"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.22
+	!gnome-base/gnome-core"
+
+# gnome-base/gnome-core overwrite /usr/bin/gnome-session
+
+DOC="AUTHORS COPY* README HACKING INSTALL NEWS TODO ChangeLog"
+
+src_install() {
+	gnome2_src_install
+	
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe ${FILESDIR}/Gnome
+}
+
+
+
+
diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index df6209bc27d1..ac9e0d7c6cb7 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.24 2002/09/20 13:16:48 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.25 2002/11/13 00:25:15 foser Exp $
 
+*gnome-vfs-2.1.3 (12 Nov 2002)
+
+  12 Nov 2002; foser <foser@gentoo.org> gnome-vfs-2.1.3.ebuild :
+  GNOME 2.1.2 release
 
 *gnome-vfs-2.0.4-r2 (20 Sep 2002)
   20 Sep 2002; Spider <spider@gentoo.org> gnome-vfs-2.0.4-r2.ebuild :
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.1.3 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.1.3
new file mode 100644
index 000000000000..7548b143b931
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.1.3
@@ -0,0 +1 @@
+MD5 807d42925b4ea0fc33448561fdb2e08b gnome-vfs-2.1.3.tar.bz2 1075274
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.1.3.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.1.3.ebuild
new file mode 100644
index 000000000000..d16b447fc09c
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.1.3.ebuild
@@ -0,0 +1,44 @@
+# 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-vfs/gnome-vfs-2.1.3.ebuild,v 1.1 2002/11/13 00:25:15 foser Exp $
+
+IUSE="doc"
+
+inherit gnome2 debug
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="2"
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+LICENSE="GPL-2 LGPL-2.1"
+
+RDEPEND="=dev-libs/glib-2.0*
+	>=gnome-base/gconf-1.2.1
+	>=gnome-base/ORBit2-2.4.1
+	>=gnome-base/gnome-mime-data-2.0.1
+	=gnome-base/libbonobo-2.1*
+	=gnome-base/bonobo-activation-2.1*
+	>=sys-devel/gettext-0.10.40
+	>=dev-libs/openssl-0.9.5
+	>=sys-apps/bzip2-1.0"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.22
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-0.9 )"
+
+DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README TODO"
+
+src_compile() {
+	gnome2_src_compile DESTDIR=${D}
+}
+
+pkg_preinst () {
+	## this check is there because gnome-vfs still adheres the file, though it doesn't need it. backwards compliance isnt always good
+	REMOVE="${ROOT}/etc/gnome-vfs-2.0/vfolders/applications.vfolder-info"
+	if [ -f ${REMOVE} ] ; then
+		rm -f ${REMOVE}
+	fi
+}
+
diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index f0ca03a79818..8d0ee270dc8d 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.42 2002/10/27 14:42:12 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.43 2002/11/13 00:25:15 foser Exp $
+
+*gnome-2.1.2 (12 Nov 2002)
+
+  12 Nov 2002; foser <foser@gentoo.org> gnome-2.1.2.ebuild :
+  GNOME 2.1.2 release "Life Preserver"
 
 *gnome-2.1.1 (27 Oct 2002)
 
diff --git a/gnome-base/gnome/files/digest-gnome-2.1.2 b/gnome-base/gnome/files/digest-gnome-2.1.2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnome-base/gnome/files/digest-gnome-2.1.2
diff --git a/gnome-base/gnome/gnome-2.1.1.ebuild b/gnome-base/gnome/gnome-2.1.1.ebuild
index 3a7429c503b7..3e38782d289d 100644
--- a/gnome-base/gnome/gnome-2.1.1.ebuild
+++ b/gnome-base/gnome/gnome-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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/gnome-2.1.1.ebuild,v 1.1 2002/10/27 14:42:12 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.1.1.ebuild,v 1.2 2002/11/13 00:25:15 foser Exp $
 
 S=${WORKDIR}
 DESCRIPTION="GNOME 2.0 - merge this package to merge the Gnome2 desktop"
@@ -41,7 +41,7 @@ RDEPEND="!gnome-base/gnome-core
 	=media-gfx/eog-1.1*
 	=app-editors/gedit-2.1*
 	=gnome-extra/yelp-2.1*
-	=gnome-base/nautilus-2.1*
+	=gnome-base/nautilus-2.1.2
 	=x11-terms/gnome-terminal-2.1*
 	>=gnome-base/gnome-applets-2.0.2
 	=gnome-base/control-center-2.1*
@@ -77,8 +77,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=x11-themes/gnome-icon-theme-0.1
 	>=x11-themes/gnome-themes-0.1
 	>=app-arch/file-roller-2.1.1
-	>=gnome-extra/gcalctool-4.1.9
-	>=gnome-extra/system-tray-applet-0.15"
+	>=gnome-extra/gcalctool-4.1.9"
 
 pkg_postinst () {
 	einfo "note that to change windowmanager to metacity do: "
diff --git a/gnome-base/gnome/gnome-2.1.2.ebuild b/gnome-base/gnome/gnome-2.1.2.ebuild
new file mode 100644
index 000000000000..a40c68047073
--- /dev/null
+++ b/gnome-base/gnome/gnome-2.1.2.ebuild
@@ -0,0 +1,89 @@
+# 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/gnome-2.1.2.ebuild,v 1.1 2002/11/13 00:25:15 foser Exp $
+
+S=${WORKDIR}
+DESCRIPTION="GNOME 2.0 - merge this package to merge the Gnome2 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="ppc x86 sparc sparc64 alpha"
+
+
+#  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.
+
+# Metacity was choosen as the default window manager because of sawfish's long time of non-working state.
+
+# eog is installed to provide with image previews in nautilus.
+
+# gedit is a core example of Gnome2 platform
+
+# applets will pull in the gnome-panel
+
+# after the blank line are the "complete" list we use for gnome2 betas
+
+# after the second blank line added packages for gnome2.1 
+# file-roller, gcalctool being (a few of) fifth toe
+
+RDEPEND="!gnome-base/gnome-core
+	>=x11-wm/metacity-2.4.2
+	=gnome-base/gnome-session-2.1*
+	>=gnome-extra/bug-buddy-2.2.0
+	>=gnome-base/gdm-2.4.0.11
+	=media-gfx/eog-1.1*
+	=app-editors/gedit-2.1*
+	=gnome-extra/yelp-2.1*
+	=gnome-base/nautilus-2.1*
+	=x11-terms/gnome-terminal-2.1*
+	=gnome-base/gnome-applets-2.1*
+	=gnome-base/control-center-2.1*
+	=gnome-extra/gnome-utils-2.1*
+	=gnome-extra/gnome-media-2.1*
+	>=gnome-extra/gnome-system-monitor-2.0.2
+	=gnome-extra/gnome-games-2.1*
+	>=gnome-extra/gconf-editor-0.3.1
+	>=gnome-extra/gnome2-user-docs-2.0.1
+
+
+	=x11-libs/gtk+-2.1*
+	=x11-libs/pango-1.1*
+	=dev-libs/atk-1.1*
+	>=dev-libs/glib-2.0.6
+	=gnome-base/eel-2.1*
+	=gnome-base/gnome-panel-2.1*
+	=gnome-base/gnome-desktop-2.1*
+	=gnome-base/gnome-vfs-2.1*
+	=gnome-base/libgnomeprint-2.1*
+	=gnome-base/libgnomeprintui-2.1*
+	=gnome-base/libbonoboui-2.1*
+	=gnome-base/libbonobo-2.1*
+	=gnome-base/librsvg-2.1*
+	=gnome-base/libgnome-2.1*
+	=gnome-base/libgnomecanvas-2.1*
+	=gnome-base/libgnomeui-2.1*
+	=gnome-base/bonobo-activation-2.1*
+	>=net-libs/linc-0.7.0
+	>=x11-libs/libzvt-2.0.1
+	>=gnome-base/libglade-2.0.1
+	=x11-libs/libwnck-2.1*
+	>=gnome-base/ORBit2-2.4.3
+
+	>=x11-themes/gnome-icon-theme-0.1
+	>=x11-themes/gnome-themes-0.1
+	>=app-arch/file-roller-2.1.1
+	>=gnome-extra/gcalctool-4.1.9"
+
+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/libbonobo/ChangeLog b/gnome-base/libbonobo/ChangeLog
index be408d4a3d41..913115dd8d10 100644
--- a/gnome-base/libbonobo/ChangeLog
+++ b/gnome-base/libbonobo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/libbonobo
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.9 2002/11/12 00:37:32 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.10 2002/11/13 00:25:15 foser Exp $
+
+*libbonobo-2.1.0 (12 Nov 2002) 
+
+  12 Nov 2002; foser <foser@gentoo.org> libbonobo-2.0.1.ebuild :
+  GNOME 2.1.2 release
 
 *libbonobo-2.0.1 (17 Oct 2002)
   
diff --git a/gnome-base/libbonobo/files/digest-libbonobo-2.1.0 b/gnome-base/libbonobo/files/digest-libbonobo-2.1.0
new file mode 100644
index 000000000000..07dbe99256f1
--- /dev/null
+++ b/gnome-base/libbonobo/files/digest-libbonobo-2.1.0
@@ -0,0 +1 @@
+MD5 c25a1afeb3c7e37ef3dda728f6e121f7 libbonobo-2.1.0.tar.bz2 401608
diff --git a/gnome-base/libbonobo/libbonobo-2.1.0.ebuild b/gnome-base/libbonobo/libbonobo-2.1.0.ebuild
new file mode 100644
index 000000000000..2e870a1dff93
--- /dev/null
+++ b/gnome-base/libbonobo/libbonobo-2.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.1.0.ebuild,v 1.1 2002/11/13 00:25:15 foser Exp $
+
+IUSE="doc"
+
+inherit gnome2 debug
+
+S=${WORKDIR}/${P}
+DESCRIPTION="a CORBA framework "
+HOMEPAGE="http://www.gnome.org/"
+SLOT="0"
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+LICENSE="LGPL-2.1 GPL-2"
+
+RDEPEND=">=dev-libs/glib-2.0.1
+	>=gnome-base/ORBit2-2.4.0
+	=gnome-base/bonobo-activation-2.1*"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.17
+	doc? ( >=dev-util/gtk-doc-0.6 )"
+
+DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
+src_compile () {
+	gnome2_src_configure 
+	make || die "serial make failure"		 
+}
diff --git a/gnome-base/libbonoboui/ChangeLog b/gnome-base/libbonoboui/ChangeLog
index c6e6e898db81..45d6c0cb4f2c 100644
--- a/gnome-base/libbonoboui/ChangeLog
+++ b/gnome-base/libbonoboui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/libbonoboui
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonoboui/ChangeLog,v 1.11 2002/11/12 01:00:14 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonoboui/ChangeLog,v 1.12 2002/11/13 00:25:15 foser Exp $
+
+*libbonoboui-2.1.0 (12 Nov 2002)
+
+  12 Nov 2002; foser <foser@gentoo.org> libbonoboui-2.1.0.ebuild :
+  GNOME 2.1.2 release
 
 *libbonoboui-2.0.3.2 (27 Oct 2002)
  
diff --git a/gnome-base/libbonoboui/files/digest-libbonoboui-2.1.0 b/gnome-base/libbonoboui/files/digest-libbonoboui-2.1.0
new file mode 100644
index 000000000000..17a4aa468f98
--- /dev/null
+++ b/gnome-base/libbonoboui/files/digest-libbonoboui-2.1.0
@@ -0,0 +1 @@
+MD5 5ff289dbaf560bef63b37a9db28b6fa2 libbonoboui-2.1.0.tar.bz2 492959
diff --git a/gnome-base/libbonoboui/libbonoboui-2.1.0.ebuild b/gnome-base/libbonoboui/libbonoboui-2.1.0.ebuild
new file mode 100644
index 000000000000..6c526d4d93ab
--- /dev/null
+++ b/gnome-base/libbonoboui/libbonoboui-2.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonoboui/libbonoboui-2.1.0.ebuild,v 1.1 2002/11/13 00:25:15 foser Exp $
+
+inherit gnome2 debug
+
+S=${WORKDIR}/${P}
+DESCRIPTION="User Interface part of Lib bonobo"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="0"
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+LICENSE="GPL-2 LGPL-2.1"
+
+RDEPEND=">=x11-libs/gtk+-2.0.2
+	=gnome-base/bonobo-activation-2.1*
+	=gnome-base/libbonobo-2.1*
+	>=gnome-base/libglade-2
+	=gnome-base/libgnome-2.1*
+	=gnome-base/libgnomecanvas-2.1*
+	>=gnome-base/gconf-1.2.1"
+
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.22"
+
+LIBTOOL_FIX="0"
+DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README"
+
diff --git a/gnome-base/libgnome/files/digest-libgnome-2.1.1 b/gnome-base/libgnome/files/digest-libgnome-2.1.1
new file mode 100644
index 000000000000..661a48e4268b
--- /dev/null
+++ b/gnome-base/libgnome/files/digest-libgnome-2.1.1
@@ -0,0 +1 @@
+MD5 36b9b6061317539c34340b952ca825fa libgnome-2.1.1.tar.bz2 480685
diff --git a/gnome-base/libgnome/libgnome-2.1.1.ebuild b/gnome-base/libgnome/libgnome-2.1.1.ebuild
new file mode 100644
index 000000000000..3e969a83a5ad
--- /dev/null
+++ b/gnome-base/libgnome/libgnome-2.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.1.1.ebuild,v 1.1 2002/11/13 00:25:15 foser Exp $
+
+IUSE="doc"
+
+inherit gnome2 debug
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Essential Gnome Libraries"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="0"
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+LICENSE="GPL-2 LGPL-2.1"
+
+RDEPEND=">=dev-libs/libxslt-1.0.20
+	>=dev-libs/glib-2.0.6
+	>=gnome-base/gconf-1.2.1
+	>=gnome-base/gnome-mime-data-2.0.1
+	>=gnome-base/libbonobo-2.0.0
+	>=gnome-base/gnome-vfs-2.0.4
+	>=media-sound/esound-0.2.29
+	>=media-libs/audiofile-0.2.3
+	>=dev-libs/libxml2-2.4.24
+	>=sys-apps/gawk-3.1.0
+	>=sys-devel/perl-5.6.1-r3"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.22
+	doc? ( >=dev-util/gtk-doc-0.9 )
+	>=dev-util/pkgconfig-0.12.0"
+
+DOCS="AUTHORS COPYING*  ChangeLog INSTALL NEWS README"
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.1.0.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.1.0.ebuild
index fb51f3687eb8..7226d12a09ac 100644
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.1.0.ebuild
+++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/libgnomecanvas-2.1.0.ebuild,v 1.1 2002/10/27 14:42:12 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/libgnomecanvas-2.1.0.ebuild,v 1.2 2002/11/13 00:25:15 foser Exp $
 
 IUSE="doc"
 
@@ -19,7 +19,7 @@ RDEPEND=">=gnome-base/libglade-2.0.1
 	>=dev-libs/glib-2.0.6
 	>=x11-libs/pango-1.1
 	>=media-libs/libart_lgpl-2.3.10
-	>=dev-libs/libxslt-1.0.21
+	>=dev-libs/libxslt-1.0.20
 	>=media-libs/freetype-2.0.9
 	>=sys-devel/gettext-0.10.40
 	>=sys-devel/perl-5.6.1
diff --git a/gnome-base/libgnomeprint/ChangeLog b/gnome-base/libgnomeprint/ChangeLog
index 52ad4e6ffbf2..39a50843471d 100644
--- a/gnome-base/libgnomeprint/ChangeLog
+++ b/gnome-base/libgnomeprint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/libgnomeprint
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.8 2002/11/12 00:34:44 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.9 2002/11/13 00:25:15 foser Exp $
+
+*libgnomeprint-2.1.1 (12 Nov 2002)
+
+  12 Nov 2002; foser <foser@gentoo.org> libgnomeprint-2.1.1.ebuild :
+  GNOME 2.1.2 release
 
 *libgnomeprint-1.116.1 (24 Oct 2002)
 
diff --git a/gnome-base/libgnomeprint/files/digest-libgnomeprint-2.1.1 b/gnome-base/libgnomeprint/files/digest-libgnomeprint-2.1.1
new file mode 100644
index 000000000000..2628d7045883
--- /dev/null
+++ b/gnome-base/libgnomeprint/files/digest-libgnomeprint-2.1.1
@@ -0,0 +1 @@
+MD5 ced8d54c1cc3841185c0d4ba492d75d5 libgnomeprint-2.1.1.tar.bz2 543146
diff --git a/gnome-base/libgnomeprint/libgnomeprint-2.1.1.ebuild b/gnome-base/libgnomeprint/libgnomeprint-2.1.1.ebuild
new file mode 100644
index 000000000000..ba4f15acd762
--- /dev/null
+++ b/gnome-base/libgnomeprint/libgnomeprint-2.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/libgnomeprint-2.1.1.ebuild,v 1.1 2002/11/13 00:25:15 foser Exp $
+
+inherit libtool gnome2 debug
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Printer handling for Gnome"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="2.2"
+KEYWORDS="x86 ppc sparc sparc64"
+LICENSE="GPL-2 LGPL-2.1"
+
+
+RDEPEND="=gnome-base/libbonobo-2.1*
+	>=media-libs/libart_lgpl-2.3.8
+	=x11-libs/pango-1.1*
+	>=dev-libs/libxml2-2.4.22
+	>=dev-libs/glib-2.0.0
+	>=media-libs/freetype-2.0.9"
+		
+DEPEND="${RDEPEND} 
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( dev-util/gtk-doc )"
+	
+src_compile() {
+	elibtoolize
+	local myconf
+	 use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
+	 
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--disable-font-install \
+		--enable-platform-gnome-2 \
+		${myconf} || die "configure failure"
+
+	emake || die "compile failure"
+}
+
+src_install() {
+	make DESTDIR=${D} \
+		prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		infodir=${D}/usr/share/info \
+		mandir=${D}/usr/share/man \
+		install || die
+    
+	dodoc AUTHORS COPYING*  ChangeLog* INSTALL NEWS README 
+}
+
+pkg_postinst() {
+	echo ">>> Updating Fonts"
+	libgnomeprint-2.0-font-install \
+		--debug \
+		--smart \
+		--static \
+		--aliases=/usr/share/gnome/libgnomeprint-2.0/fonts/adobe-urw.font \
+		--target=/usr/share/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
+} 
diff --git a/gnome-base/libgnomeprintui/ChangeLog b/gnome-base/libgnomeprintui/ChangeLog
index b144e75e284a..bad668cb1f16 100644
--- a/gnome-base/libgnomeprintui/ChangeLog
+++ b/gnome-base/libgnomeprintui/ChangeLog
@@ -1,9 +1,18 @@
 # ChangeLog for gnome-base/libgnomeprintui
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/ChangeLog,v 1.5 2002/08/05 20:04:01 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/ChangeLog,v 1.6 2002/11/13 00:25:15 foser Exp $
 
+*libgnomeprintui-2.1.1 (12 Nov 2002)
+
+  12 Nov 2002; foser <foser@gentoo.org> libgnomeprintui-2.1.1.ebuild :
+  GNOME 2.1.2 release
+  Added to slot 2.2
 
 *libgnomeprintui-1.116.0 (05 Aug 2002)
+
+  12 Nov 2002; foser <foser@gentoo.org> libgnomeprintui-1.116.0.ebuild :
+  Fix libgnomeprint dep to be <2.1
+
   05 Aug 2002 ; Spider <spider@gentoo.org> libgnomeprintui-1.116.0.ebuild :
   new unstable version, masked 
   
diff --git a/gnome-base/libgnomeprintui/files/digest-libgnomeprintui-2.1.1 b/gnome-base/libgnomeprintui/files/digest-libgnomeprintui-2.1.1
new file mode 100644
index 000000000000..13a3e712b0d7
--- /dev/null
+++ b/gnome-base/libgnomeprintui/files/digest-libgnomeprintui-2.1.1
@@ -0,0 +1 @@
+MD5 6e5102fb4cbc8badd6652626cd43e170 libgnomeprintui-2.1.1.tar.bz2 321687
diff --git a/gnome-base/libgnomeprintui/libgnomeprintui-1.116.0.ebuild b/gnome-base/libgnomeprintui/libgnomeprintui-1.116.0.ebuild
index 839533d89e79..542798340a2b 100644
--- a/gnome-base/libgnomeprintui/libgnomeprintui-1.116.0.ebuild
+++ b/gnome-base/libgnomeprintui/libgnomeprintui-1.116.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/libgnomeprintui-1.116.0.ebuild,v 1.5 2002/10/04 05:35:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/libgnomeprintui-1.116.0.ebuild,v 1.6 2002/11/13 00:25:15 foser Exp $
 
 
 inherit gnome2
@@ -14,7 +14,7 @@ KEYWORDS="x86 ppc sparc sparc64 alpha"
 LICENSE="GPL-2 LGPL-2.1"
 
 RDEPEND=">=gnome-base/libgnomeui-2.0.1
-	>=gnome-base/libgnomeprint-1.116.0
+	<gnome-base/libgnomeprint-2.1
 	>=gnome-base/libgnomecanvas-2.0.1"
 
 DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0"
diff --git a/gnome-base/libgnomeprintui/libgnomeprintui-2.1.1.ebuild b/gnome-base/libgnomeprintui/libgnomeprintui-2.1.1.ebuild
new file mode 100644
index 000000000000..9a08e4117a68
--- /dev/null
+++ b/gnome-base/libgnomeprintui/libgnomeprintui-2.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/libgnomeprintui-2.1.1.ebuild,v 1.1 2002/11/13 00:25:15 foser Exp $
+
+inherit gnome2 debug
+
+S=${WORKDIR}/${P}
+DESCRIPTION="user interface libraries for gnome print"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="2.2"
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+LICENSE="GPL-2 LGPL-2.1"
+
+RDEPEND="=gnome-base/libgnomeui-2.1*
+	=gnome-base/libgnomeprint-2.1*
+	=gnome-base/libgnomecanvas-2.1*"
+
+DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0"
+
+DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README"
+
diff --git a/gnome-base/libgnomeui/ChangeLog b/gnome-base/libgnomeui/ChangeLog
index e4ec866cb569..e0d1d489ca6f 100644
--- a/gnome-base/libgnomeui/ChangeLog
+++ b/gnome-base/libgnomeui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/libgnomeui
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.10 2002/10/27 14:42:12 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.11 2002/11/13 00:25:15 foser Exp $
+
+*libgnomeui-2.1.2 (12 Nov 2002)
+
+  12 Nov 2002; foser <foser@gentoo.org> libgnomeui-2.1.2.ebuild :
+  GNOME 2.1.2 release
 
 *libgnomeui-2.1.1 (27 Oct 2002)
 
diff --git a/gnome-base/libgnomeui/files/digest-libgnomeui-2.1.2 b/gnome-base/libgnomeui/files/digest-libgnomeui-2.1.2
new file mode 100644
index 000000000000..5de9b7102288
--- /dev/null
+++ b/gnome-base/libgnomeui/files/digest-libgnomeui-2.1.2
@@ -0,0 +1 @@
+MD5 adb171c9388da5ee71e967f1fca3fcae libgnomeui-2.1.2.tar.bz2 1003360
diff --git a/gnome-base/libgnomeui/libgnomeui-2.1.2.ebuild b/gnome-base/libgnomeui/libgnomeui-2.1.2.ebuild
new file mode 100644
index 000000000000..0d37e1ded339
--- /dev/null
+++ b/gnome-base/libgnomeui/libgnomeui-2.1.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.1.2.ebuild,v 1.1 2002/11/13 00:25:15 foser Exp $
+
+IUSE="doc"
+
+inherit gnome2 debug
+
+S=${WORKDIR}/${P}
+DESCRIPTION="User interface part of libgnome"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="0"
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+LICENSE="GPL-2 LGPL-2.1" 
+
+RDEPEND="=x11-libs/gtk+-2.1*
+	>=sys-devel/perl-5.0.0
+	>=sys-apps/gawk-3.1.0
+	>=dev-libs/popt-1.6.0
+	>=sys-devel/bison-1.28
+	>=sys-devel/gettext-0.10.40
+	>=media-sound/esound-0.2.29
+	>=media-libs/audiofile-0.2.3
+	=gnome-base/libbonoboui-2.1*
+	>=gnome-base/gconf-1.2.1
+	=gnome-base/libgnome-2.1*
+	=gnome-base/libgnomecanvas-2.1*"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
+DOCS="AUTHORS  COPYING.LIB INSTALL NEWS README"
+
+
+
diff --git a/gnome-base/librsvg/librsvg-2.1.1.ebuild b/gnome-base/librsvg/librsvg-2.1.1.ebuild
index 18c451aaefa7..d89557bfa1e9 100644
--- a/gnome-base/librsvg/librsvg-2.1.1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.1.1.ebuild,v 1.1 2002/10/27 14:42:12 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.1.1.ebuild,v 1.2 2002/11/13 00:25:15 foser Exp $
 
 inherit gnome2 debug
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2 LGPL-2.1"
 RDEPEND=">=dev-libs/glib-2.0.4
 	=x11-libs/gtk+-2.1*
 	>=media-libs/libart_lgpl-2.3.10
-	>=dev-libs/libxml2-2.4.25
+	>=dev-libs/libxml2-2.4.24
 	=x11-libs/pango-1.1*"
 
 DEPEND="${RDEPEND} 
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 3fd16f479a88..4d9937236db0 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.29 2002/10/27 14:42:12 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.30 2002/11/13 00:25:15 foser Exp $
+
+*nautilus-2.1.2 (12 Nov 2002)
+
+  12 Nov 2002; foser <foser@gentoo.org> nautilus-2.1.2.ebuild :
+  GNOME 2.1.2 release
 
 *nautilus-2.1.1 (27 Oct 2002)
 
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.1.2 b/gnome-base/nautilus/files/digest-nautilus-2.1.2
new file mode 100644
index 000000000000..5d2b95b61e17
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-2.1.2
@@ -0,0 +1 @@
+MD5 bb13f3427ce259b042d7244c4c611afc nautilus-2.1.2.tar.bz2 4072797
diff --git a/gnome-base/nautilus/nautilus-2.0.7.ebuild b/gnome-base/nautilus/nautilus-2.0.7.ebuild
index 4f335c0c9995..cc6aab613d54 100644
--- a/gnome-base/nautilus/nautilus-2.0.7.ebuild
+++ b/gnome-base/nautilus/nautilus-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.0.7.ebuild,v 1.3 2002/10/04 05:35:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.0.7.ebuild,v 1.4 2002/11/13 00:25:15 foser Exp $
 
 inherit gnome2
 
@@ -11,6 +11,7 @@ HOMEPAGE="http://www.gnome.org/"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
 KEYWORDS="x86 ppc sparc sparc64 alpha"
+IUSE="oggvorbis"
 
 RDEPEND="app-admin/fam-oss
 	>=dev-libs/glib-2.0.6-r1
@@ -31,7 +32,9 @@ RDEPEND="app-admin/fam-oss
 	>=gnome-base/libgnomecanvas-2.0.4
 	>=gnome-base/librsvg-2.0.1
 	>=app-text/scrollkeeper-0.3.11
-	>=gnome-extra/gnome-utils-2.0.5"
+	>=gnome-extra/gnome-utils-2.0.5
+	sys-apps/eject
+	oggvorbis? ( media-sound/vorbis-tools )"
 
 DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0"
 
diff --git a/gnome-base/nautilus/nautilus-2.1.2.ebuild b/gnome-base/nautilus/nautilus-2.1.2.ebuild
new file mode 100644
index 000000000000..1959a24a38e4
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.1.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.1.2.ebuild,v 1.1 2002/11/13 00:25:15 foser Exp $
+
+inherit gnome2 debug
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A filemanager for the Gnome2 desktop"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+IUSE="oggvorbis"
+
+RDEPEND="app-admin/fam-oss
+	>=dev-libs/glib-2.0.6-r1
+	>=gnome-base/gconf-1.2.1
+	=x11-libs/gtk+-2.1*
+	>=dev-libs/libxml2-2.4.24
+	>=gnome-base/gnome-vfs-2.0.4
+	>=media-sound/esound-0.2.29
+	=gnome-base/bonobo-activation-2.1*
+	=gnome-base/eel-2.1.2
+	=gnome-base/gail-1.1*
+	=gnome-base/libgnome-2.1*
+	=gnome-base/libgnomeui-2.1*
+	=gnome-base/gnome-desktop-2.1*
+	>=media-libs/libart_lgpl-2.3.10
+	>=gnome-base/libbonobo-2.0.0
+	>=gnome-base/libbonoboui-2.0
+	=gnome-base/libgnomecanvas-2.1*
+	=gnome-base/librsvg-2.1*
+	>=app-text/scrollkeeper-0.3.11
+	=gnome-extra/gnome-utils-2.1*
+	sys-apps/eject
+	oggvorbis? ( media-sound/vorbis-tools )"
+
+DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0"
+
+
+G2CONF="${G2CONF} --enable-platform-gnome-2 --enable-gdialog=yes"
+DOCS="AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO"