gnome-office almost finished, need to look at gnome-extra/gnome-db

69 files changed, 628 insertions, 1619 deletions

diff --git a/app-office/abiword/abiword-0.7.14.ebuild b/app-office/abiword/abiword-0.7.14.ebuild
deleted file mode 100644
index f6710eba5294..000000000000
--- a/app-office/abiword/abiword-0.7.14.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-0.7.14.ebuild,v 1.5 2001/09/30 12:20:39 azarah Exp $
-
-A="abi-${PV}.tar.gz abidistfiles-${PV}.tar.gz expat-${PV}.tar.gz psiconv-${PV}.tar.gz
-   unixfonts-${PV}.tar.gz wv-${PV}.tar.gz"
-S=${WORKDIR}/abi
-DESCRIPTION="Framework for creating database applications"
-SRC_URI="http://www.abisource.com/downloads/Version-${PV}/abi-${PV}.tar.gz
-	 http://www.abisource.com/downloads/Version-${PV}/abidistfiles-${PV}.tar.gz
-	 http://www.abisource.com/downloads/Version-${PV}/expat-${PV}.tar.gz
-	 http://www.abisource.com/downloads/Version-${PV}/psiconv-${PV}.tar.gz
-	 http://www.abisource.com/downloads/Version-${PV}/unixfonts-${PV}.tar.gz
-	 http://www.abisource.com/downloads/Version-${PV}/wv-${PV}.tar.gz"
-
-
-HOMEPAGE="http://www.gnome.org/gnome-office/abiword.shtml/"
-
-DEPEND="virtual/glibc
-	>=sys-devel/gcc-2.95.2
-        =media-libs/freetype-1.3.1-r2
-	>=media-libs/libpng-1.0.7
-	>=x11-libs/gtk+-1.2.8
-        gnome? ( >=gnome-base/gnome-libs-1.2.10 >=gnome-base/libunicode-0.4
-                 >=gnome-base/bonobo-1.0.4 >=gnome-base/gal-0.8 )
-        spell? ( app-text/pspell-0.11.2 )
-	virtual/x11"
-
-
-  if [ "`use gnome`" ] ; then
-    myconf="ABI_OPT_GNOME=1 ABI_OPT_BONOBO=1 "
-  fi
-  if [ "`use spell`" ] ; then
-    myconf="$myconf ABI_OPT_PSPELL=1"
-  fi
-
-src_compile() {
-  if [ "`use spell`" ] ; then
-    cd ${S}/src/config
-    cp abi_defs.mk abi_defs.orig
-    sed -e "s:-lltdl::" abi_defs.orig >  abi_defs.mk
-  fi
-  cd ${S}
-
-  # Doesn't work with -j 4 (hallski)
-  try make prefix=/opt/gnome/ UNIX_CAN_BUILD_STATIC=0 $myconf OPTIMIZER="$CFLAGS"
-
-}
-
-src_install() {
-	#do you really need the OPTIMIZER var below? -- DR
-  try make prefix=${D}/opt/gnome  UNIX_CAN_BUILD_STATIC=0 $myconf OPTIMIZER="$CFLAGS" install
-  cp ${D}/opt/gnome/AbiSuite/bin/AbiWord AbiWord.orig
-  sed -e "s:${D}::" AbiWord.orig > ${D}/opt/gnome/AbiSuite/bin/AbiWord
-  cd ${D}/opt/gnome/bin
-  rm -f abiword
-  rm -f AbiWord
-  ln -s  ../AbiSuite/bin/AbiWord AbiWord
-  ln -s  ../AbiSuite/bin/AbiWord abiword
-  
-  # Install icon and .desktop for menu entry (hopefully this works for this version,
-  # as I have only tested it for 0.9.3
-  if [ "`use gnome`" ] ; then
-            insinto ${GNOME_PATH}/share/pixmaps
-            newins ${WORKDIR}/${P}/abidistfiles/icons/abiword_48.png AbiWord.png
-            insinto ${GNOME_PATH}/share/gnome/apps/Applications
-            doins ${FILESDIR}/AbiWord.desktop
-  fi
-  
-}
-
-
-
-
diff --git a/app-office/abiword/abiword-0.9.3-r1.ebuild b/app-office/abiword/abiword-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..577fc13b4843
--- /dev/null
+++ b/app-office/abiword/abiword-0.9.3-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Karl Trygve Kalleberg <karltk@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-0.9.3-r1.ebuild,v 1.1 2001/10/06 20:15:36 hallski Exp $
+
+S=${WORKDIR}/${P}/abi
+DESCRIPTION="Text processor"
+SRC_URI="http://prdownloads.sourceforge.net/abiword/abiword-0.9.3.tar.gz"
+
+HOMEPAGE="http://www.abisource.com"
+
+DEPEND="virtual/glibc
+	>=sys-devel/gcc-2.95.2
+        =media-libs/freetype-1.3.1-r2
+	>=media-libs/libpng-1.0.7
+	>=x11-libs/gtk+-1.2.10-r4
+        gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
+		 >=dev-libs/libunicode-0.4-r1
+                 >=gnome-base/bonobo-1.0.9-r1
+		 >=gnome-extra/gal-0.13-r1 )
+        spell? ( >=app-text/pspell-0.11.2 )
+	virtual/x11"
+
+
+	if [ "`use gnome`" ] ; then
+		myconf="ABI_OPT_GNOME=1 ABI_OPT_BONOBO=1 "
+	fi
+
+	if [ "`use spell`" ] ; then
+		myconf="$myconf ABI_OPT_PSPELL=1"
+	fi
+
+src_compile() {
+	if [ "`use spell`" ]
+	then
+		cd ${S}/src/config
+		cp abi_defs.mk abi_defs.orig
+		sed -e "s:-lltdl::" abi_defs.orig >  abi_defs.mk
+	fi
+
+	cd ${S}
+
+	# Doesn't work with -j 4 (hallski)
+	make prefix=/usr 						\
+	     UNIX_CAN_BUILD_STATIC=0					\
+	     $myconf							\
+	     OPTIMIZER="$CFLAGS" || die
+}
+
+src_install() {
+	make prefix=${D}/usr install || die
+
+	cp ${D}/usr/AbiSuite/bin/AbiWord AbiWord.orig
+	sed -e "s:${D}::" AbiWord.orig > ${D}/usr/AbiSuite/bin/AbiWord
+	
+	cd ${D}/usr/bin
+	rm -f abiword
+	rm -f AbiWord
+	ln -s  ../AbiSuite/bin/AbiWord AbiWord
+	ln -s  ../AbiSuite/bin/AbiWord abiword
+
+	# Install icon and .desktop for menu entry
+	if [ "`use gnome`" ] ; then
+		insinto /usr/share/pixmaps
+		newins ${WORKDIR}/${P}/abidistfiles/icons/abiword_48.png AbiWord.png
+		insinto /usr/share/gnome/apps/Applications
+		doins ${FILESDIR}/AbiWord.desktop
+	fi
+}
+
diff --git a/app-office/abiword/abiword-0.9.3.ebuild b/app-office/abiword/abiword-0.9.3.ebuild
deleted file mode 100644
index a5a03fa5fdee..000000000000
--- a/app-office/abiword/abiword-0.9.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-0.9.3.ebuild,v 1.3 2001/10/03 21:43:56 hallski Exp $
-
-S=${WORKDIR}/${P}/abi
-DESCRIPTION="Text processor"
-SRC_URI="http://prdownloads.sourceforge.net/abiword/abiword-0.9.3.tar.gz"
-
-HOMEPAGE="http://www.abisource.com"
-
-DEPEND="virtual/glibc
-	>=sys-devel/gcc-2.95.2
-        =media-libs/freetype-1.3.1-r2
-	>=media-libs/libpng-1.0.7
-	>=x11-libs/gtk+-1.2.8
-        gnome? ( >=gnome-base/gnome-libs-1.2.10
-		 >=gnome-base/libunicode-0.4
-                 >=gnome-base/bonobo-1.0.4
-		 >=gnome-base/gal-0.8 )
-        spell? ( >=app-text/pspell-0.11.2 )
-	virtual/x11"
-
-
-  if [ "`use gnome`" ] ; then
-    myconf="ABI_OPT_GNOME=1 ABI_OPT_BONOBO=1 "
-  fi
-  if [ "`use spell`" ] ; then
-    myconf="$myconf ABI_OPT_PSPELL=1"
-  fi
-
-src_compile() {
-
-  if [ "`use spell`" ] ; then
-    cd ${S}/src/config
-    cp abi_defs.mk abi_defs.orig
-    sed -e "s:-lltdl::" abi_defs.orig >  abi_defs.mk
-  fi
-  cd ${S}
-
-  # Doesn't work with -j 4 (hallski)
-  try make prefix=/opt/gnome/ UNIX_CAN_BUILD_STATIC=0 $myconf OPTIMIZER="$CFLAGS"
-
-}
-
-src_install() {
-	#do you really need the OPTIMIZER var below? -- DR
-  try make prefix=${D}/opt/gnome  UNIX_CAN_BUILD_STATIC=0 $myconf OPTIMIZER="$CFLAGS" install
-  cp ${D}/opt/gnome/AbiSuite/bin/AbiWord AbiWord.orig
-  sed -e "s:${D}::" AbiWord.orig > ${D}/opt/gnome/AbiSuite/bin/AbiWord
-  cd ${D}/opt/gnome/bin
-  rm -f abiword
-  rm -f AbiWord
-  ln -s  ../AbiSuite/bin/AbiWord AbiWord
-  ln -s  ../AbiSuite/bin/AbiWord abiword
-
-  # Install icon and .desktop for menu entry
-  if [ "`use gnome`" ] ; then
-  	insinto ${GNOME_PATH}/share/pixmaps
-  	newins ${WORKDIR}/${P}/abidistfiles/icons/abiword_48.png AbiWord.png
-	insinto ${GNOME_PATH}/share/gnome/apps/Applications
-	doins ${FILESDIR}/AbiWord.desktop
-  fi
-	
-}
-
-
-
-
diff --git a/app-office/abiword/files/digest-abiword-0.7.14 b/app-office/abiword/files/digest-abiword-0.7.14
deleted file mode 100644
index 937aac2736cd..000000000000
--- a/app-office/abiword/files/digest-abiword-0.7.14
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 60902c1142c6a2cc136cef2fcc2ff925 abi-0.7.14.tar.gz
-MD5 c6585585cd9b3a4832f97bd71fcb81df abidistfiles-0.7.14.tar.gz
-MD5 1007c612a4a5ff992e7e9a138d1bd8df expat-0.7.14.tar.gz
-MD5 5e4eaf05c9cb3da5e1cc97f7e34ef009 psiconv-0.7.14.tar.gz
-MD5 f8644723b7077a95736d6df24598aef4 unixfonts-0.7.14.tar.gz
-MD5 3a4b9b91a6620cbbc788e077b06cfb65 wv-0.7.14.tar.gz
diff --git a/app-office/abiword/files/digest-abiword-0.9.3 b/app-office/abiword/files/digest-abiword-0.9.3-r1
index 6bd0ee14e392..6bd0ee14e392 100644
--- a/app-office/abiword/files/digest-abiword-0.9.3
+++ b/app-office/abiword/files/digest-abiword-0.9.3-r1
diff --git a/app-office/dia/dia-0.88.1-r1.ebuild b/app-office/dia/dia-0.88.1-r1.ebuild
new file mode 100644
index 000000000000..a4166b7c9e36
--- /dev/null
+++ b/app-office/dia/dia-0.88.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.88.1-r1.ebuild,v 1.1 2001/10/06 20:15:36 hallski Exp $
+
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
+DESCRIPTION="Diagram Creation Program"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
+HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml"
+
+RDEPEND=">=dev-libs/libxml-1.8.15
+         >=media-libs/gdk-pixbuf-0.11.0-r1
+         >=dev-libs/popt-1.5
+	 bonobo? ( >=gnome-base/bonobo-1.0.9-r1 )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+#	python? ( dev-lang/python-2.0 )"
+
+src_compile() {
+	local myconf
+
+	if [ "`use gnome`" ] ; then
+        	myconf="--enable-gnome"
+	fi
+
+	if [ "`use bonobo`" ]; then
+     		myconf="--enable-gnome --enable-bonobo"
+    	fi
+
+#    if [ "`use python`" ] ; then
+#      myconf="$myconf --with-python"
+#    fi
+
+	if [ -z "`use nls`" ] ; then
+        	myconf="$myconf --disable-nls"
+    	fi
+ 
+	./configure --host=${CHOST} 					\
+		    --prefix=/usr					\
+		    ${myconf} || die
+
+        # enable-gnome-print not recoomended
+
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS
+}
diff --git a/app-office/dia/dia-0.88.1.ebuild b/app-office/dia/dia-0.88.1.ebuild
deleted file mode 100644
index 04c4fc3c382e..000000000000
--- a/app-office/dia/dia-0.88.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.88.1.ebuild,v 1.7 2001/10/06 14:36:55 azarah Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Diagram Creation Program"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
-HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml"
-
-DEPEND=">=dev-libs/libxml-1.8.13 nls? ( sys-devel/gettext )
-        >=media-libs/gdk-pixbuf-0.11.0
-        >=dev-libs/popt-1.5
-	bonobo? ( >=gnome-base/bonobo-1.0.4 )
-	python? ( dev-lang/python-2.0 )"
-
-RDEPEND=">=dev-libs/libxml-1.8.13
-        >=media-libs/gdk-pixbuf-0.11.0
-        >=dev-libs/popt-1.5
-	bonobo? ( >=gnome-base/bonobo-1.0.4 )"
-
-src_compile() {
-
-    local myconf
-    local myprefix
-    myprefix="--prefix=/usr/X11R6 --sysconfdir=/etc/X11"
-    if [ "`use gnome`" ] ; then
-        myconf="--enable-gnome"
-        myprefix="--prefix=/opt/gnome --sysconfdir=/etc/opt/gnome"
-    else
-        myconf=""
-    fi
-
-    if [ "`use bonobo`" ]; then
-      myconf="--enable-gnome --enable-bonobo"
-    fi
-#    if [ "`use python`" ] ; then
-#      myconf="$myconf --with-python"
-#    fi
-    if [ -z "`use nls`" ] ; then
-        myconf="$myconf --disable-nls"
-    fi
-    try ./configure --host=${CHOST} ${myprefix} ${myconf}
-        # enable-gnome-print not recoomended
-    try pmake
-
-}
-
-src_install () {
-    myprefix="prefix=${D}/usr/X11R6 sysconfdir=${D}/etc/X11"
-    if [ "`use gnome`" ] ; then
-        myconf="--enable-gnome"
-        myprefix="prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome"
-    fi
-    try make $myprefix install
-    dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS
-
-}
-
-
-
-
-
diff --git a/app-office/dia/files/digest-dia-0.88.1 b/app-office/dia/files/digest-dia-0.88.1-r1
index 77311d467dc7..77311d467dc7 100644
--- a/app-office/dia/files/digest-dia-0.88.1
+++ b/app-office/dia/files/digest-dia-0.88.1-r1
diff --git a/app-office/gnumeric/files/digest-gnumeric-0.70-r1 b/app-office/gnumeric/files/digest-gnumeric-0.70-r2
index efb6fbb20ba7..efb6fbb20ba7 100644
--- a/app-office/gnumeric/files/digest-gnumeric-0.70-r1
+++ b/app-office/gnumeric/files/digest-gnumeric-0.70-r2
diff --git a/app-office/gnumeric/files/gnumeric-0.70-compile.patch b/app-office/gnumeric/files/gnumeric-0.70-compile.patch
new file mode 100644
index 000000000000..40fc1ae9c7d9
--- /dev/null
+++ b/app-office/gnumeric/files/gnumeric-0.70-compile.patch
@@ -0,0 +1,255 @@
+diff -u -r gnumeric-0.70.orig/plugins/applix/Makefile.am gnumeric-0.70/plugins/applix/Makefile.am
+--- gnumeric-0.70.orig/plugins/applix/Makefile.am	Sun Feb 25 22:13:06 2001
++++ gnumeric-0.70/plugins/applix/Makefile.am	Sat Oct  6 15:04:31 2001
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)					\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_applixdir = $(gnumeric_plugindir)/applix
+ gnumeric_plugin_applix_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/derivatives/Makefile.am gnumeric-0.70/plugins/derivatives/Makefile.am
+--- gnumeric-0.70.orig/plugins/derivatives/Makefile.am	Tue Jun 19 16:41:57 2001
++++ gnumeric-0.70/plugins/derivatives/Makefile.am	Sat Oct  6 15:04:16 2001
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)					\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_derivativesdir = $(gnumeric_plugindir)/derivatives
+ gnumeric_plugin_derivatives_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/dif/Makefile.am gnumeric-0.70/plugins/dif/Makefile.am
+--- gnumeric-0.70.orig/plugins/dif/Makefile.am	Sun Jun  3 22:05:16 2001
++++ gnumeric-0.70/plugins/dif/Makefile.am	Sat Oct  6 15:04:04 2001
+@@ -2,7 +2,8 @@
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+     -I$(includedir)	-I$(top_srcdir)/src	\
+     -I$(top_builddir)/src			\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)				\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_difdir = $(gnumeric_plugindir)/dif
+ gnumeric_plugin_dif_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/excel/Makefile.am gnumeric-0.70/plugins/excel/Makefile.am
+--- gnumeric-0.70.orig/plugins/excel/Makefile.am	Mon Aug 20 23:53:01 2001
++++ gnumeric-0.70/plugins/excel/Makefile.am	Sat Oct  6 13:56:39 2001
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(includedir) -I$(top_srcdir)/src $(GNOME_INCLUDEDIR)
++INCLUDES = -I$(includedir) -I$(top_srcdir)/src $(GNOME_INCLUDEDIR) $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_exceldir = $(gnumeric_plugindir)/excel
+ gnumeric_plugin_excel_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/gb/Makefile.am gnumeric-0.70/plugins/gb/Makefile.am
+--- gnumeric-0.70.orig/plugins/gb/Makefile.am	Wed Feb 21 22:40:35 2001
++++ gnumeric-0.70/plugins/gb/Makefile.am	Sat Oct  6 15:04:45 2001
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+     -I$(includedir)	-I$(top_srcdir)/src	\
+-    $(GNOME_INCLUDEDIR) $(GB_CFLAGS)
++    $(GNOME_INCLUDEDIR) $(GB_CFLAGS)		\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnum_gbdir = $(gnumeric_plugindir)/gb
+ gnum_gb_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/gda/Makefile.am gnumeric-0.70/plugins/gda/Makefile.am
+--- gnumeric-0.70.orig/plugins/gda/Makefile.am	Mon Feb 12 23:32:51 2001
++++ gnumeric-0.70/plugins/gda/Makefile.am	Sat Oct  6 15:05:45 2001
+@@ -2,7 +2,8 @@
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+     $(GNOME_INCLUDEDIR)					\
+-    $(GDA_CFLAGS)
++    $(GDA_CFLAGS)					\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_gdaifdir = $(gnumeric_plugindir)/gdaif
+ gnumeric_plugin_gdaif_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/guile/Makefile.am gnumeric-0.70/plugins/guile/Makefile.am
+--- gnumeric-0.70.orig/plugins/guile/Makefile.am	Mon Feb 12 23:32:51 2001
++++ gnumeric-0.70/plugins/guile/Makefile.am	Sat Oct  6 15:06:10 2001
+@@ -3,7 +3,8 @@
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+     -I$(includedir)	-I$(top_srcdir)/src	\
+     $(GUILE_INCS)				\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)				\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_guiledir = $(gnumeric_plugindir)/guile
+ gnumeric_plugin_guile_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/html/Makefile.am gnumeric-0.70/plugins/html/Makefile.am
+--- gnumeric-0.70.orig/plugins/html/Makefile.am	Mon Feb 12 23:32:52 2001
++++ gnumeric-0.70/plugins/html/Makefile.am	Sat Oct  6 14:54:08 2001
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)					\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_htmldir = $(gnumeric_plugindir)/html
+ gnumeric_plugin_html_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/lotus-123/Makefile.am gnumeric-0.70/plugins/lotus-123/Makefile.am
+--- gnumeric-0.70.orig/plugins/lotus-123/Makefile.am	Mon Feb 12 23:32:52 2001
++++ gnumeric-0.70/plugins/lotus-123/Makefile.am	Sat Oct  6 14:24:04 2001
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)					\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_lotusdir = $(gnumeric_plugindir)/lotus
+ gnumeric_plugin_lotus_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/numtheory/Makefile.am gnumeric-0.70/plugins/numtheory/Makefile.am
+--- gnumeric-0.70.orig/plugins/numtheory/Makefile.am	Mon Feb 12 23:32:53 2001
++++ gnumeric-0.70/plugins/numtheory/Makefile.am	Sat Oct  6 15:05:59 2001
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)					\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_numtheorydir = $(gnumeric_plugindir)/numtheory
+ gnumeric_plugin_numtheory_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/oleo/Makefile.am gnumeric-0.70/plugins/oleo/Makefile.am
+--- gnumeric-0.70.orig/plugins/oleo/Makefile.am	Mon Feb 12 23:32:54 2001
++++ gnumeric-0.70/plugins/oleo/Makefile.am	Sat Oct  6 14:40:21 2001
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)					\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_oleodir = $(gnumeric_plugindir)/oleo
+ gnumeric_plugin_oleo_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/perl/Makefile.am gnumeric-0.70/plugins/perl/Makefile.am
+--- gnumeric-0.70.orig/plugins/perl/Makefile.am	Mon Feb 12 23:32:55 2001
++++ gnumeric-0.70/plugins/perl/Makefile.am	Sat Oct  6 14:41:43 2001
+@@ -12,7 +12,8 @@
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+     -I$(top_srcdir)	-I$(top_srcdir)/src	\
+     $(PERL_CCOPTS)				\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)				\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ #
+ # Do not build the plugin until there is a maintainer
+diff -u -r gnumeric-0.70.orig/plugins/plan-perfect/Makefile.am gnumeric-0.70/plugins/plan-perfect/Makefile.am
+--- gnumeric-0.70.orig/plugins/plan-perfect/Makefile.am	Mon Feb 12 23:32:56 2001
++++ gnumeric-0.70/plugins/plan-perfect/Makefile.am	Sat Oct  6 14:40:36 2001
+@@ -10,7 +10,8 @@
+ INCLUDES = \
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)					\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_plan_perfectdir = $(gnumeric_plugindir)/plan_perfect
+ gnumeric_plugin_plan_perfect_DATA = $(PP_DATA_TARGET)
+diff -u -r gnumeric-0.70.orig/plugins/psiconv/Makefile.am gnumeric-0.70/plugins/psiconv/Makefile.am
+--- gnumeric-0.70.orig/plugins/psiconv/Makefile.am	Wed Jul 25 02:40:21 2001
++++ gnumeric-0.70/plugins/psiconv/Makefile.am	Sat Oct  6 14:41:58 2001
+@@ -3,7 +3,8 @@
+ INCLUDES = \
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+-    $(GNOME_INCLUDEDIR) $(PSICONV_CFLAGS)
++    $(GNOME_INCLUDEDIR) $(PSICONV_CFLAGS)		\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_psiconvdir = $(gnumeric_plugindir)/psiconv
+ gnumeric_plugin_psiconv_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/python/Makefile.am gnumeric-0.70/plugins/python/Makefile.am
+--- gnumeric-0.70.orig/plugins/python/Makefile.am	Tue Feb 13 19:20:09 2001
++++ gnumeric-0.70/plugins/python/Makefile.am	Sat Oct  6 14:40:58 2001
+@@ -3,7 +3,8 @@
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+     $(PY_CFLAGS)					\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)					\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_pythondir = $(gnumeric_plugindir)/python
+ gnumeric_plugin_python_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/python-loader/Makefile.am gnumeric-0.70/plugins/python-loader/Makefile.am
+--- gnumeric-0.70.orig/plugins/python-loader/Makefile.am	Sat Mar 17 14:12:40 2001
++++ gnumeric-0.70/plugins/python-loader/Makefile.am	Sat Oct  6 14:42:13 2001
+@@ -2,7 +2,8 @@
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+     $(PY_CFLAGS)					\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)					\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_python_loaderdir = $(gnumeric_plugindir)/python-loader
+ gnumeric_plugin_python_loader_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/sc/Makefile.am gnumeric-0.70/plugins/sc/Makefile.am
+--- gnumeric-0.70.orig/plugins/sc/Makefile.am	Mon Feb 12 23:32:58 2001
++++ gnumeric-0.70/plugins/sc/Makefile.am	Sat Oct  6 14:42:24 2001
+@@ -1,7 +1,7 @@
+ INCLUDES = \
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)	$(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_scdir = $(gnumeric_plugindir)/sc
+ gnumeric_plugin_sc_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/sylk/Makefile.am gnumeric-0.70/plugins/sylk/Makefile.am
+--- gnumeric-0.70.orig/plugins/sylk/Makefile.am	Mon Feb 12 23:32:58 2001
++++ gnumeric-0.70/plugins/sylk/Makefile.am	Sat Oct  6 14:41:11 2001
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)					\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_sylkdir = $(gnumeric_plugindir)/sylk
+ gnumeric_plugin_sylk_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/xbase/Makefile.am gnumeric-0.70/plugins/xbase/Makefile.am
+--- gnumeric-0.70.orig/plugins/xbase/Makefile.am	Mon Feb 12 23:33:03 2001
++++ gnumeric-0.70/plugins/xbase/Makefile.am	Sat Oct  6 14:42:37 2001
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)					\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_xbasedir = $(gnumeric_plugindir)/xbase
+ gnumeric_plugin_xbase_DATA = plugin.xml
+diff -u -r gnumeric-0.70.orig/plugins/xml_sax/Makefile.am gnumeric-0.70/plugins/xml_sax/Makefile.am
+--- gnumeric-0.70.orig/plugins/xml_sax/Makefile.am	Fri Apr 13 05:08:38 2001
++++ gnumeric-0.70/plugins/xml_sax/Makefile.am	Sat Oct  6 14:41:24 2001
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+     -I$(includedir)	-I$(top_srcdir)/src		\
+-    $(GNOME_INCLUDEDIR)
++    $(GNOME_INCLUDEDIR)					\
++    $(EXTRA_GNOME_CFLAGS)
+ 
+ gnumeric_plugin_xml_saxdir = $(gnumeric_plugindir)/xml_sax
+ gnumeric_plugin_xml_sax_DATA = plugin.xml
diff --git a/app-office/gnumeric/gnumeric-0.70-r1.ebuild b/app-office/gnumeric/gnumeric-0.70-r2.ebuild
index 94be7ef63206..dad366055d13 100644
--- a/app-office/gnumeric/gnumeric-0.70-r1.ebuild
+++ b/app-office/gnumeric/gnumeric-0.70-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
 # /home/cvsroot/gentoo-x86/gnome-office/gnumeric/gnumeric-0.66.ebuild,v 1.1 2001/06/28 09:47:57 hallski Exp
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-0.70-r1.ebuild,v 1.4 2001/10/06 14:36:55 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-0.70-r2.ebuild,v 1.1 2001/10/06 20:15:36 hallski Exp $
 
 
 A=${P}.tar.gz
