*** empty log message ***

3 files changed, 61 insertions, 33 deletions

diff --git a/gnome-office/dia/dia-0.88.1.ebuild b/gnome-office/dia/dia-0.88.1.ebuild
index 0d7c4fd0532d..398138e2a7d3 100644
--- a/gnome-office/dia/dia-0.88.1.ebuild
+++ b/gnome-office/dia/dia-0.88.1.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-office/dia/dia-0.88.1.ebuild,v 1.1 2001/06/04 10:34:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-office/dia/dia-0.88.1.ebuild,v 1.2 2001/06/05 19:43:20 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,33 +9,50 @@ 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/gnome-print-0.24
-	>=app-arch/rpm-3.0.5
-	bonobo? ( gnome-base/bonobo )
+DEPEND=">=gnome-base/libxml-1.8.13 nls? ( sys-devel/gettext )
+        >=gnome-base/gdk-pixbuf-0.11.0
+        >=app-arch/rpm-3.0.6
+	bonobo? ( >=gnome-base/bonobo-1.0.4 )
 	python? ( dev-lang/python-2.0 )"
-
+RDEPEND=">=gnome-base/libxml-1.8.13
+        >=gnome-base/gdk-pixbuf-0.11.0
+        >=app-arch/rpm-3.0.6
+	bonobo? ( >=gnome-base/bonobo-1.0.4 )"
 
 src_compile() {
 
     local myconf
-    if [ "`use bonobo`" ]
-    then
-      myconf="--enable-bonobo"
+    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
+#    if [ "`use python`" ] ; then
 #      myconf="$myconf --with-python"
 #    fi
-    try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--sysconfdir=/etc/opt/gnome \
-	--enable-gnome --enable-gnome-print ${myconf}
+    if [ -z "`use nls`" ] ; then
+        myconf="$myconf --disable-nls"
+    fi
+    try ./configure --host=${CHOST} ${myprefix} ${myconf}
+        # enable-gnome-print not recoomended
     try make
 
 }
 
 src_install () {
-
-    try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome 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/eog/eog-0.6.ebuild b/gnome-office/eog/eog-0.6.ebuild
index c8effe7fca72..9a7dafed81af 100644
--- a/gnome-office/eog/eog-0.6.ebuild
+++ b/gnome-office/eog/eog-0.6.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-office/eog/eog-0.6.ebuild,v 1.2 2001/05/10 09:39:40 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-office/eog/eog-0.6.ebuild,v 1.3 2001/06/05 19:43:20 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,20 +9,27 @@ 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=">=gnome-base/bonobo-0.18
-	>=gnome-base/gconf-0.8
-	>=gnome-base/gnome-core-1.4
-	>=gnome-base/libglade-0.16"
-
-src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-bonobo
+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 make
 }
 
-src_install() {                               
-  try make prefix=${D}/opt/gnome \
-	GCONG_CONFIG_SOURCE=xml=${D}/opt/gnome/etc/gconf/gconf.xml.defaults install
+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/gnome-pim/gnome-pim-1.4.0.ebuild b/gnome-office/gnome-pim/gnome-pim-1.4.0.ebuild
index 142d8462bcab..795fb735b48d 100644
--- a/gnome-office/gnome-pim/gnome-pim-1.4.0.ebuild
+++ b/gnome-office/gnome-pim/gnome-pim-1.4.0.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-office/gnome-pim/gnome-pim-1.4.0.ebuild,v 1.1 2001/05/17 00:10:07 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-office/gnome-pim/gnome-pim-1.4.0.ebuild,v 1.2 2001/06/05 19:43:20 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,16 +9,20 @@ 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"
+DEPEND=">=gnome-base/gnome-core-1.4.0 nls? ( sys-devel/gettext )"
 RDEPEND=">=gnome-base/gnome-libs-1.2.13"
 
-src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/opt/gnome
+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 make
 }
 
-src_install() {                               
-  try make prefix=${D}/opt/gnome install
+src_install() {
+  try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install
   dodoc AUTHORS COPYING* ChangeLog NEWS
   dodoc README*
 }