new version

5 files changed, 29 insertions, 11 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 49e75ac4151c..71c0e462721d 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.55 2003/08/24 11:50:27 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.56 2003/09/09 16:50:02 foser Exp $
+
+*nautilus-2.4.0.ebuild (09 Sep 2003)
+
+  09 Sep 2003; foser <foser@gentoo.org> nautilus-2.4.0.ebuild :
+  Gnome 2.4 version, added cups support 
 
   22 Aug 2003; foser <foser@gentoo.org> nautilus-2.2.{3,4}*.ebuild :
   Make libbonoboui dep 2.2+ (#26434)
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 316a44756c1f..efd7bd900857 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,13 +1,12 @@
 MD5 fd916fd246708ce9ea0a6a3faffa385f nautilus-2.2.1.ebuild 1745
 MD5 69ce8cf9040034a40fbe046f4fd21f03 nautilus-2.0.7.ebuild 1587
 MD5 e671b9d62fdb33d2e7f2d5546d48c141 nautilus-1.0.6-r9.ebuild 3523
-MD5 6c102e919a39083f86c7048708df1a9d nautilus-2.3.90.ebuild 1297
 MD5 43a074c7711a291311cb5b4b8259c2ba nautilus-2.2.3.ebuild 1335
 MD5 47b008100105c5379f4d677142b2e202 nautilus-2.2.4.ebuild 1392
-MD5 bb66730a6de846c70e7c267ab8246460 ChangeLog 8468
+MD5 f0214175053808eb73e58c819685c784 ChangeLog 8467
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 7c8c177491d817b62556fdd9be6f3c62 nautilus-2.2.4-r5.ebuild 1601
-MD5 140a5b728b2796758ffb7f3e7402e979 nautilus-2.4.0.ebuild 1569
+MD5 e3ac71dbf0f8c523257b6987ca4d5334 nautilus-2.4.0.ebuild 1565
 MD5 dbfcca25a47c67d13020371a1acbff7a files/nautilus-2-thumbnail_max_size.patch 1444
 MD5 b6616981e10e2a9725840198f3b29d15 files/nautilus-2-x-printers.patch 39941
 MD5 6e4f0293f123c4fc7acf8e4d17e39990 files/digest-nautilus-2.2.4-r5 68
@@ -22,7 +21,6 @@ MD5 eb934f4bc6062d4b539e0b3dd9a0f98b files/digest-nautilus-2.2.3 68
 MD5 6e4f0293f123c4fc7acf8e4d17e39990 files/digest-nautilus-2.2.4 68
 MD5 323fc939bd6c4e4c2a4d55fe9de94bb2 files/digest-nautilus-2.4.0 68
 MD5 94955c8317b2f5742603a9dd1d656ed3 files/nautilus-2.2-double_menu_entry_fix.patch 1322
-MD5 cec4f904caf7be24edcc2e24aaf37d8f files/digest-nautilus-2.3.90 69
 MD5 0596a42317e21832ae5a4899b88348e3 files/nautilus-2.2.0.2-locale.patch 351
 MD5 ddc1abbf275436c7fa5fd5c04a27cc94 files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526
 MD5 7cb2f285f24e86a90c6a65b0b9356d39 files/macros/gnome.m4 16426
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.3.90 b/gnome-base/nautilus/files/digest-nautilus-2.3.90
deleted file mode 100644
index dd73ab623314..000000000000
--- a/gnome-base/nautilus/files/digest-nautilus-2.3.90
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09b21115b5a6d1482a3e2f72775e5baa nautilus-2.3.90.tar.bz2 5510909
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.4.0 b/gnome-base/nautilus/files/digest-nautilus-2.4.0
new file mode 100644
index 000000000000..d701a28f3ecb
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-2.4.0
@@ -0,0 +1 @@
+MD5 ec3e317a12072b79d9b915c256400ed9 nautilus-2.4.0.tar.bz2 5558952
diff --git a/gnome-base/nautilus/nautilus-2.3.90.ebuild b/gnome-base/nautilus/nautilus-2.4.0.ebuild
index 3cd652562bc9..14fd13d95c7c 100644
--- a/gnome-base/nautilus/nautilus-2.3.90.ebuild
+++ b/gnome-base/nautilus/nautilus-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.3.90.ebuild,v 1.2 2003/09/08 05:04:45 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.4.0.ebuild,v 1.1 2003/09/09 16:50:02 foser Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
-IUSE="oggvorbis"
+IUSE="oggvorbis cups"
 
 # depend on libbonobo-2.3 and up to remove bonobo-activation dep
 
@@ -33,13 +33,28 @@ RDEPEND=">=dev-libs/glib-2
 	dev-libs/popt
 	app-admin/fam-oss
 	sys-apps/eject
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-themes
-	oggvorbis? ( media-sound/vorbis-tools )"
+	oggvorbis? ( media-sound/vorbis-tools )
+	cups? ( net-print/libgnomecups
+		net-print/gnome-cups-manager )"
 
 DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.3.11
 	>=dev-util/pkgconfig-0.12.0"
 
+PDEPEND="x11-themes/gnome-icon-theme
+	x11-themes/gnome-themes"
+
 DOCS="AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO"
 
+src_unpack() {
+
+	unpack ${A}
+ 
+	cd ${S}
+	if [ `use cups` ]; then
+		epatch ${FILESDIR}/${PN}-2-x-printers.patch
+		WANT_AUTOCONF_2_5=1 autoconf || die
+		WANT_AUTOMAKE=1.6 automake || die
+	fi
+
+}