@@ -11,31 +11,27 @@ DESCRIPTION="gnumeric"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnumeric/"${A}
 HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
 
-DEPEND=">=gnome-base/gnome-print-0.29
-        >=gnome-base/gal-0.8.0
+RDEPEND=">=gnome-base/gnome-print-0.30
+        >=gnome-extra/gal-0.13-r1
         >=dev-libs/libxml-1.8.15
-	>=gnome-libs/libole2-0.2.3
-        >=dev-util/xml-i18n-tools-0.8.4
+	>=dev-libs/libole2-0.2.3-r1
         perl? ( >=sys-devel/perl-5 )
 	python? ( >=dev-lang/python-2.0 )
-        gb? ( >=gnome-libs/gb-0.0.19 )
-        libgda? ( >=gnome-libs/libgda-0.2.9 )
-        nls? ( sys-devel/gettext )
-	bonobo? ( >=gnome-base/bonobo-1.0 )"
+        gb? ( >=gnome-extra/gb-0.0.20-r1 )
+        libgda? ( >=gnome-extra/libgda-0.2.91 )
+	bonobo? ( >=gnome-base/bonobo-1.0.9-r1 ) "
 
-RDEPEND=">=gnome-base/gnome-print-0.29
-        >=gnome-base/gal-0.8.0
-        gb? ( >=gnome-libs/gb-0.0.19 )
-        libgda? ( >=gnome-libs/libgda-0.2.9 )
-	bonobo? ( >=gnome-base/bonobo-1.0 ) "
+DEPEND="${RDEPEND}
+        >=dev-util/xml-i18n-tools-0.8.4
+        nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	
 	patch -p0 < ${FILESDIR}/${P}-gdk-gc-ref.patch
