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

13 files changed, 454 insertions, 254 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
 }
 
 
 
-
-