removed emake for make, might help on some obscure problems

10 files changed, 28 insertions, 257 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 17e0b3b47208..9a52c9af5f9e 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.17 2002/06/15 14:43:11 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.18 2002/06/28 08:03:43 spider Exp $
 
+
+natutils-2.0.0-r2 (28 Jun 2002)
+  28 jun 2002; Spider <spider@gentoo.org> natutils-2.0.0-r2.ebuild :
+  moved this to use singlethreaded build, not sure if it will help though, but its worth a try for those with problems in the panel modules
+
+  
 natutils-2.0.0-r1 (15 Jun 2002)
   15 Jun 2002 ; Spider <spider@gentoo.org> natutils-2.0.0-r1.ebuild :
   Adding fam-oss as a depend, speedgain is quite good
diff --git a/gnome-base/nautilus/files/digest-nautilus-1.1.17 b/gnome-base/nautilus/files/digest-nautilus-1.1.17
deleted file mode 100644
index 165fa282e312..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-1.1.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c12ff181865d1690fe21bb320f779eb nautilus-1.1.17.tar.bz2 7570728
diff --git a/gnome-base/nautilus/files/digest-nautilus-1.1.18 b/gnome-base/nautilus/files/digest-nautilus-1.1.18
deleted file mode 100644
index 253b78cfe4f1..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-1.1.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ab959569ab0dd5478ee67de57ad9186f nautilus-1.1.18.tar.bz2 5585531
diff --git a/gnome-base/nautilus/files/digest-nautilus-1.1.18-r1 b/gnome-base/nautilus/files/digest-nautilus-1.1.18-r1
deleted file mode 100644
index 253b78cfe4f1..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-1.1.18-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ab959569ab0dd5478ee67de57ad9186f nautilus-1.1.18.tar.bz2 5585531
diff --git a/gnome-base/nautilus/files/digest-nautilus-1.1.19 b/gnome-base/nautilus/files/digest-nautilus-1.1.19
deleted file mode 100644
index f1bb016f430a..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-1.1.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 949a4f64cc27ebb1f84db51524df9bff nautilus-1.1.19.tar.bz2 5006630
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.0.0-r2 b/gnome-base/nautilus/files/digest-nautilus-2.0.0-r2
new file mode 100644
index 000000000000..ea396b4190bd
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-2.0.0-r2
@@ -0,0 +1 @@
+MD5 582e225b049beff3f1a543ac13be9dd8 nautilus-2.0.0.tar.bz2 5003919
diff --git a/gnome-base/nautilus/nautilus-1.1.17.ebuild b/gnome-base/nautilus/nautilus-1.1.17.ebuild
deleted file mode 100644
index 85850dd47e35..000000000000
--- a/gnome-base/nautilus/nautilus-1.1.17.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Spider <spider@gentoo.org> 
-# Maintainer:  Spider <spider@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-1.1.17.ebuild,v 1.1 2002/05/23 19:15:17 spider Exp $
-
-# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-# force debug information
-CFLAGS="${CFLAGS} -g"
-CXXFLAGS="${CXXFLAGS} -g"
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A filemanager for the Gnome2 desktop"
-SRC_URI="ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
-
-RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/gconf-1.1.9
-	>=x11-libs/gtk+-2.0.2
-	>=dev-libs/libxml2-2.4.20
-	>=gnome-base/gnome-vfs-1.9.12
-	>=media-sound/esound-0.2.25
-	>=gnome-base/bonobo-activation-0.9.9
-	>=gnome-base/eel-1.1.15
-	>=gnome-base/libgnome-1.117.1
-	>=gnome-base/libgnomeui-1.117.1
-	>=gnome-base/gnome-desktop-1.5.20
-	>=media-libs/libart_lgpl-2.3.8-r1
-	>=gnome-base/libbonobo-1.117.0
-	>=gnome-base/libbonoboui-1.117.0
-	>=gnome-base/libgnomecanvas-1.115.0
-	>=gnome-base/librsvg-1.1.6
-	>=app-text/scrollkeeper-0.3.6"
-
-DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0"
-
-
-src_compile() {
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--enable-platform-gnome-2 \
-		--enable-debug=yes || die
-	make || die
-}
-
-src_install() {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		install || die
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- 	dodoc AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO 
-}
-
-
-pkg_postinst() {
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	echo ">>> updating GConf2"
-	for SCHEMA in nautilus.schemas apps_nautilus_preferences.schemas; do
-		echo $SCHEMA
-		/usr/bin/gconftool-2 --makefile-install-rule \
-			/etc/gconf/schemas/${SCHEMA}
-	done
-	echo ">>> updating scrollkeeper"
-	scrollkeeper-update -p /var/lib/scrollkeeper
-}
-
-
diff --git a/gnome-base/nautilus/nautilus-1.1.18.ebuild b/gnome-base/nautilus/nautilus-1.1.18.ebuild
deleted file mode 100644
index ce8e0f5c3f69..000000000000
--- a/gnome-base/nautilus/nautilus-1.1.18.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Spider <spider@gentoo.org> 
-# Maintainer:  Spider <spider@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-1.1.18.ebuild,v 1.1 2002/05/28 08:27:58 spider Exp $
-
-# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-# force debug information
-CFLAGS="${CFLAGS} -g"
-CXXFLAGS="${CXXFLAGS} -g"
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A filemanager for the Gnome2 desktop"
-SRC_URI="ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
-
-RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/gconf-1.1.10
-	>=x11-libs/gtk+-2.0.2
-	>=dev-libs/libxml2-2.4.22
-	>=gnome-base/gnome-vfs-1.9.12
-	>=media-sound/esound-0.2.25
-	>=gnome-base/bonobo-activation-0.9.9
-	>=gnome-base/eel-1.1.16
-	>=gnome-base/libgnome-1.117.2
-	>=gnome-base/libgnomeui-1.117.2
-	>=gnome-base/gnome-desktop-1.5.21
-	>=media-libs/libart_lgpl-2.3.8-r1
-	>=gnome-base/libbonobo-1.117.1
-	>=gnome-base/libbonoboui-1.117.1
-	>=gnome-base/libgnomecanvas-1.117.0
-	>=gnome-base/librsvg-1.1.6
-	>=app-text/scrollkeeper-0.3.6"
-
-DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0"
-
-
-src_compile() {
-	libtoolize --copy --force
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--enable-platform-gnome-2 \
-		--enable-debug=yes || die
-	emake || die
-}
-
-src_install() {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		install || die
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- 	dodoc AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO 
-}
-
-
-pkg_postinst() {
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	echo ">>> updating GConf2"
-	for SCHEMA in nautilus.schemas apps_nautilus_preferences.schemas; do
-		echo $SCHEMA
-		/usr/bin/gconftool-2 --makefile-install-rule \
-			/etc/gconf/schemas/${SCHEMA}
-	done
-	echo ">>> updating scrollkeeper"
-	scrollkeeper-update -p /var/lib/scrollkeeper
-}
-
-
diff --git a/gnome-base/nautilus/nautilus-1.1.19.ebuild b/gnome-base/nautilus/nautilus-1.1.19.ebuild
deleted file mode 100644
index 7d4a7aea9ef0..000000000000
--- a/gnome-base/nautilus/nautilus-1.1.19.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-1.1.19.ebuild,v 1.1 2002/06/05 12:50:24 stroke Exp $
-
-# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-# force debug information
-CFLAGS="${CFLAGS} -g"
-CXXFLAGS="${CXXFLAGS} -g"
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A filemanager for the Gnome2 desktop"
-SRC_URI="ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
-
-RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/gconf-1.1.11
-	>=x11-libs/gtk+-2.0.2
-	>=dev-libs/libxml2-2.4.22
-	>=gnome-base/gnome-vfs-1.9.12
-	>=media-sound/esound-0.2.25
-	>=gnome-base/bonobo-activation-0.9.9
-	>=gnome-base/eel-1.1.16
-	>=gnome-base/libgnome-1.117.2
-	>=gnome-base/libgnomeui-1.117.2
-	>=gnome-base/gnome-desktop-1.5.22
-	>=media-libs/libart_lgpl-2.3.8-r1
-	>=gnome-base/libbonobo-1.117.1
-	>=gnome-base/libbonoboui-1.117.1
-	>=gnome-base/libgnomecanvas-1.117.0
-	>=gnome-base/librsvg-1.1.6
-	>=app-text/scrollkeeper-0.3.6"
-
-DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0"
-
-
-src_compile() {
-	libtoolize --copy --force
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--enable-platform-gnome-2 \
-		--enable-debug=yes || die
-	emake || die
-}
-
-src_install() {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		install || die
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- 	dodoc AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO 
-}
-
-
-pkg_postinst() {
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	echo ">>> updating GConf2"
-	for SCHEMA in nautilus.schemas apps_nautilus_preferences.schemas; do
-		echo $SCHEMA
-		/usr/bin/gconftool-2 --makefile-install-rule \
-			/etc/gconf/schemas/${SCHEMA}
-	done
-	echo ">>> updating scrollkeeper"
-	scrollkeeper-update -p /var/lib/scrollkeeper
-}
-
-
diff --git a/gnome-base/nautilus/nautilus-1.1.18-r1.ebuild b/gnome-base/nautilus/nautilus-2.0.0-r2.ebuild
index fd0b33b717ec..2f1b9553147c 100644
--- a/gnome-base/nautilus/nautilus-1.1.18-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.0.0-r2.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Spider <spider@gentoo.org> 
-# Maintainer:  Spider <spider@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-1.1.18-r1.ebuild,v 1.1 2002/06/04 09:48:08 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.0.0-r2.ebuild,v 1.1 2002/06/28 08:03:43 spider Exp $
 
 inherit gnome2
 