-#	cp configure configure.orig
-#	sed -e 's:"%d,:"%d",:' configure.orig > configure
+	patch -p1 < ${FILESDIR}/${P}-compile.patch
+	automake
 }
 
 src_compile() {
@@ -68,19 +64,17 @@ src_compile() {
     		myconf="$myconf --without-gda"
   	fi
 
-  	try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome --without-evolution ${myconf} 
+  	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --sysconfdir=/etc					\
+		    ${myconf} || die
 
 	emake || die "Building of package failed."
 }
 
 src_install() {
-  	make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome PREFIX=${D}/usr install || die
-  	dodoc AUTHORS COPYING *ChangeLog HACKING NEWS README TODO
+  	make DESTDIR=${D} install || die
 
+  	dodoc AUTHORS COPYING *ChangeLog HACKING NEWS README TODO
 }
 
-
-
-
-
-
diff --git a/app-office/mrproject/files/mrproject-0.4.0-compile.patch b/app-office/mrproject/files/mrproject-0.4.0-compile.patch
new file mode 100644
index 000000000000..f0a9e2d79829
--- /dev/null
+++ b/app-office/mrproject/files/mrproject-0.4.0-compile.patch
@@ -0,0 +1,34 @@
+diff -u -r mrproject-0.4.0.orig/client/widgets/Makefile.am mrproject-0.4.0/client/widgets/Makefile.am
+--- mrproject-0.4.0.orig/client/widgets/Makefile.am	Mon Jul 30 14:28:23 2001
++++ mrproject-0.4.0/client/widgets/Makefile.am	Sat Oct  6 13:42:04 2001
+@@ -1,5 +1,6 @@
+ INCLUDES = 						\
+ 	$(GNOMEUI_GAL_CFLAGS)				\
++	$(ORBIT_CFLAGS)					\
+ 	-I$(top_srcdir)					\
+ 	-I$(top_builddir)
+ 
+diff -u -r mrproject-0.4.0.orig/libmrproject/Makefile.am mrproject-0.4.0/libmrproject/Makefile.am
+--- mrproject-0.4.0.orig/libmrproject/Makefile.am	Wed Sep  5 21:28:55 2001
++++ mrproject-0.4.0/libmrproject/Makefile.am	Sat Oct  6 13:31:06 2001
+@@ -3,7 +3,8 @@
+ 	-I$(top_builddir) 		\
+ 	-I$(top_srcdir)/libmrproject 	\
+ 	-I$(top_builddir)/libmrproject 	\
+-	$(IDL_FLAGS)
++	$(IDL_FLAGS)			\
++	$(ORBIT_CFLAGS)
+ 
+ LDFLAGS=				\
+ 	$(ORBIT_LIBS)
+diff -u -r mrproject-0.4.0.orig/util/Makefile.am mrproject-0.4.0/util/Makefile.am
+--- mrproject-0.4.0.orig/util/Makefile.am	Mon Sep 17 16:39:38 2001
++++ mrproject-0.4.0/util/Makefile.am	Sat Oct  6 13:30:58 2001
+@@ -2,6 +2,7 @@
+ 	-I$(top_srcdir)				\
+ 	$(GNOME_CFLAGS)				\
+ 	$(VFS_CFLAGS)				\
++	$(ORBIT_CFLAGS)				\
+ 	-DMRPROJECT_IMAGEDIR=\"$(datadir)/images/mrproject/\" \
+ 	-DG_LOG_DOMAIN=\"MrProject\"
+ 
diff --git a/app-office/mrproject/mrproject-0.4.0-r1.ebuild b/app-office/mrproject/mrproject-0.4.0-r1.ebuild
index ae0db8166ff9..fb798cca4d2c 100644
--- a/app-office/mrproject/mrproject-0.4.0-r1.ebuild
+++ b/app-office/mrproject/mrproject-0.4.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/mrproject-0.4.0-r1.ebuild,v 1.1 2001/10/06 14:36:55 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/mrproject-0.4.0-r1.ebuild,v 1.2 2001/10/06 20:15:36 hallski Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -11,41 +11,49 @@ HOMEPAGE="http://mrproject.codefactory.se/"
 
 RDEPEND=">=media-libs/gdk-pixbuf-0.11.0-r1
 	 >=gnome-base/ORBit-0.5.10-r1
-         >=gnome-base/gal-0.13-r1
+         >=gnome-extra/gal-0.13-r1
 	 >=gnome-base/bonobo-1.0.9-r1
 	 >=gnome-base/libglade-0.17-r1
 	 >=dev-libs/libxml-1.8.15
-	 >=gnome-base/gconf-1.0.4-r1
+	 >=gnome-base/gconf-1.0.4-r2
 	 >=gnome-base/gnome-vfs-1.0.2-r1
 	 >=gnome-base/oaf-0.6.6-r1
 	 >=gnome-base/gnome-print-0.30"
 
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	>=dev-util/xml-i18n-tools-0.8.4"
 
 
+src_unpack() {
+	unpack ${A}
+	
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-compile.patch
+	automake
+}
+
 src_compile() {
-    local myconf
-    if [ -z "`use nls`" ] ; then
-      myconf="--disable-nls"
-    fi
-    try ./configure --host=${CHOST} --prefix=/usr \
-	--sysconfdir=/etc/gnome --disable-more-warnings \
-	--without-python $myconf
-    try pmake
+	local myconf
+
+	if [ -z "`use nls`" ] ; then
+		myconf="--disable-nls"
+	fi
+
+	./configure --host=${CHOST} 					\
+		    --prefix=/usr 					\
+		    --sysconfdir=/etc					\
+		    --disable-more-warnings 				\
+		    --without-python $myconf || die
 
+	emake || die
 }
 
 src_install () {
-
     try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING ChangeLog README NEWS TODO
 
+    dodoc AUTHORS COPYING ChangeLog README NEWS TODO
 }
 
 
 
-
-
diff --git a/gnome-base/bonobo/bonobo-1.0.9-r1.ebuild b/gnome-base/bonobo/bonobo-1.0.9-r2.ebuild
index 0e8b846e05ad..f71b1826fe97 100644
--- a/gnome-base/bonobo/bonobo-1.0.9-r1.ebuild
+++ b/gnome-base/bonobo/bonobo-1.0.9-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo/bonobo-1.0.9-r1.ebuild,v 1.1 2001/10/06 10:06:50 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo/bonobo-1.0.9-r2.ebuild,v 1.1 2001/10/06 20:15:36 hallski Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -20,14 +20,14 @@ DEPEND="${RDEPEND}
         >=dev-util/xml-i18n-tools-0.8.4"
 
 
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}.patch
-	autoconf
-	automake
-}
+#src_unpack() {
+#	unpack ${A}
+#	
+#	cd ${S}
+#	patch -p1 < ${FILESDIR}/${P}.patch
+#	autoconf
+#	automake
+#}
 
 src_compile() {
 	local myconf
@@ -40,8 +40,10 @@ src_compile() {
 	# on of the samples in the package need to be regenerated from 
 	# the idl files
 
-	rm -f ${S}/samples/bonobo-class/Bonobo_Sample_Echo.h
-	rm -f ${S}/samples/bonobo-class/Bonobo_Sample_Echo-*.c
+#	rm -f ${S}/samples/bonobo-class/Bonobo_Sample_Echo.h
+#	rm -f ${S}/samples/bonobo-class/Bonobo_Sample_Echo-*.c
+
+	CFLAGS="${CFLAGS} `gnome-config --cflags print`"
 
 	./configure --host=${CHOST} 					\
 		    --prefix=/use					\
diff --git a/gnome-base/bonobo/files/bonobo-1.0.9.patch b/gnome-base/bonobo/files/bonobo-1.0.9.patch
deleted file mode 100644
index bc29b83ac6a2..000000000000
--- a/gnome-base/bonobo/files/bonobo-1.0.9.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -r -u bonobo-1.0.9.orig/bonobo/Makefile.am bonobo-1.0.9/bonobo/Makefile.am
---- bonobo-1.0.9.orig/bonobo/Makefile.am	Fri Sep 21 00:06:42 2001
-+++ bonobo-1.0.9/bonobo/Makefile.am	Sat Oct  6 04:41:54 2001
-@@ -13,7 +13,8 @@
- 	$(GNOME_INCLUDEDIR)				\
- 	$(OAF_CFLAGS)					\
- 	$(GDK_PIXBUF_CFLAGS)				\
--	$(PROF_CFLAGS)
-+	$(PROF_CFLAGS)					\
-+	$(GNOME_PRINT_CFLAGS)
- 
- LDFLAGS += $(PROF_LDFLAGS)
- 
-diff -r -u bonobo-1.0.9.orig/configure.in bonobo-1.0.9/configure.in
---- bonobo-1.0.9.orig/configure.in	Thu Sep 27 20:51:27 2001
-+++ bonobo-1.0.9/configure.in	Sat Oct  6 04:41:38 2001
-@@ -294,6 +294,9 @@
-     AC_MSG_ERROR(Did not find gnome-print installed)
- fi
- 
-+GNOME_PRINT_CFLAGS="`$GNOME_CONFIG --cflags print`"
-+AC_SUBST(GNOME_PRINT_CFLAGS)
-+
- GNOME_PRINT_LIBS="`$GNOME_CONFIG --libs print`"
- AC_SUBST(GNOME_PRINT_LIBS)
- 
-diff -r -u bonobo-1.0.9.orig/monikers/Makefile.am bonobo-1.0.9/monikers/Makefile.am
---- bonobo-1.0.9.orig/monikers/Makefile.am	Sun May  6 00:57:34 2001
-+++ bonobo-1.0.9/monikers/Makefile.am	Sat Oct  6 04:55:06 2001
-@@ -5,7 +5,8 @@
- 	-I$(top_builddir)				\
- 	-I$(top_srcdir)/bonobo                          \
-         -I$(includedir)                                 \
--	$(BONOBO_TEST_CFLAGS)
-+	$(BONOBO_TEST_CFLAGS)				\
-+	$(GNOME_PRINT_CFLAGS)
- 
- OAF_FILES =					\
- 	Bonobo_Moniker_gzip.oaf.in		\
diff --git a/gnome-base/bonobo/files/digest-bonobo-1.0.9-r1 b/gnome-base/bonobo/files/digest-bonobo-1.0.9-r2
index cb450243a765..cb450243a765 100644
--- a/gnome-base/bonobo/files/digest-bonobo-1.0.9-r1
+++ b/gnome-base/bonobo/files/digest-bonobo-1.0.9-r2
diff --git a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.10 b/gnome-extra/gnome-db/files/digest-gnome-db-0.2.10
deleted file mode 100644
index 8a29827f2f1e..000000000000
--- a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f3a0480659ce671961909714a74ea4bf gnome-db-0.2.10.tar.gz
diff --git a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.9 b/gnome-extra/gnome-db/files/digest-gnome-db-0.2.9
deleted file mode 100644
index e5856d5f798e..000000000000
--- a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 44eebf935cf0a716e9f75e3551e59a2b gnome-db-0.2.9.tar.gz
diff --git a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.91 b/gnome-extra/gnome-db/files/digest-gnome-db-0.2.91-r1
index c124a34fc3c2..c124a34fc3c2 100644
--- a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.91
+++ b/gnome-extra/gnome-db/files/digest-gnome-db-0.2.91-r1
diff --git a/gnome-extra/gnome-db/gnome-db-0.2.9.ebuild b/gnome-extra/gnome-db/gnome-db-0.2.9.ebuild
deleted file mode 100644
index e31d6d7c9ba1..000000000000
--- a/gnome-extra/gnome-db/gnome-db-0.2.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/gnome-office/gnome-db/gnome-db-0.2.3.ebuild,v 1.1 2001/04/29 16:17:43 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-db/gnome-db-0.2.9.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Framework for creating database applications"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
-HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml"
-
-DEPEND=">=gnome-base/bonobo-0.30
-	>=gnome-libs/libgda-0.2.3
-        >=gnome-base/gal-0.8
-        >=dev-util/xml-i18n-tools-0.8.4"
-
-RDEPEND=">=gnome-base/bonobo-0.30
-	>=gnome-libs/libgda-0.2.3"
-
-src_compile() {
-
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome \
-        --datadir=/opt/gnome/share --disable-bonobotest
-  try pmake
-}
-
-src_install() {                               
-  try make prefix=${D}/opt/gnome \
-	GNOME_sysconfdir=${D}/opt/gnome/etc \
-	GNOME_datadir=${D}/opt/gnome/share \
-	GNOMEDB_oafinfodir=${D}/opt/gnome/share/oaf \
-	install
-  dodoc AUTHORS COPYING ChangeLog README
-}
-
-
-
diff --git a/gnome-extra/gnome-db/gnome-db-0.2.10.ebuild b/gnome-extra/gnome-db/gnome-db-0.2.91-r1.ebuild
index 3701a918e34a..a109a003520e 100644
--- a/gnome-extra/gnome-db/gnome-db-0.2.10.ebuild
+++ b/gnome-extra/gnome-db/gnome-db-0.2.91-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
 # /home/cvsroot/gentoo-x86/gnome-office/gnome-db/gnome-db-0.2.3.ebuild,v 1.1 2001/04/29 16:17:43 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-db/gnome-db-0.2.10.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-db/gnome-db-0.2.91-r1.ebuild,v 1.1 2001/10/06 20:15:36 hallski Exp $
 
 
 A=${P}.tar.gz
@@ -12,29 +12,28 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}
 	 ftp://ftp.gnome-db.org/pub/gnome-db/sources/${PV}/${A}"
 HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml"
 
-DEPEND=">=gnome-base/bonobo-0.30
-	>=gnome-libs/libgda-0.2.10
-        >=gnome-base/gal-0.8
-        >=dev-util/xml-i18n-tools-0.8.4"
+RDEPEND=">=gnome-base/bonobo-1.0.9-r1
+	 >=gnome-extra/libgda-${PV}
+	 >=gnome-extra/gal-0.13-r1"
 
-RDEPEND=">=gnome-base/bonobo-0.30
-	>=gnome-libs/libgda-0.2.10"
+DEPEND="${RDEPEND}
+        >=dev-util/xml-i18n-tools-0.8.4"
 
 src_compile() {
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --sysconfdir=/etc					\
+        	    --disable-bonobotest
 
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome \
-        --datadir=/opt/gnome/share --disable-bonobotest
-  try pmake
+	emake || die
 }
 
 src_install() {                               
-  try make prefix=${D}/opt/gnome localedir=${D}/opt/gnome/share/local \
-	GNOME_sysconfdir=${D}/opt/gnome/etc \
-	GNOME_datadir=${D}/opt/gnome/share \
-	GNOMEDB_oafinfodir=${D}/opt/gnome/share/oaf \
-	install
-  dodoc AUTHORS COPYING ChangeLog README
-}
-
-
+	make prefix=${D}/usr localedir=${D}/usr/share/local 		\
+  	     GNOME_sysconfdir=${D}/etc 					\
+	     GNOME_datadir=${D}/usr/share 				\
+	     GNOMEDB_oafinfodir=${D}/usr/share/oaf 			\
+	     install || die
 
+	dodoc AUTHORS COPYING ChangeLog README
+}
diff --git a/gnome-extra/gnome-db/gnome-db-0.2.91.ebuild b/gnome-extra/gnome-db/gnome-db-0.2.91.ebuild
deleted file mode 100644
index effc9ae8adcc..000000000000
--- a/gnome-extra/gnome-db/gnome-db-0.2.91.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/gnome-office/gnome-db/gnome-db-0.2.3.ebuild,v 1.1 2001/04/29 16:17:43 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-db/gnome-db-0.2.91.ebuild,v 1.1 2001/10/05 22:33:42 azarah Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Framework for creating database applications"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}
-	 ftp://ftp.gnome-db.org/pub/gnome-db/sources/${PV}/${A}"
-HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml"
-
-DEPEND=">=gnome-base/bonobo-0.30
-	>=gnome-libs/libgda-${PV}
-        >=gnome-base/gal-0.8
-        >=dev-util/xml-i18n-tools-0.8.4"
-
-RDEPEND=">=gnome-base/bonobo-0.30
-	>=gnome-libs/libgda-${PV}"
-
-src_compile() {
-
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome \
-        --datadir=/opt/gnome/share --disable-bonobotest
-  try pmake
-}
-
-src_install() {                               
-  try make prefix=${D}/opt/gnome localedir=${D}/opt/gnome/share/local \
-	GNOME_sysconfdir=${D}/opt/gnome/etc \
-	GNOME_datadir=${D}/opt/gnome/share \
-	GNOMEDB_oafinfodir=${D}/opt/gnome/share/oaf \
-	install
-  dodoc AUTHORS COPYING ChangeLog README
-}
-
-
-
diff --git a/gnome-extra/gnome-pim/files/digest-gnome-pim-1.4.0 b/gnome-extra/gnome-pim/files/digest-gnome-pim-1.4.0-r1
index 2ef6f42f326d..2ef6f42f326d 100644
--- a/gnome-extra/gnome-pim/files/digest-gnome-pim-1.4.0
+++ b/gnome-extra/gnome-pim/files/digest-gnome-pim-1.4.0-r1
diff --git a/gnome-extra/gnome-pim/gnome-pim-1.4.0.ebuild b/gnome-extra/gnome-pim/gnome-pim-1.4.0-r1.ebuild
index e997d4e70a8d..32e647757aab 100644
--- a/gnome-extra/gnome-pim/gnome-pim-1.4.0.ebuild
+++ b/gnome-extra/gnome-pim/gnome-pim-1.4.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pim/gnome-pim-1.4.0.ebuild,v 1.3 2001/06/11 08:11:28 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pim/gnome-pim-1.4.0-r1.ebuild,v 1.1 2001/10/06 20:15:36 hallski Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,23 +9,28 @@ DESCRIPTION="gnome-pim"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-pim/"${A}
 HOMEPGAE="http://www.gnome.org/gnome-office/gnome-pim.shtml"
 
