converted to gnome 2 eclass and gnome 1.4.x dep fix

8 files changed, 59 insertions, 190 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 6c9c673be334..78a82c896964 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,8 +1,19 @@
 # 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.12 2002/06/01 20:55:10 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.13 2002/06/04 09:48:08 blocke Exp $
+
+*nautilus-1.1.18-r1 (04 Jun 2002)
+
+  04 Jun 2002; Bruce A. Locke <blocke@shivan.org> nautilus-1.1.18-r1.ebuild:
+
+  Converted to gnome2 eclass
 
 *nautilus-1.0.6-r9 (26 May 2002)
+
+  04 Jun 2002; Bruce A. Locke <blocke@shivan.org> nautilus-1.0.6-r9.ebuild:
+
+  Hopefully gnome2 proof dependencies
+
   1 June 2002; Matthew Kennedy <mkennedy@gentoo.org> :
 
   Patch Nautilus to work with gcc3.1.
diff --git a/gnome-base/nautilus/files/digest-nautilus-1.0.6-r7 b/gnome-base/nautilus/files/digest-nautilus-1.0.6-r7
deleted file mode 100644
index 618f369df464..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-1.0.6-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 436283056c100bcbd14098a5342e2868 nautilus-1.0.6.tar.gz 11481232
diff --git a/gnome-base/nautilus/files/digest-nautilus-1.1.16 b/gnome-base/nautilus/files/digest-nautilus-1.1.16
deleted file mode 100644
index 41c9d56758b4..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-1.1.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 182bc2ec3b04c8442496244fa696a781 nautilus-1.1.16.tar.bz2 7568106
diff --git a/gnome-base/nautilus/files/digest-nautilus-1.1.18-r1 b/gnome-base/nautilus/files/digest-nautilus-1.1.18-r1
new file mode 100644
index 000000000000..253b78cfe4f1
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-1.1.18-r1
@@ -0,0 +1 @@
+MD5 ab959569ab0dd5478ee67de57ad9186f nautilus-1.1.18.tar.bz2 5585531
diff --git a/gnome-base/nautilus/nautilus-1.0.6-r7.ebuild b/gnome-base/nautilus/nautilus-1.0.6-r7.ebuild
deleted file mode 100644
index 65f5bea7cba7..000000000000
--- a/gnome-base/nautilus/nautilus-1.0.6-r7.ebuild
+++ /dev/null
@@ -1,107 +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>
-# Updated by Sebastian Werner <sebastian@werner-productions.de>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-1.0.6-r7.ebuild,v 1.2 2002/06/01 11:01:51 blocke Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="nautilus"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-
-HOMEPAGE="http://www.gnome.org/"
-
-RDEPEND="mozilla? ( >=net-www/mozilla-0.9.5 )
-	>=app-admin/fam-oss-2.6.4
-	>=media-sound/cdparanoia-3.9.8
-	>=gnome-base/bonobo-1.0.9-r1
-	>=gnome-base/gnome-core-1.4.0.4-r1
-	>=gnome-base/libghttp-1.0.9-r1
-	>=gnome-base/gnome-vfs-1.0.3
-	>=gnome-base/librsvg-1.0.1
-	>=gnome-base/eel-1.0.2
-	>=gnome-extra/medusa-0.5.1-r1"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	>=app-text/scrollkeeper-0.2
-	>=dev-util/intltool-0.11"
-
-SLOT="0"
-
-src_unpack() {
-
-	unpack ${P}.tar.gz
-
-	# The following is a temporary patch contributed by Naresh Donti
-	# to fix the 50 defunct copies of sh caused by hyperbola.  This patch
-	# will no longer be needed with a future version of scrollkeeper.
-	# see bug #566 for more information
-
-	patch -p0 < ${FILESDIR}/nautilus-1.0.6-hyperbola.diff
-
-	# This patch to fix http://bugs.gentoo.org/show_bug.cgi?id=2082
-	# (taken from
-	# http://lists.eazel.com/pipermail/nautilus-list/2002-April/008473.html)
-	# Credit to Kaoru Fukui <k_fukui@highway.ne.jp>. This is probably
-	# a temporary patch until the next nautilus.
-
-	cd ${S} ; patch -p1 < ${FILESDIR}/nautilus-1.0.6-mozilla-1.0_rc1.diff
-}
-
-src_compile() {                           
-	local myconf
-	
-	if [ -z "`use nls`" ]
-	then
-		myconf="${myconf} --disable-nls"
-		mkdir intl
-		touch intl/libgettext.h
-	fi
-
-	if [ "`use mozilla`" ]
-	then
-		MOZILLA=${MOZILLA_FIVE_HOME}
-		myconf="${myconf} --with-mozilla-lib-place=$MOZILLA \
-				  --with-mozilla-include-place=$MOZILLA/include"
-
-		export MOZILLA_FIVE_HOME=$MOZILLA
-		export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME
-	else
-		myconf="${myconf} --disable-mozilla-component"
-	fi
-
-	libtoolize --copy --force
-	aclocal
-	autoconf
-
-	CFLAGS="${CFLAGS} `gnome-config --cflags gdk_pixbuf`"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man	\
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--enable-eazel-services=0 \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		 mandir=${D}/usr/share/man	\
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/lib \
-	     install || die
-
-	# Fix missing icon in Gnome Spash
-	insinto /usr/share/pixmaps
-	newins nautilus-launch-icon.png gnome-launch-icon.png
-
-	dodoc AUTHORS COPYING* ChangeLog* NEWS TODO
-
-	# Fix permissions in order to resolve the mozilla-view issue
-	chmod -R g+r,o+r ${D}/*
-}
-
diff --git a/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild b/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild
index f92a7bb39d90..4256c87e9466 100644
--- a/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild
+++ b/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
 # Updated by Sebastian Werner <sebastian@werner-productions.de>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild,v 1.3 2002/06/01 20:55:10 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-1.0.6-r9.ebuild,v 1.4 2002/06/04 09:48:08 blocke Exp $
 
 
 S=${WORKDIR}/${P}
@@ -15,11 +15,11 @@ RDEPEND="mozilla? ( >=net-www/mozilla-1.0_rc3 )
 	>=app-admin/fam-oss-2.6.4
 	>=media-sound/cdparanoia-3.9.8
 	>=gnome-base/bonobo-1.0.9-r1
-	>=gnome-base/gnome-core-1.4.0.4-r1
+	=gnome-base/gnome-core-1.4*
 	>=gnome-base/libghttp-1.0.9-r1
-	>=gnome-base/gnome-vfs-1.0.3
+	=gnome-base/gnome-vfs-1.0*
 	>=gnome-base/librsvg-1.0.1
-	>=gnome-base/eel-1.0.2
+	=gnome-base/eel-1.0*
 	>=gnome-extra/medusa-0.5.1-r1"
 
 DEPEND="${RDEPEND}
diff --git a/gnome-base/nautilus/nautilus-1.1.16.ebuild b/gnome-base/nautilus/nautilus-1.1.16.ebuild
deleted file mode 100644
index e1d193bd8e64..000000000000
--- a/gnome-base/nautilus/nautilus-1.1.16.ebuild
+++ /dev/null
@@ -1,76 +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.16.ebuild,v 1.1 2002/05/22 22:05:29 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.7
-	>=gnome-base/eel-1.1.14
-	>=gnome-base/libgnome-1.115.0
-	>=gnome-base/libgnomeui-1.115.0
-	>=gnome-base/gnome-desktop-1.5.17
-	>=media-libs/libart_lgpl-2.3.8-r1
-	>=gnome-base/libbonobo-1.115.0
-	>=gnome-base/libbonoboui-1.115.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-r1.ebuild b/gnome-base/nautilus/nautilus-1.1.18-r1.ebuild
new file mode 100644
index 000000000000..fd0b33b717ec
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-1.1.18-r1.ebuild
@@ -0,0 +1,42 @@
+# 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 $
+
+inherit gnome2
+
+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"
+
+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
+}
+