@@ -13,30 +11,34 @@ HOMEPAGE="http://www.gnome.org/"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
 
-RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/gconf-1.1.10
+RDEPEND="app-admin/fam-oss
+	>=dev-libs/glib-2.0.1
+	>=gnome-base/gconf-1.1.11
 	>=x11-libs/gtk+-2.0.2
 	>=dev-libs/libxml2-2.4.22
-	>=gnome-base/gnome-vfs-1.9.12
-	>=media-sound/esound-0.2.25
-	>=gnome-base/bonobo-activation-0.9.9
-	>=gnome-base/eel-1.1.16
-	>=gnome-base/libgnome-1.117.2
-	>=gnome-base/libgnomeui-1.117.2
-	>=gnome-base/gnome-desktop-1.5.21
+	>=gnome-base/gnome-vfs-1.9.16
+	>=media-sound/esound-0.2.27
+	>=gnome-base/bonobo-activation-1.0.0
+	>=gnome-base/eel-2.0.0
+	>=gnome-base/gail-0.16
+	>=gnome-base/libgnome-2.0.1
+	>=gnome-base/libgnomeui-2.0.0
+	>=gnome-base/gnome-desktop-2.0.0
 	>=media-libs/libart_lgpl-2.3.8-r1
-	>=gnome-base/libbonobo-1.117.1
-	>=gnome-base/libbonoboui-1.117.1
-	>=gnome-base/libgnomecanvas-1.117.0
+	>=gnome-base/libbonobo-2.0.0
+	>=gnome-base/libbonoboui-2.0.0
+	>=gnome-base/libgnomecanvas-2.0.0
 	>=gnome-base/librsvg-1.1.6
 	>=app-text/scrollkeeper-0.3.6"
 
 DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0"
 
+
+G2CONF="${G2CONF} --enable-platform-gnome-2"
 DOCS="AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO"
-SCHEMAS="nautilus.schemas apps_nautilus_preferences.schemas"
 
-src_compile() {
-	gnome2_src_compile --enable-platform-gnome-2
+src_compile () {
+	gnome2_src_configure ${1}
+	make || die "compile dislikes me"
 }