-DEPEND=">=gnome-base/gnome-core-1.4.0 nls? ( sys-devel/gettext )"
 RDEPEND=">=gnome-base/gnome-libs-1.2.13"
 
+DEPEND="${RDEPEND}
+	>=gnome-base/gnome-core-1.4.0
+	nls? ( sys-devel/gettext )"
+
 src_compile() {
-  local myconf
-  if [ -z "`use nls`" ] ; then
-    myconf="--disable-nls"
-  fi
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome $myconf
-  try pmake
-}
+	local myconf
 
-src_install() {
-  try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install
-  dodoc AUTHORS COPYING* ChangeLog NEWS
-  dodoc README*
-}
+	if [ -z "`use nls`" ] ; then
+		myconf="--disable-nls"
+	fi
 
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --sysconfdir=/etc $myconf || die
 
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
 
+	dodoc AUTHORS COPYING* ChangeLog NEWS README*
+}
diff --git a/gnome-extra/guppi/files/digest-guppi-0.35.5-r1 b/gnome-extra/guppi/files/digest-guppi-0.35.5-r1
deleted file mode 100644
index 8006822e0ff9..000000000000
--- a/gnome-extra/guppi/files/digest-guppi-0.35.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93ba14b9334e3838466446614149e2b4 Guppi-0.35.5.tar.gz
diff --git a/gnome-extra/guppi/files/digest-guppi-0.35.5 b/gnome-extra/guppi/files/digest-guppi-0.35.5-r2
index 8006822e0ff9..8006822e0ff9 100644
--- a/gnome-extra/guppi/files/digest-guppi-0.35.5
+++ b/gnome-extra/guppi/files/digest-guppi-0.35.5-r2
diff --git a/gnome-extra/guppi/guppi-0.35.5-r1.ebuild b/gnome-extra/guppi/guppi-0.35.5-r1.ebuild
deleted file mode 100644
index f29d6a03e407..000000000000
--- a/gnome-extra/guppi/guppi-0.35.5-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/gnome-office/gnumeric/gnumeric-0.64-r1.ebuild,v 1.1 2001/05/17 13:29:30 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/guppi/guppi-0.35.5-r1.ebuild,v 1.1 2001/09/14 01:12:24 hallski Exp $
-
-
-A=Guppi-${PV}.tar.gz
-S=${WORKDIR}/Guppi-${PV}
-DESCRIPTION="GNOME Plottin Tool"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/Guppi/${A}"
-HOMEPAGE="http://www.gnome.org/guppi/"
-
-DEPEND="nls? ( sys-devel/gettext )
-	>=dev-util/guile-1.4
-	>=gnome-office/gnumeric-0.65
-        >=dev-util/xml-i18n-tools-0.8.4
-	python? ( >=dev-lang/python-2.0 )
-	bonobo? ( >=gnome-base/bonobo-0.37 )"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11.0 
-	>=dev-util/guile-1.4
-        >=gnome-base/gnome-print-0.29
-	bonobo? ( >=gnome-base/bonobo-0.37 )"
-
-src_compile() {                           
-  local myconf
-
-  if [ "`use bonobo`" ]
-  then
-    myconf="--enable-bonobo"
-  else
-    myconf="--disable-bonobo"
-  fi
-
-  if [ "`use python`" ]
-  then
-    myconf="--enable-python"
-  else
-    myconf="--disable-python"
-  fi
-  if [ -z "`use nls`" ] ; then
-    myconf="$myconf --disable-nls"
-  fi
-  if [ -z "`use readline`" ] ; then
-    myconf="$myconf --disable-guile-readline"
-  fi
-
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --disable-gnumeric \
-	${myconf}
-
-  try make  # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {                               
-  try make prefix=${D}/opt/gnome PREFIX=${D}/usr install
-  dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-}
-
-
-
-
-
-
diff --git a/gnome-extra/guppi/guppi-0.35.5-r2.ebuild b/gnome-extra/guppi/guppi-0.35.5-r2.ebuild
new file mode 100644
index 000000000000..13b79d4a9e13
--- /dev/null
+++ b/gnome-extra/guppi/guppi-0.35.5-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# /home/cvsroot/gentoo-x86/gnome-office/gnumeric/gnumeric-0.64-r1.ebuild,v 1.1 2001/05/17 13:29:30 achim Exp
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/guppi/guppi-0.35.5-r2.ebuild,v 1.1 2001/10/06 20:15:36 hallski Exp $
+
+A=Guppi-${PV}.tar.gz
+S=${WORKDIR}/Guppi-${PV}
+DESCRIPTION="GNOME Plottin Tool"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/Guppi/${A}"
+HOMEPAGE="http://www.gnome.org/guppi/"
+
+RDEPEND=">=media-libs/gdk-pixbuf-0.11.0-r1
+	>=dev-util/guile-1.4
+        >=gnome-base/gnome-print-0.30
+	bonobo? ( >=gnome-base/bonobo-1.0.9-r1 )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=app-office/gnumeric-0.70-r2
+        >=dev-util/xml-i18n-tools-0.8.4
+	python? ( >=dev-lang/python-2.0 )"
+
+src_compile() {                           
+	local myconf
+
+	if [ "`use bonobo`" ]
+	then
+		myconf="--enable-bonobo"
+	else
+		myconf="--disable-bonobo"
+	fi
+
+	if [ "`use python`" ]
+	then
+		myconf="--enable-python"
+	else
+		myconf="--disable-python"
+	fi
+
+	if [ -z "`use nls`" ] ; then
+		myconf="$myconf --disable-nls"
+	fi
+
+	if [ -z "`use readline`" ] ; then
+		myconf="$myconf --disable-guile-readline"
+	fi
+
+	CFLAGS="${CFLAGS} `gnome-config --cflags libglade`"
+
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --disable-gnumeric 					\
+		    ${myconf} || die
+
+	make || die # Doesn't work with -j 4 (hallski)
+}
+
+src_install() {                               
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+}
diff --git a/gnome-extra/guppi/guppi-0.35.5.ebuild b/gnome-extra/guppi/guppi-0.35.5.ebuild
deleted file mode 100644
index c416e8fe551e..000000000000
--- a/gnome-extra/guppi/guppi-0.35.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/gnome-office/gnumeric/gnumeric-0.64-r1.ebuild,v 1.1 2001/05/17 13:29:30 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/guppi/guppi-0.35.5.ebuild,v 1.5 2001/08/31 03:23:39 pm Exp $
-
-
-A=Guppi-${PV}.tar.gz
-S=${WORKDIR}/Guppi-${PV}
-DESCRIPTION="GNOME Plottin Tool"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/Guppi/${A}"
-HOMEPAGE="http://www.gnome.org/guppi/"
-
-DEPEND="nls? ( sys-devel/gettext )
-	>=dev-util/guile-1.4
-	>=gnome-office/gnumeric-0.65
-        >=dev-util/xml-i18n-tools-0.8.4
-	python? ( >=dev-lang/python-2.0 )
-	bonobo? ( >=gnome-base/bonobo-0.37 )"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11.0 
-	>=dev-util/guile-1.4
-        >=gnome-base/gnome-print-0.29
-	bonobo? ( >=gnome-base/bonobo-0.37 )"
-
-src_compile() {                           
-  local myconf
-
-  if [ "`use bonobo`" ]
-  then
-    myconf="--enable-bonobo"
-  else
-    myconf="--disable-bonobo"
-  fi
-
-  if [ "`use python`" ]
-  then
-    myconf="--enable-python"
-  else
-    myconf="--disable-python"
-  fi
-  if [ -z "`use nls`" ] ; then
-    myconf="$myconf --disable-nls"
-  fi
-  if [ -z "`use readline`" ] ; then
-    myconf="$myconf --disable-guile-readline"
-  fi
-
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --enable-gnumeric \
-	${myconf}
-
-  try make  # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {                               
-  try make prefix=${D}/opt/gnome PREFIX=${D}/usr install
-  dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-}
-
-
-
-
-
-
diff --git a/gnome-office/abiword/abiword-0.7.14.ebuild b/gnome-office/abiword/abiword-0.7.14.ebuild
deleted file mode 100644
index 8aa78e5f8b06..000000000000
--- a/gnome-office/abiword/abiword-0.7.14.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/abiword/abiword-0.7.14.ebuild,v 1.5 2001/09/30 12:20:39 azarah Exp $
-
-A="abi-${PV}.tar.gz abidistfiles-${PV}.tar.gz expat-${PV}.tar.gz psiconv-${PV}.tar.gz
-   unixfonts-${PV}.tar.gz wv-${PV}.tar.gz"
-S=${WORKDIR}/abi
-DESCRIPTION="Framework for creating database applications"
-SRC_URI="http://www.abisource.com/downloads/Version-${PV}/abi-${PV}.tar.gz
-	 http://www.abisource.com/downloads/Version-${PV}/abidistfiles-${PV}.tar.gz
-	 http://www.abisource.com/downloads/Version-${PV}/expat-${PV}.tar.gz
-	 http://www.abisource.com/downloads/Version-${PV}/psiconv-${PV}.tar.gz
-	 http://www.abisource.com/downloads/Version-${PV}/unixfonts-${PV}.tar.gz
-	 http://www.abisource.com/downloads/Version-${PV}/wv-${PV}.tar.gz"
-
-
-HOMEPAGE="http://www.gnome.org/gnome-office/abiword.shtml/"
-
-DEPEND="virtual/glibc
-	>=sys-devel/gcc-2.95.2
-        =media-libs/freetype-1.3.1-r2
-	>=media-libs/libpng-1.0.7
-	>=x11-libs/gtk+-1.2.8
-        gnome? ( >=gnome-base/gnome-libs-1.2.10 >=gnome-base/libunicode-0.4
-                 >=gnome-base/bonobo-1.0.4 >=gnome-base/gal-0.8 )
-        spell? ( app-text/pspell-0.11.2 )
-	virtual/x11"
-
-
-  if [ "`use gnome`" ] ; then
-    myconf="ABI_OPT_GNOME=1 ABI_OPT_BONOBO=1 "
-  fi
-  if [ "`use spell`" ] ; then
-    myconf="$myconf ABI_OPT_PSPELL=1"
-  fi
-
-src_compile() {
-  if [ "`use spell`" ] ; then
-    cd ${S}/src/config
-    cp abi_defs.mk abi_defs.orig
-    sed -e "s:-lltdl::" abi_defs.orig >  abi_defs.mk
-  fi
-  cd ${S}
-
-  # Doesn't work with -j 4 (hallski)
-  try make prefix=/opt/gnome/ UNIX_CAN_BUILD_STATIC=0 $myconf OPTIMIZER="$CFLAGS"
-
-}
-
-src_install() {
-	#do you really need the OPTIMIZER var below? -- DR
-  try make prefix=${D}/opt/gnome  UNIX_CAN_BUILD_STATIC=0 $myconf OPTIMIZER="$CFLAGS" install
-  cp ${D}/opt/gnome/AbiSuite/bin/AbiWord AbiWord.orig
-  sed -e "s:${D}::" AbiWord.orig > ${D}/opt/gnome/AbiSuite/bin/AbiWord
-  cd ${D}/opt/gnome/bin
-  rm -f abiword
-  rm -f AbiWord
-  ln -s  ../AbiSuite/bin/AbiWord AbiWord
-  ln -s  ../AbiSuite/bin/AbiWord abiword
-  
-  # Install icon and .desktop for menu entry (hopefully this works for this version,
-  # as I have only tested it for 0.9.3
-  if [ "`use gnome`" ] ; then
-            insinto ${GNOME_PATH}/share/pixmaps
-            newins ${WORKDIR}/${P}/abidistfiles/icons/abiword_48.png AbiWord.png
-            insinto ${GNOME_PATH}/share/gnome/apps/Applications
-            doins ${FILESDIR}/AbiWord.desktop
-  fi
-  
-}
-
-
-
-
diff --git a/gnome-office/abiword/abiword-0.9.3.ebuild b/gnome-office/abiword/abiword-0.9.3.ebuild
deleted file mode 100644
index 8a9d80d956a3..000000000000
--- a/gnome-office/abiword/abiword-0.9.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/abiword/abiword-0.9.3.ebuild,v 1.3 2001/10/03 21:43:56 hallski Exp $
-
-S=${WORKDIR}/${P}/abi
-DESCRIPTION="Text processor"
-SRC_URI="http://prdownloads.sourceforge.net/abiword/abiword-0.9.3.tar.gz"
-
-HOMEPAGE="http://www.abisource.com"
-
-DEPEND="virtual/glibc
-	>=sys-devel/gcc-2.95.2
-        =media-libs/freetype-1.3.1-r2
-	>=media-libs/libpng-1.0.7
-	>=x11-libs/gtk+-1.2.8
-        gnome? ( >=gnome-base/gnome-libs-1.2.10
-		 >=gnome-base/libunicode-0.4
-                 >=gnome-base/bonobo-1.0.4
-		 >=gnome-base/gal-0.8 )
-        spell? ( >=app-text/pspell-0.11.2 )
-	virtual/x11"
-
-
-  if [ "`use gnome`" ] ; then
-    myconf="ABI_OPT_GNOME=1 ABI_OPT_BONOBO=1 "
-  fi
-  if [ "`use spell`" ] ; then
-    myconf="$myconf ABI_OPT_PSPELL=1"
-  fi
-
-src_compile() {
-
-  if [ "`use spell`" ] ; then
-    cd ${S}/src/config
-    cp abi_defs.mk abi_defs.orig
-    sed -e "s:-lltdl::" abi_defs.orig >  abi_defs.mk
-  fi
-  cd ${S}
-
-  # Doesn't work with -j 4 (hallski)
-  try make prefix=/opt/gnome/ UNIX_CAN_BUILD_STATIC=0 $myconf OPTIMIZER="$CFLAGS"
-
-}
-
-src_install() {
-	#do you really need the OPTIMIZER var below? -- DR
-  try make prefix=${D}/opt/gnome  UNIX_CAN_BUILD_STATIC=0 $myconf OPTIMIZER="$CFLAGS" install
-  cp ${D}/opt/gnome/AbiSuite/bin/AbiWord AbiWord.orig
-  sed -e "s:${D}::" AbiWord.orig > ${D}/opt/gnome/AbiSuite/bin/AbiWord
-  cd ${D}/opt/gnome/bin
-  rm -f abiword
-  rm -f AbiWord
-  ln -s  ../AbiSuite/bin/AbiWord AbiWord
-  ln -s  ../AbiSuite/bin/AbiWord abiword
-
-  # Install icon and .desktop for menu entry
-  if [ "`use gnome`" ] ; then
-  	insinto ${GNOME_PATH}/share/pixmaps
-  	newins ${WORKDIR}/${P}/abidistfiles/icons/abiword_48.png AbiWord.png
-	insinto ${GNOME_PATH}/share/gnome/apps/Applications
-	doins ${FILESDIR}/AbiWord.desktop
-  fi
-	
-}
-
-
-
-
diff --git a/gnome-office/abiword/files/AbiWord.desktop b/gnome-office/abiword/files/AbiWord.desktop
deleted file mode 100644
index 5260631463c4..000000000000
--- a/gnome-office/abiword/files/AbiWord.desktop
+++ /dev/null
@@ -1,53 +0,0 @@
-[Desktop Entry]
-Name=AbiWord
-Name[ca]=AbiWord
-Name[cs]=AbiWord
-Name[da]=AbiWord
-Name[de]=AbiWord
-Name[el]=AbiWord
-Name[es]=AbiWord
-Name[et]=AbiWord
-Name[fi]=AbiWord
-Name[fr]=AbiWord
-Name[ga]=AbiWord
-Name[gl]=AbiWord
-Name[hr]=AbiWord
-Name[hu]=AbiWord
-Name[it]=AbiWord
-Name[ja]=AbiWord
-Name[nl]=AbiWord
-Name[nn]=AbiWord
-Name[no]=AbiWord
-Name[pl]=AbiWord
-Name[pt_BR]=AbiWord
-Name[ru]=AbiWord
-Name[sk]=AbiWord
-Name[sv]=AbiWord
-Name[tr]=AbiWord
-Name[uk]=AbiWord
-Name[zh_CN.GB2312]=AbiWord
-Name[zh_TW.Big5]=AbiWord
-Comment=Word Processing for Everyone
-Comment[da]=
-Comment[de]=
-Comment[es]=
-Comment[et]=
-Comment[fr]=
-Comment[gl]=
-Comment[hu]=
-Comment[ja]=
-Comment[nl]=
-Comment[nn]=
-Comment[no]=
-Comment[pl]=
-Comment[pt]=
-Comment[pt_BR]=
-Comment[ru]=
-Comment[sk]=
-Comment[sv]=
-Comment[tr]=
-Comment[zh_CN.GB2312]=
-Exec=AbiWord
-Icon=AbiWord.png
-Terminal=0
-Type=Application
diff --git a/gnome-office/abiword/files/digest-abiword-0.7.14 b/gnome-office/abiword/files/digest-abiword-0.7.14
deleted file mode 100644
index 937aac2736cd..000000000000
--- a/gnome-office/abiword/files/digest-abiword-0.7.14
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 60902c1142c6a2cc136cef2fcc2ff925 abi-0.7.14.tar.gz
-MD5 c6585585cd9b3a4832f97bd71fcb81df abidistfiles-0.7.14.tar.gz
-MD5 1007c612a4a5ff992e7e9a138d1bd8df expat-0.7.14.tar.gz
-MD5 5e4eaf05c9cb3da5e1cc97f7e34ef009 psiconv-0.7.14.tar.gz
-MD5 f8644723b7077a95736d6df24598aef4 unixfonts-0.7.14.tar.gz
-MD5 3a4b9b91a6620cbbc788e077b06cfb65 wv-0.7.14.tar.gz
diff --git a/gnome-office/abiword/files/digest-abiword-0.9.3 b/gnome-office/abiword/files/digest-abiword-0.9.3
deleted file mode 100644
index 6bd0ee14e392..000000000000
--- a/gnome-office/abiword/files/digest-abiword-0.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20a9a7a8a2e8f15219eb6db0a3ec8727 abiword-0.9.3.tar.gz
diff --git a/gnome-office/dia/dia-0.88.1.ebuild b/gnome-office/dia/dia-0.88.1.ebuild
deleted file mode 100644
index 2c567afd125d..000000000000
--- a/gnome-office/dia/dia-0.88.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/dia/dia-0.88.1.ebuild,v 1.6 2001/07/29 11:02:25 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Diagram Creation Program"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
-HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml"
-
-DEPEND=">=gnome-base/libxml-1.8.13 nls? ( sys-devel/gettext )
-        >=media-libs/gdk-pixbuf-0.11.0
-        >=dev-libs/popt-1.5
-	bonobo? ( >=gnome-base/bonobo-1.0.4 )
-	python? ( dev-lang/python-2.0 )"
-
-RDEPEND=">=gnome-base/libxml-1.8.13
-        >=media-libs/gdk-pixbuf-0.11.0
-        >=dev-libs/popt-1.5
-	bonobo? ( >=gnome-base/bonobo-1.0.4 )"
-
-src_compile() {
-
-    local myconf
-    local myprefix
-    myprefix="--prefix=/usr/X11R6 --sysconfdir=/etc/X11"
-    if [ "`use gnome`" ] ; then
-        myconf="--enable-gnome"
-        myprefix="--prefix=/opt/gnome --sysconfdir=/etc/opt/gnome"
-    else
-        myconf=""
-    fi
-
-    if [ "`use bonobo`" ]; then
-      myconf="--enable-gnome --enable-bonobo"
-    fi
-#    if [ "`use python`" ] ; then
-#      myconf="$myconf --with-python"
-#    fi
-    if [ -z "`use nls`" ] ; then
-        myconf="$myconf --disable-nls"
-    fi
-    try ./configure --host=${CHOST} ${myprefix} ${myconf}
-        # enable-gnome-print not recoomended
-    try pmake
-
-}
-
-src_install () {
-    myprefix="prefix=${D}/usr/X11R6 sysconfdir=${D}/etc/X11"
-    if [ "`use gnome`" ] ; then
-        myconf="--enable-gnome"
-        myprefix="prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome"
-    fi
-    try make $myprefix install
-    dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS
-
-}
-
-
-
-
-
diff --git a/gnome-office/dia/files/digest-dia-0.88.1 b/gnome-office/dia/files/digest-dia-0.88.1
deleted file mode 100644
index 77311d467dc7..000000000000
--- a/gnome-office/dia/files/digest-dia-0.88.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 66a8017a9a93efe08c658f0a29838724 dia-0.88.1.tar.gz
diff --git a/gnome-office/eog/eog-0.6.ebuild b/gnome-office/eog/eog-0.6.ebuild
deleted file mode 100644
index a6cafca17931..000000000000
--- a/gnome-office/eog/eog-0.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/eog/eog-0.6.ebuild,v 1.4 2001/06/11 08:11:28 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Eye of GNOME"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/eog/"${A}
-HOMEPAGE="http://www.gnome.org/gnome-office/eog.shtml"
-
-DEPEND="virtual/glibc nls? ( sys-devel/gettext )
-        >=gnome-base/bonobo-1.0.4
-        >=gnome-base/gconf-1.0.1
-        >=dev-util/xml-i18n-tools-0.8.4"
-
-RDEPEND="virtual/glibc
-        >=gnome-base/gconf-1.0.1
-        >=gnome-base/bonobo-1.0.4"
-
-src_compile() {
-  local myconf
-  if [ -z "`use nls`" ] ; then
-    myconf="--disable-nls"
-  fi
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome $myconf
-  try pmake
-}
-
-src_install() {
-  try make prefix=${D}/opt/gnome sysconfdir=/etc/opt/gnome \
-	GCONG_CONFIG_SOURCE=xml=${D}/etc/opt/gnome/gconf/gconf.xml.defaults install
-  dodoc AUTHORS COPYING DEPENDS ChangeLog HACKING NEWS README TODO MAINTAINERS
-
-}
-
-
-
-
-
-
-
diff --git a/gnome-office/eog/files/digest-eog-0.6 b/gnome-office/eog/files/digest-eog-0.6
deleted file mode 100644
index 15bafa69aa84..000000000000
--- a/gnome-office/eog/files/digest-eog-0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e843959ff17f847e27a3219ac6cafcc7 eog-0.6.tar.gz
diff --git a/gnome-office/gnome-db/files/digest-gnome-db-0.2.10 b/gnome-office/gnome-db/files/digest-gnome-db-0.2.10
deleted file mode 100644
index 8a29827f2f1e..000000000000
--- a/gnome-office/gnome-db/files/digest-gnome-db-0.2.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f3a0480659ce671961909714a74ea4bf gnome-db-0.2.10.tar.gz
diff --git a/gnome-office/gnome-db/files/digest-gnome-db-0.2.9 b/gnome-office/gnome-db/files/digest-gnome-db-0.2.9
deleted file mode 100644
index e5856d5f798e..000000000000
--- a/gnome-office/gnome-db/files/digest-gnome-db-0.2.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 44eebf935cf0a716e9f75e3551e59a2b gnome-db-0.2.9.tar.gz
diff --git a/gnome-office/gnome-db/files/digest-gnome-db-0.2.91 b/gnome-office/gnome-db/files/digest-gnome-db-0.2.91
deleted file mode 100644
index c124a34fc3c2..000000000000
--- a/gnome-office/gnome-db/files/digest-gnome-db-0.2.91
+++ /dev/null
@@ -1 +0,0 @@
-MD5 02d1f1036b664c13996b172a0f87bc8e gnome-db-0.2.91.tar.gz
diff --git a/gnome-office/gnome-db/gnome-db-0.2.10.ebuild b/gnome-office/gnome-db/gnome-db-0.2.10.ebuild
deleted file mode 100644
index 6b5a447d5f5d..000000000000
--- a/gnome-office/gnome-db/gnome-db-0.2.10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/gnome-office/gnome-db/gnome-db-0.2.3.ebuild,v 1.1 2001/04/29 16:17:43 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/gnome-db/gnome-db-0.2.10.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Framework for creating database applications"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}
-	 ftp://ftp.gnome-db.org/pub/gnome-db/sources/${PV}/${A}"
-HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml"
-
-DEPEND=">=gnome-base/bonobo-0.30
-	>=gnome-libs/libgda-0.2.10
-        >=gnome-base/gal-0.8
-        >=dev-util/xml-i18n-tools-0.8.4"
-
-RDEPEND=">=gnome-base/bonobo-0.30
-	>=gnome-libs/libgda-0.2.10"
-
-src_compile() {
-
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome \
-        --datadir=/opt/gnome/share --disable-bonobotest
-  try pmake
-}
-
-src_install() {                               
-  try make prefix=${D}/opt/gnome localedir=${D}/opt/gnome/share/local \
-	GNOME_sysconfdir=${D}/opt/gnome/etc \
-	GNOME_datadir=${D}/opt/gnome/share \
-	GNOMEDB_oafinfodir=${D}/opt/gnome/share/oaf \
-	install
-  dodoc AUTHORS COPYING ChangeLog README
-}
-
-
-
diff --git a/gnome-office/gnome-db/gnome-db-0.2.9.ebuild b/gnome-office/gnome-db/gnome-db-0.2.9.ebuild
deleted file mode 100644
index 04e53cf89440..000000000000
--- a/gnome-office/gnome-db/gnome-db-0.2.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/gnome-office/gnome-db/gnome-db-0.2.3.ebuild,v 1.1 2001/04/29 16:17:43 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/gnome-db/gnome-db-0.2.9.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Framework for creating database applications"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
-HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml"
-
-DEPEND=">=gnome-base/bonobo-0.30
-	>=gnome-libs/libgda-0.2.3
-        >=gnome-base/gal-0.8
-        >=dev-util/xml-i18n-tools-0.8.4"
-
-RDEPEND=">=gnome-base/bonobo-0.30
-	>=gnome-libs/libgda-0.2.3"
-
-src_compile() {
-
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome \
-        --datadir=/opt/gnome/share --disable-bonobotest
-  try pmake
-}
-
-src_install() {                               
-  try make prefix=${D}/opt/gnome \
-	GNOME_sysconfdir=${D}/opt/gnome/etc \
-	GNOME_datadir=${D}/opt/gnome/share \
-	GNOMEDB_oafinfodir=${D}/opt/gnome/share/oaf \
-	install
-  dodoc AUTHORS COPYING ChangeLog README
-}
-
-
-
diff --git a/gnome-office/gnome-db/gnome-db-0.2.91.ebuild b/gnome-office/gnome-db/gnome-db-0.2.91.ebuild
deleted file mode 100644
index 3f1a5cf34d08..000000000000
--- a/gnome-office/gnome-db/gnome-db-0.2.91.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/gnome-office/gnome-db/gnome-db-0.2.3.ebuild,v 1.1 2001/04/29 16:17:43 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/gnome-db/gnome-db-0.2.91.ebuild,v 1.1 2001/10/05 22:33:42 azarah Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Framework for creating database applications"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}
-	 ftp://ftp.gnome-db.org/pub/gnome-db/sources/${PV}/${A}"
-HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml"
-
-DEPEND=">=gnome-base/bonobo-0.30
-	>=gnome-libs/libgda-${PV}
-        >=gnome-base/gal-0.8
-        >=dev-util/xml-i18n-tools-0.8.4"
-
-RDEPEND=">=gnome-base/bonobo-0.30
-	>=gnome-libs/libgda-${PV}"
-
-src_compile() {
-
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome \
-        --datadir=/opt/gnome/share --disable-bonobotest
-  try pmake
-}
-
-src_install() {                               
-  try make prefix=${D}/opt/gnome localedir=${D}/opt/gnome/share/local \
-	GNOME_sysconfdir=${D}/opt/gnome/etc \
-	GNOME_datadir=${D}/opt/gnome/share \
-	GNOMEDB_oafinfodir=${D}/opt/gnome/share/oaf \
-	install
-  dodoc AUTHORS COPYING ChangeLog README
-}
-
-
-
diff --git a/gnome-office/gnome-pim/files/digest-gnome-pim-1.4.0 b/gnome-office/gnome-pim/files/digest-gnome-pim-1.4.0
deleted file mode 100644
index 2ef6f42f326d..000000000000
--- a/gnome-office/gnome-pim/files/digest-gnome-pim-1.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 177daf8b1e15be906fb41dca94a00e76 gnome-pim-1.4.0.tar.gz
diff --git a/gnome-office/gnome-pim/gnome-pim-1.4.0.ebuild b/gnome-office/gnome-pim/gnome-pim-1.4.0.ebuild
deleted file mode 100644
index 64e0c1120842..000000000000
--- a/gnome-office/gnome-pim/gnome-pim-1.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/gnome-pim/gnome-pim-1.4.0.ebuild,v 1.3 2001/06/11 08:11:28 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="gnome-pim"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-pim/"${A}
-HOMEPGAE="http://www.gnome.org/gnome-office/gnome-pim.shtml"
-
-DEPEND=">=gnome-base/gnome-core-1.4.0 nls? ( sys-devel/gettext )"
-RDEPEND=">=gnome-base/gnome-libs-1.2.13"
-
-src_compile() {
-  local myconf
-  if [ -z "`use nls`" ] ; then
-    myconf="--disable-nls"
-  fi
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome $myconf
-  try pmake
-}
-
-src_install() {
-  try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install
-  dodoc AUTHORS COPYING* ChangeLog NEWS
-  dodoc README*
-}
-
-
-
diff --git a/gnome-office/gnumeric/files/digest-gnumeric-0.70-r1 b/gnome-office/gnumeric/files/digest-gnumeric-0.70-r1
deleted file mode 100644
index efb6fbb20ba7..000000000000
--- a/gnome-office/gnumeric/files/digest-gnumeric-0.70-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f81b8457da205282fe074bf4890ddefd gnumeric-0.70.tar.gz
diff --git a/gnome-office/gnumeric/files/gnumeric-0.70-gdk-gc-ref.patch b/gnome-office/gnumeric/files/gnumeric-0.70-gdk-gc-ref.patch
deleted file mode 100644
index 38dbb19f6a8b..000000000000
--- a/gnome-office/gnumeric/files/gnumeric-0.70-gdk-gc-ref.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Index: src/item-bar.c
-===================================================================
-RCS file: /cvs/gnome/gnumeric/src/item-bar.c,v
-retrieving revision 1.139
-retrieving revision 1.142
-diff -u -r1.139 -r1.142
---- src/item-bar.c	2001/08/20 21:51:35	1.139
-+++ src/item-bar.c	2001/08/24 07:37:25	1.142
-@@ -37,7 +37,7 @@
- 	GnomeCanvasItem  canvas_item;
- 
- 	GnumericCanvas   *gcanvas;
--	GdkGC           *gc, *lines, *shade; /* Draw gc */
-+	GdkGC           *text_gc, *lines, *shade;
- 	GdkCursor       *normal_cursor;
- 	GdkCursor       *change_cursor;
- 	StyleFont	*normal_font, *bold_font;
-@@ -156,7 +156,8 @@
- {
- 	ItemBar *ib;
- 	GdkWindow *window;
--	GdkGC *gc;
-+	GtkStyle *style;
-+	GtkWidget *button;
- 
- 	if (GNOME_CANVAS_ITEM_CLASS (item_bar_parent_class)->realize)
- 		(*GNOME_CANVAS_ITEM_CLASS (item_bar_parent_class)->realize)(item);
-@@ -164,23 +165,21 @@
- 	ib = ITEM_BAR (item);
- 	window = GTK_WIDGET (item->canvas)->window;
- 
--	/* Configure our gc */
--	ib->gc = gc = gdk_gc_new (window);
--	{
--		GtkWidget *w = gtk_button_new ();
--		GtkStyle *style;
--		gtk_widget_ensure_style (w);
-+	button = gtk_button_new ();
- 
--		style = gtk_widget_get_style (w);
--		gdk_gc_set_foreground (ib->gc, &style->text[GTK_STATE_NORMAL]);
-+	/* Configure our gc */
-+	gtk_widget_ensure_style (button);
-+	style = gtk_widget_get_style (button);
- 
--		ib->shade = gdk_gc_ref (style->dark_gc[GTK_STATE_NORMAL]);
--		gtk_widget_destroy (w);
--	}
-+	ib->text_gc = gdk_gc_new (window);
-+	gdk_gc_set_foreground (ib->text_gc, &style->text[GTK_STATE_NORMAL]);
-+	ib->shade = gdk_gc_new (window);
-+	gdk_gc_set_foreground (ib->shade, &style->dark[GTK_STATE_NORMAL]);
- 	ib->lines = gdk_gc_new (window);
--	gdk_gc_copy (ib->lines, gc);
-+	gdk_gc_copy (ib->lines, ib->text_gc);
- 	gdk_gc_set_line_attributes (ib->lines, 2, GDK_LINE_SOLID,
- 				    GDK_CAP_NOT_LAST, GDK_JOIN_MITER);
-+	gtk_widget_destroy (button);
- 
- 	ib->normal_cursor = gdk_cursor_new (GDK_ARROW);
- 	if (ib->is_col_header)
-@@ -195,7 +194,7 @@
- {
- 	ItemBar *ib = ITEM_BAR (item);
- 
--	gdk_gc_unref (ib->gc);
-+	gdk_gc_unref (ib->text_gc);
- 	gdk_gc_unref (ib->lines);
- 	gdk_gc_unref (ib->shade);
- 	gdk_cursor_destroy (ib->change_cursor);
-@@ -243,8 +242,8 @@
- 			    rect->x + 1, rect->y + 1, rect->width-2, rect->height-2);
- 	gtk_draw_shadow (canvas->style, drawable, GTK_STATE_NORMAL, shadow,
- 			 rect->x, rect->y, rect->width, rect->height);
--	gdk_gc_set_clip_rectangle (ib->gc, rect);
--	gdk_draw_string (drawable, font, ib->gc,
-+	gdk_gc_set_clip_rectangle (ib->text_gc, rect);
-+	gdk_draw_string (drawable, font, ib->text_gc,
- 			 rect->x + (rect->width - len) / 2,
- 			 rect->y + (rect->height - texth) / 2 + font->ascent + 1,
- 			 str);
diff --git a/gnome-office/gnumeric/gnumeric-0.70-r1.ebuild b/gnome-office/gnumeric/gnumeric-0.70-r1.ebuild
deleted file mode 100644
index 42241b1f0b2f..000000000000
--- a/gnome-office/gnumeric/gnumeric-0.70-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/gnome-office/gnumeric/gnumeric-0.66.ebuild,v 1.1 2001/06/28 09:47:57 hallski Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/gnumeric/gnumeric-0.70-r1.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="gnumeric"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnumeric/"${A}
-HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
-
-DEPEND=">=gnome-base/gnome-print-0.29
-        >=gnome-base/gal-0.8.0
-        >=gnome-base/libxml-1.8.14
-	>=gnome-libs/libole2-0.2.3
-        >=dev-util/xml-i18n-tools-0.8.4
-        perl? ( >=sys-devel/perl-5 )
-	python? ( >=dev-lang/python-2.0 )
-        gb? ( >=gnome-libs/gb-0.0.19 )
-        libgda? ( >=gnome-libs/libgda-0.2.9 )
-        nls? ( sys-devel/gettext )
-	bonobo? ( >=gnome-base/bonobo-1.0 )"
-
-RDEPEND=">=gnome-base/gnome-print-0.29
-        >=gnome-base/gal-0.8.0
-        gb? ( >=gnome-libs/gb-0.0.19 )
-        libgda? ( >=gnome-libs/libgda-0.2.9 )
-	bonobo? ( >=gnome-base/bonobo-1.0 ) "
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	
-	patch -p0 < ${FILESDIR}/${P}-gdk-gc-ref.patch
-#	cp configure configure.orig
-#	sed -e 's:"%d,:"%d",:' configure.orig > configure
-}
-
-src_compile() {
-	local myconf
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-	if [ -z "`use bonobo`" ] ; then
-		myconf="$myconf --without-bonobo"
-  	fi
-  	if [ "`use gb`" ]; then
-    		#does not work atm
-    		myconf="$myconf --without-gb"
-  	else
-    		myconf="$myconf --without-gb"
-  	fi
-  	if [ "`use perl`" ]; then
-    		myconf="$myconf --with-perl"
-  	else
-    		myconf="$myconf --without-perl"
-  	fi
-  	if [ "`use python`" ]; then
-    		myconf="$myconf --with-python"
-  	else
-    		myconf="$myconf --without-python"
-  	fi
-  	if [ "`use libgda`" ]; then
-    		myconf="$myconf --with-gda"
-  	else
-    		myconf="$myconf --without-gda"
-  	fi
-
-  	try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome --without-evolution ${myconf} 
-
-	emake || die "Building of package failed."
-}
-
-src_install() {
-  	make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome PREFIX=${D}/usr install || die
-  	dodoc AUTHORS COPYING *ChangeLog HACKING NEWS README TODO
-
-}
-
-
-
-
-
-
diff --git a/gnome-office/guppi/files/digest-guppi-0.35.5 b/gnome-office/guppi/files/digest-guppi-0.35.5
deleted file mode 100644
index 8006822e0ff9..000000000000
--- a/gnome-office/guppi/files/digest-guppi-0.35.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93ba14b9334e3838466446614149e2b4 Guppi-0.35.5.tar.gz
diff --git a/gnome-office/guppi/files/digest-guppi-0.35.5-r1 b/gnome-office/guppi/files/digest-guppi-0.35.5-r1
deleted file mode 100644
index 8006822e0ff9..000000000000
--- a/gnome-office/guppi/files/digest-guppi-0.35.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93ba14b9334e3838466446614149e2b4 Guppi-0.35.5.tar.gz
diff --git a/gnome-office/guppi/guppi-0.35.5-r1.ebuild b/gnome-office/guppi/guppi-0.35.5-r1.ebuild
deleted file mode 100644
index 9ac22ff4d086..000000000000
--- a/gnome-office/guppi/guppi-0.35.5-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/gnome-office/gnumeric/gnumeric-0.64-r1.ebuild,v 1.1 2001/05/17 13:29:30 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/guppi/guppi-0.35.5-r1.ebuild,v 1.1 2001/09/14 01:12:24 hallski Exp $
-
-
-A=Guppi-${PV}.tar.gz
-S=${WORKDIR}/Guppi-${PV}
-DESCRIPTION="GNOME Plottin Tool"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/Guppi/${A}"
-HOMEPAGE="http://www.gnome.org/guppi/"
-
-DEPEND="nls? ( sys-devel/gettext )
-	>=dev-util/guile-1.4
-	>=gnome-office/gnumeric-0.65
-        >=dev-util/xml-i18n-tools-0.8.4
-	python? ( >=dev-lang/python-2.0 )
-	bonobo? ( >=gnome-base/bonobo-0.37 )"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11.0 
-	>=dev-util/guile-1.4
-        >=gnome-base/gnome-print-0.29
-	bonobo? ( >=gnome-base/bonobo-0.37 )"
-
-src_compile() {                           
-  local myconf
-
-  if [ "`use bonobo`" ]
-  then
-    myconf="--enable-bonobo"
-  else
-    myconf="--disable-bonobo"
-  fi
-
-  if [ "`use python`" ]
-  then
-    myconf="--enable-python"
-  else
-    myconf="--disable-python"
-  fi
-  if [ -z "`use nls`" ] ; then
-    myconf="$myconf --disable-nls"
-  fi
-  if [ -z "`use readline`" ] ; then
-    myconf="$myconf --disable-guile-readline"
-  fi
-
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --disable-gnumeric \
-	${myconf}
-
-  try make  # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {                               
-  try make prefix=${D}/opt/gnome PREFIX=${D}/usr install
-  dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-}
-
-
-
-
-
-
diff --git a/gnome-office/guppi/guppi-0.35.5.ebuild b/gnome-office/guppi/guppi-0.35.5.ebuild
deleted file mode 100644
index dd7710822cfd..000000000000
--- a/gnome-office/guppi/guppi-0.35.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/gnome-office/gnumeric/gnumeric-0.64-r1.ebuild,v 1.1 2001/05/17 13:29:30 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/guppi/guppi-0.35.5.ebuild,v 1.5 2001/08/31 03:23:39 pm Exp $
-
-
-A=Guppi-${PV}.tar.gz
-S=${WORKDIR}/Guppi-${PV}
-DESCRIPTION="GNOME Plottin Tool"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/Guppi/${A}"
-HOMEPAGE="http://www.gnome.org/guppi/"
-
-DEPEND="nls? ( sys-devel/gettext )
-	>=dev-util/guile-1.4
-	>=gnome-office/gnumeric-0.65
-        >=dev-util/xml-i18n-tools-0.8.4
-	python? ( >=dev-lang/python-2.0 )
-	bonobo? ( >=gnome-base/bonobo-0.37 )"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11.0 
-	>=dev-util/guile-1.4
-        >=gnome-base/gnome-print-0.29
-	bonobo? ( >=gnome-base/bonobo-0.37 )"
-
-src_compile() {                           
-  local myconf
-
-  if [ "`use bonobo`" ]
-  then
-    myconf="--enable-bonobo"
-  else
-    myconf="--disable-bonobo"
-  fi
-
-  if [ "`use python`" ]
-  then
-    myconf="--enable-python"
-  else
-    myconf="--disable-python"
-  fi
-  if [ -z "`use nls`" ] ; then
-    myconf="$myconf --disable-nls"
-  fi
-  if [ -z "`use readline`" ] ; then
-    myconf="$myconf --disable-guile-readline"
-  fi
-
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --enable-gnumeric \
-	${myconf}
-
-  try make  # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {                               
-  try make prefix=${D}/opt/gnome PREFIX=${D}/usr install
-  dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-}
-
-
-
-
-
-
diff --git a/gnome-office/mrproject/files/digest-mrproject-0.3.1 b/gnome-office/mrproject/files/digest-mrproject-0.3.1
deleted file mode 100644
index f6f7f5bc93a3..000000000000
--- a/gnome-office/mrproject/files/digest-mrproject-0.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 72fb2bfdf3f0c781e713cc8bbc3bf276 mrproject-0.3.1.tar.gz
diff --git a/gnome-office/mrproject/files/digest-mrproject-0.3.2 b/gnome-office/mrproject/files/digest-mrproject-0.3.2
deleted file mode 100644
index cf6fdb342b7a..000000000000
--- a/gnome-office/mrproject/files/digest-mrproject-0.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 86ec49153ebf5cc699f6335d627f6080 mrproject-0.3.2.tar.gz
diff --git a/gnome-office/mrproject/files/digest-mrproject-0.4.0 b/gnome-office/mrproject/files/digest-mrproject-0.4.0
deleted file mode 100644
index 6363e2df2b11..000000000000
--- a/gnome-office/mrproject/files/digest-mrproject-0.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 758bc531c78f420674abe4da5d8eaa25 mrproject-0.4.0.tar.gz
diff --git a/gnome-office/mrproject/mrproject-0.3.1.ebuild b/gnome-office/mrproject/mrproject-0.3.1.ebuild
deleted file mode 100644
index cc629bba3954..000000000000
--- a/gnome-office/mrproject/mrproject-0.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/mrproject/mrproject-0.3.1.ebuild,v 1.2 2001/07/29 10:29:28 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Project management application for GNOME"
-SRC_URI="ftp://ftp.codefactory.se/pub/software/mrproject/source/${A}"
-HOMEPAGE="http://mrproject.codefactory.se/"
-
-DEPEND="nls? ( sys-devel/gettext )
-        >=gnome-base/gal-0.7
-	>=gnome-base/bonobo-1.0.0
-	>=dev-util/xml-i18n-tools-0.8.4
-	>=media-libs/gdk-pixbuf-0.8.0
-	>=gnome-base/libglade-0.14
-	>=gnome-base/libxml-1.8.10
-	>=gnome-base/gnome-vfs-1.0.0
-	>=gnome-base/oaf-0.6.5
-	>=gnome-base/gnome-print-0.25"
-
-src_compile() {
-    local myconf
-    if [ -z "`use nls`" ] ; then
-      myconf="--disable-nls"
-    fi
-    try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--sysconfdir=/etc/opt/gnome --disable-more-warnings $myconf
-    try pmake
-
-}
-
-src_install () {
-
-#    try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-
-}
-
-
-
-
-
diff --git a/gnome-office/mrproject/mrproject-0.3.2.ebuild b/gnome-office/mrproject/mrproject-0.3.2.ebuild
deleted file mode 100644
index b787ed942e10..000000000000
--- a/gnome-office/mrproject/mrproject-0.3.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/mrproject/mrproject-0.3.2.ebuild,v 1.2 2001/07/29 10:29:28 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Project management application for GNOME"
-SRC_URI="ftp://ftp.codefactory.se/pub/software/mrproject/source/${A}"
-HOMEPAGE="http://mrproject.codefactory.se/"
-
-DEPEND="nls? ( sys-devel/gettext )
-        >=gnome-base/gal-0.7
-	>=gnome-base/bonobo-1.0.0
-	>=dev-util/xml-i18n-tools-0.8.4
-	>=media-libs/gdk-pixbuf-0.8.0
-	>=gnome-base/libglade-0.14
-	>=gnome-base/libxml-1.8.10
-	>=gnome-base/gnome-vfs-1.0.0
-	>=gnome-base/oaf-0.6.5
-	>=gnome-base/gnome-print-0.25"
-
-src_compile() {
-    local myconf
-    if [ -z "`use nls`" ] ; then
-      myconf="--disable-nls"
-    fi
-    try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--sysconfdir=/etc/opt/gnome --disable-more-warnings $myconf
-    try pmake
-
-}
-
-src_install () {
-
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-
-}
-
-
-
-
-
diff --git a/gnome-office/mrproject/mrproject-0.4.0.ebuild b/gnome-office/mrproject/mrproject-0.4.0.ebuild
deleted file mode 100644
index 8fc4a65d8b2d..000000000000
--- a/gnome-office/mrproject/mrproject-0.4.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/mrproject/mrproject-0.4.0.ebuild,v 1.2 2001/09/28 11:08:45 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Project management application for GNOME"
-SRC_URI="ftp://ftp.codefactory.se/pub/software/mrproject/source/${A}"
-HOMEPAGE="http://mrproject.codefactory.se/"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.8.0
-	 >=gnome-base/ORBit-0.5.7
-         >=gnome-base/gal-0.12
-	 >=gnome-base/bonobo-1.0.7
-	 >=gnome-base/libglade-0.14
-	 >=gnome-base/libxml-1.8.14
-	 >=gnome-base/gconf-1.0.4
-	 >=gnome-base/gnome-vfs-1.0.0
-	 >=gnome-base/oaf-0.6.5
-	 >=gnome-base/gnome-print-0.25"
-
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	>=dev-util/xml-i18n-tools-0.8.4"
-
-
-src_compile() {
-    local myconf
-    if [ -z "`use nls`" ] ; then
-      myconf="--disable-nls"
-    fi
-    try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--sysconfdir=/etc/opt/gnome --disable-more-warnings \
-	--without-python $myconf
-    try pmake
-
-}
-
-src_install () {
-
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-
-}
-
-
-
-
-
diff --git a/gnome-office/sodipodi/files/digest-sodipodi-0.23 b/gnome-office/sodipodi/files/digest-sodipodi-0.23
deleted file mode 100644
index 94a1916488b3..000000000000
--- a/gnome-office/sodipodi/files/digest-sodipodi-0.23
+++ /dev/null
@@ -1 +0,0 @@
-MD5 947dcc478cb871b36da72b5938c466df sodipodi-0.23.tar.gz
diff --git a/gnome-office/sodipodi/files/digest-sodipodi-0.24 b/gnome-office/sodipodi/files/digest-sodipodi-0.24
deleted file mode 100644
index 202bc6c8378d..000000000000
--- a/gnome-office/sodipodi/files/digest-sodipodi-0.24
+++ /dev/null
@@ -1 +0,0 @@
-MD5 87cbb29d00a5ad2c9ec84a45bf5c0431 sodipodi-0.24.tar.gz
diff --git a/gnome-office/sodipodi/files/digest-sodipodi-0.24.1 b/gnome-office/sodipodi/files/digest-sodipodi-0.24.1
deleted file mode 100644
index c6da38096595..000000000000
--- a/gnome-office/sodipodi/files/digest-sodipodi-0.24.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1bb1c07993e6cee32ae2b2d8c39b9b40 sodipodi-0.24.1.tar.gz
diff --git a/gnome-office/sodipodi/sodipodi-0.23.ebuild b/gnome-office/sodipodi/sodipodi-0.23.ebuild
deleted file mode 100644
index 0f979acf23f7..000000000000
--- a/gnome-office/sodipodi/sodipodi-0.23.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/sodipodi/sodipodi-0.23.ebuild,v 1.5 2001/09/25 05:28:03 hallski Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Vector illustrating application for GNOME"
-SRC_URI="http://prdownloads.sourceforge.net/${PN}/${A}"
-HOMEPAGE="http://sodipodi.sourceforge.net/"
-
-DEPEND=">=gnome-base/gnome-print-0.21 
-	nls? ( sys-devel/gettext )
-	>=gnome-base/gal-0.4
-	bonobo? ( >=gnome-base/bonobo-0.37 )"
-
-src_compile() {
-
-    local myconf
-    if [ "`use bonobo`" ]
-    then
-      myconf="--with-bonobo"
-    else
-      myconf="--without-bonobo"
-    fi
-    if [ -z "`use nls`" ] ; then
-      myconf="$myconf --disable-nls"
-    fi
-    try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--sysconfdir=/etc/opt/gnome \
-	--enable-gnome --enable-gnome-print ${myconf}
-    try pmake
-
-}
-
-src_install () {
-
-    try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install
-    dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-
-}
-
-
-
-
-
diff --git a/gnome-office/sodipodi/sodipodi-0.24.1.ebuild b/gnome-office/sodipodi/sodipodi-0.24.1.ebuild
deleted file mode 100644
index 46a026fe3548..000000000000
--- a/gnome-office/sodipodi/sodipodi-0.24.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/sodipodi/sodipodi-0.24.1.ebuild,v 1.1 2001/10/05 08:15:53 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Vector illustrating application for GNOME"
-SRC_URI="http://prdownloads.sourceforge.net/${PN}/${A}"
-HOMEPAGE="http://sodipodi.sourceforge.net/"
-
-RDEPEND=">=gnome-base/gnome-print-0.21 
-         >=gnome-base/gal-0.4
-	 bonobo? ( >=gnome-base/bonobo-0.37 )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-
-	if [ "`use bonobo`" ] ; then
-		myconf="--with-bonobo"
-	else
-		myconf="--without-bonobo"
-	fi
-
-	if [ -z "`use nls`" ] ; then
-		myconf="$myconf --disable-nls"
-	fi
-
-	./configure --host=${CHOST} --prefix=/opt/gnome 		\
-	            --sysconfdir=/etc/opt/gnome 			\
-		    --enable-gnome --enable-gnome-print ${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-}
diff --git a/gnome-office/sodipodi/sodipodi-0.24.ebuild b/gnome-office/sodipodi/sodipodi-0.24.ebuild
deleted file mode 100644
index f523f6d485b1..000000000000
--- a/gnome-office/sodipodi/sodipodi-0.24.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/sodipodi/sodipodi-0.24.ebuild,v 1.1 2001/09/28 13:26:12 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Vector illustrating application for GNOME"
-SRC_URI="http://prdownloads.sourceforge.net/${PN}/${A}"
-HOMEPAGE="http://sodipodi.sourceforge.net/"
-
-RDEPEND=">=gnome-base/gnome-print-0.21 
-         >=gnome-base/gal-0.4
-	 bonobo? ( >=gnome-base/bonobo-0.37 )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-
-	if [ "`use bonobo`" ] ; then
-		myconf="--with-bonobo"
-	else
-		myconf="--without-bonobo"
-	fi
-
-	if [ -z "`use nls`" ] ; then
-		myconf="$myconf --disable-nls"
-	fi
-
-	./configure --host=${CHOST} --prefix=/opt/gnome 		\
-	            --sysconfdir=/etc/opt/gnome 			\
-		    --enable-gnome --enable-gnome-print ${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-}
diff --git a/media-gfx/eog/eog-0.6-r1.ebuild b/media-gfx/eog/eog-0.6-r1.ebuild
index cdbcdf4f1c93..087ac42f304c 100644
--- a/media-gfx/eog/eog-0.6-r1.ebuild
+++ b/media-gfx/eog/eog-0.6-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-0.6-r1.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-0.6-r1.ebuild,v 1.2 2001/10/06 20:15:36 hallski Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,29 +9,37 @@ DESCRIPTION="Eye of GNOME"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/eog/"${A}
 HOMEPAGE="http://www.gnome.org/gnome-office/eog.shtml"
 
-DEPEND="virtual/glibc nls? ( sys-devel/gettext )
-        >=gnome-base/bonobo-1.0.9-r1
-        >=gnome-base/gconf-1.0.4-r2
-        >=dev-util/xml-i18n-tools-0.8.4"
-
 RDEPEND="virtual/glibc
         >=gnome-base/gconf-1.0.4-r2
         >=gnome-base/bonobo-1.0.9-r1"
 
+DEPEND="${RDEPEND}
+	virtual/glibc
+	nls? ( sys-devel/gettext )
+        >=dev-util/xml-i18n-tools-0.8.4"
+
 src_compile() {
-  local myconf
-  if [ -z "`use nls`" ] ; then
-    myconf="--disable-nls"
-  fi
-  try ./configure --host=${CHOST} --prefix=/usr --sysconfdir=/etc/gnome $myconf
-  try pmake
+	local myconf
+
+	if [ -z "`use nls`" ] ; then
+		myconf="--disable-nls"
+	fi
+
+	./configure --host=${CHOST} 					\
+		    --prefix=/usr					\
+		    --sysconfdir=/etc					\
+		    $myconf || die
+	
+	emake || die
 }
 
 src_install() {
-  try make prefix=${D}/usr sysconfdir=/etc/gnome \
-	GCONG_CONFIG_SOURCE=xml=${D}/etc/gnome/gconf/gconf.xml.defaults install
-  dodoc AUTHORS COPYING DEPENDS ChangeLog HACKING NEWS README TODO MAINTAINERS
+	make DESTDIR=${D} 						\
+	     GCONG_CONFIG_SOURCE=xml=${D}/etc/gconf/gconf.xml.defaults 	\
+	     install || die
 
+	dodoc AUTHORS COPYING DEPENDS ChangeLog HACKING NEWS README 	\
+	      TODO MAINTAINERS
 }
 
 
diff --git a/media-gfx/sodipodi/files/sodipodi-0.24.1-compile.patch b/media-gfx/sodipodi/files/sodipodi-0.24.1-compile.patch
new file mode 100644
index 000000000000..61a801e077b1
--- /dev/null
+++ b/media-gfx/sodipodi/files/sodipodi-0.24.1-compile.patch
@@ -0,0 +1,13 @@
+diff -u -r sodipodi-0.24.1.orig/src/bonobo/Makefile.am sodipodi-0.24.1/src/bonobo/Makefile.am
+--- sodipodi-0.24.1.orig/src/bonobo/Makefile.am	Fri Oct  5 02:07:16 2001
++++ sodipodi-0.24.1/src/bonobo/Makefile.am	Sat Oct  6 14:00:39 2001
+@@ -5,7 +5,8 @@
+ 
+ INCLUDES = \
+ 	-I$(includedir) \
+-	-I$(SODIPODI_CFLAGS)
++	-I$(SODIPODI_CFLAGS)	\
++	$(SODIPODI_BONOBO_CFLAGS)
+ 
+ noinst_LIBRARIES = libspbonobo.a
+ 
diff --git a/media-gfx/sodipodi/sodipodi-0.24.1-r1.ebuild b/media-gfx/sodipodi/sodipodi-0.24.1-r1.ebuild
index 37d661c025b5..caded4d85766 100644
--- a/media-gfx/sodipodi/sodipodi-0.24.1-r1.ebuild
+++ b/media-gfx/sodipodi/sodipodi-0.24.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.24.1-r1.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.24.1-r1.ebuild,v 1.2 2001/10/06 20:15:36 hallski Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,13 +9,21 @@ DESCRIPTION="Vector illustrating application for GNOME"
 SRC_URI="http://prdownloads.sourceforge.net/${PN}/${A}"
 HOMEPAGE="http://sodipodi.sourceforge.net/"
 
-RDEPEND=">=gnome-base/gnome-print-0.30 
+RDEPEND=">=gnome-base/gnome-print-0.30
          >=gnome-extra/gal-0.13-r1
 	 bonobo? ( >=gnome-base/bonobo-1.0.9-r1 )"
 
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-compile.patch
+	automake
+}
+
 src_compile() {
 	local myconf
 
@@ -29,9 +37,11 @@ src_compile() {
 		myconf="$myconf --disable-nls"
 	fi
 
-	./configure --host=${CHOST} --prefix=/usr 		\
-	            --sysconfdir=/etc/gnome 			\
-		    --enable-gnome --enable-gnome-print ${myconf} || die
+	./configure --host=${CHOST} 					\
+		    --prefix=/usr			 		\
+	            --sysconfdir=/etc		 			\
+		    --enable-gnome					\
+		    --enable-gnome-print ${myconf} || die
 
 	emake || die
 }
diff --git a/profiles/package.mask b/profiles/package.mask
index 58196fd30de8..135cb21aafe8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -127,6 +127,14 @@ app-admin/va-systemimager-client
 =x11-wm/asclock-2.0.12
 
 # Moved in the big GNOME move
+gnome-office/abiword
+gnome-office/gnumeric
+gnome-office/mrproject
+gnome-office/eog
+gnome-office/sodipodi
+gnome-office/gnome-pim
+gnome-office/gnome-db
+gnome-office/dia
 gnome-libs/libxml2
 gnome-libs/libxslt
 gnome-base/libxml
@@ -143,17 +151,16 @@ gnome-base/libunicode
 gnome-libs/medusa
 gnome-apps/nautilus
 gnome-base/scrollkeeper
+gnome-office/guppi
 
 # Don't use these.
 # These are the old locations. Will be removed when new locations are tested.
 # /Hallski
 
-app-office/abiword
 dev-util/anjuta
 gnome-extra/battstat
 gnome-extra/bonobo-conf
 gnome-extra/bug-buddy
-app-office/dia
 media-gfx/ee
 app-office/evolution
 net-im/gabber
@@ -165,34 +172,28 @@ dev-util/glademm
 dev-util/glimmer
 app-office/gnofin
 gnome-extra/gnome-audio
-gnome-extra/gnome-db
 gnome-extra/gnome-games
 media-gfx/gnome-iconedit
 gnome-extra/gnome-media
-gnome-extra/gnome-pilot
 gnome-extra/gnome-pilot-conduits
-gnome-extra/gnome-pim
 gnome-extra/gnome-utils
+gnome-extra/gnome-pilot
 app-arch/gnorpm
 app-office/gnucash
-app-office/gnumeric
 media-gfx/gthumb
 app-misc/gtkdiff
 app-misc/gtktalog
 gnome-extra/gtop
-gnome-extra/guppi
 net-misc/gupsc
 app-admin/gwcc
 gnome-extra/mc
 dev-util/memprof
-app-office/mrproject
 net-analyzer/netleds_applet
 net-news/pan
 x11-terms/powershell
 gnome-extra/procman
 net-www/screem
 app-crypt/seahorse
-media-gfx/sodipodi
 gnome-extra/users-guide
 media-video/zapping