new release, added howl patch

6 files changed, 112 insertions, 7 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index f6620a72d645..35ee231a1aeb 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.106 2004/09/17 22:13:54 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.107 2004/09/30 15:12:42 foser Exp $
+
+*gnome-vfs-2.8.1 (30 Sep 2004)
+
+  30 Sep 2004; foser <foser@gentoo.org> gnome-vfs-2.8.1.ebuild :
+  Add patch to make howl support optional, done by latexer (#64906)
 
   17 Sep 2004; Daniel Goller <morfic@gentoo.org>
   +files/1.0/gnome-vfs-1.0.5-gcc3.4.patch, gnome-vfs-1.0.5-r3.ebuild:
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index a1d6be75c080..2a4ed5c9ad49 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,4 +1,5 @@
 MD5 8d2dab77b3ce6081125aca8cd297a3ab gnome-vfs-2.6.0.ebuild 1315
+MD5 65aa64ed9f141da252ab60dc38e940fe gnome-vfs-2.8.1.ebuild 1939
 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
@@ -12,6 +13,7 @@ MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
 MD5 48146c7a23e8af499720b290a58b7417 files/digest-gnome-vfs-2.6.0 69
 MD5 b9a8c5cd605a7e483e1b93edee7155c0 files/digest-gnome-vfs-2.6.2 69
 MD5 f683e1d8f1cbe5aa1e53b36e57c857fc files/digest-gnome-vfs-2.8.0 69
+MD5 b1346620d53413ed5a6e5309c14c228c files/digest-gnome-vfs-2.8.1 69
 MD5 7320d4ac9d4f99766075061daa53ea63 files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch 4892
 MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
 MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.0 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.0
deleted file mode 100644
index d14928525026..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fbb17f6937b8210ba4bdc7f47dc2ad8b gnome-vfs-2.8.0.tar.bz2 1860847
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.1
new file mode 100644
index 000000000000..b1c7f8ae04ea
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.1
@@ -0,0 +1 @@
+MD5 1c7286496a417dabfea563b724eae86b gnome-vfs-2.8.1.tar.bz2 1877981
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
new file mode 100644
index 000000000000..022c727a341f
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-howl_config.patch
@@ -0,0 +1,85 @@
+diff -aurN gnome-vfs-2.8.1-orig/configure.in gnome-vfs-2.8.1/configure.in
+--- gnome-vfs-2.8.1-orig/configure.in	2004-09-14 12:23:25.000000000 -0400
++++ gnome-vfs-2.8.1/configure.in	2004-09-21 17:48:34.136579880 -0400
+@@ -676,12 +676,16 @@
+ dnl Howl
+ dnl ****************************
+ 
+-PKG_CHECK_MODULES(HOWL, howl >= 0.9.6,
+-		  [AM_CONDITIONAL(HAVE_HOWL, true)
+-		   AC_DEFINE(HAVE_HOWL, [], [Set if we can use howl])],
+-	          [AM_CONDITIONAL(HAVE_HOWL, false)])
+-AC_SUBST(HOWL_CFLAGS)
+-AC_SUBST(HOWL_LIBS)
++AM_CONDITIONAL(HAVE_HOWL, false)
++AC_ARG_ENABLE(howl, [  --disable-howl     build without howl support])
++if test "x$enable_howl" != "xno"; then
++	PKG_CHECK_MODULES(HOWL, howl >= 0.9.6,
++		  	[AM_CONDITIONAL(HAVE_HOWL, true)
++		   	AC_DEFINE(HAVE_HOWL, [], [Set if we can use howl])],
++	          	[AM_CONDITIONAL(HAVE_HOWL, false)])
++	AC_SUBST(HOWL_CFLAGS)
++	AC_SUBST(HOWL_LIBS)
++fi
+ 
+ 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.0.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild
index 084c993be940..0d4b391c6ae0 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.8.0.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild
@@ -1,10 +1,10 @@
 # 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.0.ebuild,v 1.1 2004/09/15 13:29:48 foser Exp $
+# $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 $
 
 inherit gnome2 eutils
 
-IUSE="doc ssl gnutls samba ipv6 hal"
+IUSE="doc ssl gnutls samba ipv6 hal howl"
 
 SLOT="2"
 
@@ -24,7 +24,7 @@ RDEPEND=">=dev-libs/glib-2
 	app-admin/fam
 
 	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
+	>=x11-misc/shared-mime-info-0.15
 
 	ssl? ( >=dev-libs/openssl-0.9.5
 		!gnome-extra/gnome-vfs-sftp )
@@ -33,10 +33,10 @@ RDEPEND=">=dev-libs/glib-2
 	samba? ( >=net-fs/samba-3
 		!gnome-extra/gnome-vfs-extras )
 	hal? ( >=sys-apps/hal-0.2.92
-		>=sys-apps/dbus-0.22 )"
+		>=sys-apps/dbus-0.22 )
+	howl? (>=net-misc/howl-0.9.6-r1 )"
 
 # FIXME : make the fam dep a virtual
-# FIXME : add howl support when its fixed
 
 # ssl/gnutls USE deps : if both are enabled choose openssl
 # foser <foser@gentoo.org> 19 Apr 2004
@@ -52,6 +52,7 @@ G2CONF="${G2CONF} \
 	$(use_enable samba) \
 	$(use_enable ipv6) \
 	$(use_enable hal) \
+	$(use_enable howl) \
 	--disable-schemas-install
 	--without-gtk"
 
@@ -62,6 +63,18 @@ use gnutls && use ssl && G2CONF="${G2CONF} --disable-gnutls"
 
 DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README TODO"
 
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# make howl a real switch (#64906)
+	epatch ${FILESDIR}/${P}-howl_config.patch
+	automake
+	autoconf
+
+}
+
 src_install() {
 
 	gnome2_src_install