make the patch somewhat simpler

3 files changed, 3 insertions, 63 deletions

diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index e0de84e4cf7a..11efd429f5c7 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,5 +1,5 @@
 MD5 8d2dab77b3ce6081125aca8cd297a3ab gnome-vfs-2.6.0.ebuild 1315
-MD5 5d3f13aeeb92fd802f7f78abe184edc4 gnome-vfs-2.8.1.ebuild 2101
+MD5 13d45b14f616a1ea8179e6f43f67ea6f gnome-vfs-2.8.1.ebuild 2091
 MD5 38c1c3722f6f3174c951fb9e2f9a23d2 gnome-vfs-2.4.2-r1.ebuild 1049
 MD5 80dad5a0ab8a18445dc7ef2240ca5d1e gnome-vfs-2.6.2.ebuild 1760
 MD5 38f23893e0d8dec0b7f75f477937b84b gnome-vfs-2.6.1.1.ebuild 1759
@@ -9,7 +9,7 @@ MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 5decf8bb73287c8ce01500e5cd0ee463 files/digest-gnome-vfs-2.4.2-r1 69
 MD5 6126fab0b179eb680b819593f4bf1412 files/digest-gnome-vfs-2.6.1.1 71
 MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
-MD5 73c9441d1b977bfa48c8908b978bd380 files/gnome-vfs-2.8.1-howl_config.patch 2692
+MD5 76bd9665c0d55d08fcf71c2085ce3b9b files/gnome-vfs-2.8.1-howl_config.patch 950
 MD5 48146c7a23e8af499720b290a58b7417 files/digest-gnome-vfs-2.6.0 69
 MD5 b9a8c5cd605a7e483e1b93edee7155c0 files/digest-gnome-vfs-2.6.2 69
 MD5 b1346620d53413ed5a6e5309c14c228c files/digest-gnome-vfs-2.8.1 69
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-howl_config.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-howl_config.patch
index 022c727a341f..8d2debd2a795 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-howl_config.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-howl_config.patch
@@ -24,62 +24,3 @@ diff -aurN gnome-vfs-2.8.1-orig/configure.in gnome-vfs-2.8.1/configure.in
  
  dnl ****************************
  dnl HAL stuff
-diff -aurN gnome-vfs-2.8.1-orig/modules/Makefile.am gnome-vfs-2.8.1/modules/Makefile.am
---- gnome-vfs-2.8.1-orig/modules/Makefile.am	2004-09-14 12:24:15.000000000 -0400
-+++ gnome-vfs-2.8.1/modules/Makefile.am	2004-09-21 17:48:34.137579728 -0400
-@@ -50,6 +50,11 @@
- SMB_LTLIBS = 
- endif
- 
-+if HAVE_HOWL
-+HOWL_LTLIBS = libdns-sd.la
-+else
-+HOWL_LTLIBS = 
-+endif
- 
- if BUILD_CDEMENU_MODULE
- CDEMENU_LTLIBS = libcdemenu-desktop.la
-@@ -63,7 +68,7 @@
- modules_LTLIBRARIES =				\
- 	$(CDDA_LTLIBS)				\
- 	libcomputer.la				\
--	libdns-sd.la				\
-+	$(HOWL_LTLIBS)				\
- 	libfile.la				\
- 	libnetwork.la				\
- 	libnntp.la				\
-@@ -90,13 +95,16 @@
- if HAVE_SAMBA
- SMB_CONF = smb-module.conf
- endif
-+if HAVE_HOWL
-+HOWL_CONF = dns-sd-module.conf
-+endif
- if HAVE_SSL
- SSL_CONF = ssl-modules.conf
- endif
- if BUILD_CDEMENU_MODULE
- CDE_CONF = cdemenu-module.conf
- endif
--modulesconf_DATA = default-modules.conf $(CDDA_CONF) $(SMB_CONF) $(SSL_CONF) $(CDE_CONF)
-+modulesconf_DATA = default-modules.conf $(CDDA_CONF) $(SMB_CONF) $(HOWL_CONF) $(SSL_CONF) $(CDE_CONF)
- 
- ###  `cdda' method
- 
-diff -aurN gnome-vfs-2.8.1-orig/modules/default-modules.conf gnome-vfs-2.8.1/modules/default-modules.conf
---- gnome-vfs-2.8.1-orig/modules/default-modules.conf	2004-08-13 02:52:12.000000000 -0400
-+++ gnome-vfs-2.8.1/modules/default-modules.conf	2004-09-21 17:49:12.957678176 -0400
-@@ -12,8 +12,6 @@
- 
- computer: computer
- 
--dns-sd: dns-sd
--
- file: file
- 
- test: vfs-test
-diff -aurN gnome-vfs-2.8.1-orig/modules/dns-sd-module.conf gnome-vfs-2.8.1/modules/dns-sd-module.conf
---- gnome-vfs-2.8.1-orig/modules/dns-sd-module.conf	1969-12-31 19:00:00.000000000 -0500
-+++ gnome-vfs-2.8.1/modules/dns-sd-module.conf	2004-09-21 17:48:34.138579576 -0400
-@@ -0,0 +1 @@
-+dns-sd: dns-sd
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild
index 0d4b391c6ae0..3f81ae62d039 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild,v 1.1 2004/09/30 15:12:42 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild,v 1.2 2004/09/30 15:44:17 foser Exp $
 
 inherit gnome2 eutils
 
@@ -70,7 +70,6 @@ src_unpack() {
 
 	# make howl a real switch (#64906)
 	epatch ${FILESDIR}/${P}-howl_config.patch
-	automake
 	autoconf
 
 }