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

3 files changed, 13 insertions, 50 deletions

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