From 0c852772e36624e9f50701c0c55f4d42734629d9 Mon Sep 17 00:00:00 2001 From: Marinus Schraal Date: Sun, 21 Nov 2004 17:53:21 +0000 Subject: add reiser4 patch --- gnome-base/gnome-vfs/ChangeLog | 7 +- gnome-base/gnome-vfs/Manifest | 13 +-- .../gnome-vfs/files/digest-gnome-vfs-2.4.2-r1 | 1 - gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.0 | 1 - gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.2 | 1 - gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.3 | 2 - .../gnome-vfs/files/digest-gnome-vfs-2.8.3-r1 | 2 + .../files/gnome-vfs-2.8.3-reiser4_support.patch | 11 +++ gnome-base/gnome-vfs/gnome-vfs-2.4.2-r1.ebuild | 39 --------- gnome-base/gnome-vfs/gnome-vfs-2.6.0.ebuild | 55 ------------- gnome-base/gnome-vfs/gnome-vfs-2.6.2.ebuild | 69 ---------------- gnome-base/gnome-vfs/gnome-vfs-2.8.3-r1.ebuild | 93 ++++++++++++++++++++++ gnome-base/gnome-vfs/gnome-vfs-2.8.3.ebuild | 91 --------------------- 13 files changed, 116 insertions(+), 269 deletions(-) delete mode 100644 gnome-base/gnome-vfs/files/digest-gnome-vfs-2.4.2-r1 delete mode 100644 gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.0 delete mode 100644 gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.2 delete mode 100644 gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.3 create mode 100644 gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.3-r1 create mode 100644 gnome-base/gnome-vfs/files/gnome-vfs-2.8.3-reiser4_support.patch delete mode 100644 gnome-base/gnome-vfs/gnome-vfs-2.4.2-r1.ebuild delete mode 100644 gnome-base/gnome-vfs/gnome-vfs-2.6.0.ebuild delete mode 100644 gnome-base/gnome-vfs/gnome-vfs-2.6.2.ebuild create mode 100644 gnome-base/gnome-vfs/gnome-vfs-2.8.3-r1.ebuild delete mode 100644 gnome-base/gnome-vfs/gnome-vfs-2.8.3.ebuild (limited to 'gnome-base/gnome-vfs') diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog index e098f2d92bf1..40664fb57e79 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.116 2004/11/12 02:19:22 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.117 2004/11/21 17:53:21 foser Exp $ + +*gnome-vfs-2.8.3-r1 (21 Nov 2004) + + 21 Nov 2004; foser gnome-vfs-2.8.3-r1.ebuild : + Re-add reiser4 patch, silly me (#57756) 11 Nov 2004; Gustavo Zacarias gnome-vfs-2.8.1-r2.ebuild: diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest index b85f91b0ac6d..ad8359967091 100644 --- a/gnome-base/gnome-vfs/Manifest +++ b/gnome-base/gnome-vfs/Manifest @@ -1,22 +1,17 @@ +MD5 c2b97b20be54e2cbb1508839f993413e gnome-vfs-2.8.3-r1.ebuild 2213 MD5 507d3156be451823612ebe20163c2aea gnome-vfs-2.8.1-r2.ebuild 2267 -MD5 3070d177131769e5b11ae36733fa60d6 gnome-vfs-2.6.0.ebuild 1310 -MD5 1b31ef98b90df2ce1a02081682db1847 gnome-vfs-2.4.2-r1.ebuild 1044 -MD5 ab2dcd1ba909259e14aa9c53482f6b5a gnome-vfs-2.6.2.ebuild 1759 MD5 7f74f8f373b84be3ac53423c7531dd16 gnome-vfs-2.6.1.1.ebuild 1753 MD5 23cdbc81a7677fc00e62a3e00337c07f gnome-vfs-1.0.5-r3.ebuild 1944 -MD5 30ad4a146454951c7c72f64afb83d1b5 ChangeLog 13920 +MD5 a7c0233a8eb0f7aea69ee45139e5e1b9 ChangeLog 14063 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 8059c23f4fd72b6cf4e349949b5f95a3 gnome-vfs-2.8.3.ebuild 2128 -MD5 5decf8bb73287c8ce01500e5cd0ee463 files/digest-gnome-vfs-2.4.2-r1 69 MD5 b1346620d53413ed5a6e5309c14c228c files/digest-gnome-vfs-2.8.1-r2 69 +MD5 87c1b9929fce8975fc0f9aedb3cab3f0 files/digest-gnome-vfs-2.8.3-r1 154 +MD5 09f0fab6d414a859d0f979bef3e10dfb files/gnome-vfs-2.8.3-reiser4_support.patch 710 MD5 6126fab0b179eb680b819593f4bf1412 files/digest-gnome-vfs-2.6.1.1 71 MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68 MD5 76bd9665c0d55d08fcf71c2085ce3b9b files/gnome-vfs-2.8.1-howl_config.patch 950 MD5 2cd7247981f899f8e3674866efec39d1 files/gnome-vfs-2.8.1-eggdesktop.patch 2104 -MD5 48146c7a23e8af499720b290a58b7417 files/digest-gnome-vfs-2.6.0 69 -MD5 b9a8c5cd605a7e483e1b93edee7155c0 files/digest-gnome-vfs-2.6.2 69 MD5 879f26aea1c97096745b3bcce181f5f7 files/gnome-vfs-2.8.1-reiser4_support.patch 1432 -MD5 87c1b9929fce8975fc0f9aedb3cab3f0 files/digest-gnome-vfs-2.8.3 154 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.4.2-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.4.2-r1 deleted file mode 100644 index 9f5564dd315e..000000000000 --- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.4.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 a0f0e40739214143bbf3050311ff10cd gnome-vfs-2.4.2.tar.bz2 1067445 diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.0 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.0 deleted file mode 100644 index e3c47624f1aa..000000000000 --- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 4d0323cf015dd006210fcacd4bfe7420 gnome-vfs-2.6.0.tar.bz2 1431274 diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.2 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.2 deleted file mode 100644 index 079fafdabbd0..000000000000 --- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 61bf3e145652089c63edd423ecbc9eba gnome-vfs-2.6.2.tar.bz2 1372181 diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.3 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.3 deleted file mode 100644 index c15cfc7fc2b3..000000000000 --- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 5484694e7250c80a231cfc525d924cc3 gnome-vfs-2.8.3.tar.bz2 1907154 -MD5 9bca818543777c41004e9bd512f73753 gnome-vfs-2.8.3-updated_hal_support.patch 75389 diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.3-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.3-r1 new file mode 100644 index 000000000000..c15cfc7fc2b3 --- /dev/null +++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.3-r1 @@ -0,0 +1,2 @@ +MD5 5484694e7250c80a231cfc525d924cc3 gnome-vfs-2.8.3.tar.bz2 1907154 +MD5 9bca818543777c41004e9bd512f73753 gnome-vfs-2.8.3-updated_hal_support.patch 75389 diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.3-reiser4_support.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.8.3-reiser4_support.patch new file mode 100644 index 000000000000..2fbddfc9ba3e --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.8.3-reiser4_support.patch @@ -0,0 +1,11 @@ +diff -r -u --from-file=gnome-vfs-2.7.92.orig gnome-vfs-2.7.92.orig/libgnomevfs/gnome-vfs-filesystem-type.c gnome-vfs-2.7.92/libgnomevfs/gnome-vfs-filesystem-type.c +--- gnome-vfs-2.7.92.orig/libgnomevfs/gnome-vfs-filesystem-type.c 2004-09-12 16:25:59.650886232 +0100 ++++ gnome-vfs-2.7.92/libgnomevfs/gnome-vfs-filesystem-type.c 2004-09-12 22:43:46.278080336 +0100 +@@ -61,6 +61,7 @@ + { "nwfs" , N_("Netware Volume"), 0 }, + { "proc" , N_("System Volume"), 0 }, + { "procfs" , N_("System Volume"), 0 }, ++ { "reiser4" , N_("Reiser4 Linux Volume"), 1 }, + { "reiserfs" , N_("ReiserFS Linux Volume"), 1 }, + { "smbfs" , N_("Windows Shared Volume"), 1 }, + { "supermount",N_("SuperMount Volume"), 0 }, diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.4.2-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.4.2-r1.ebuild deleted file mode 100644 index c0def6445c0f..000000000000 --- a/gnome-base/gnome-vfs/gnome-vfs-2.4.2-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# 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.4.2-r1.ebuild,v 1.11 2004/11/08 15:06:47 vapier Exp $ - -inherit gnome2 - -DESCRIPTION="Gnome Virtual Filesystem" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="2" -KEYWORDS="arm x86 ppc alpha sparc hppa amd64 ia64 mips" -IUSE="doc ssl" - -RDEPEND=">=dev-libs/glib-2 - >=gnome-base/gconf-1.2 - >=gnome-base/orbit-2.4 - >=gnome-base/libbonobo-2 - >=dev-libs/libxml2-2.2.8 - >=gnome-base/gnome-mime-data-2 - app-admin/fam - ssl? ( >=dev-libs/openssl-0.9.5 )" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.29 - >=dev-util/pkgconfig-0.12.0 - doc? ( >=dev-util/gtk-doc-1 )" - -DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README TODO" - -G2CONF="${G2CONF} $(use_enable ssl openssl) --disable-schemas-install" - -src_install() { - - gnome2_src_install - - # FIXME: there are cleaner ways to do this - echo "trash: vfolder-desktop" >> ${D}/etc/gnome-vfs-2.0/modules/default-modules.conf - -} diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.6.0.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.6.0.ebuild deleted file mode 100644 index eded58774868..000000000000 --- a/gnome-base/gnome-vfs/gnome-vfs-2.6.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# 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.6.0.ebuild,v 1.13 2004/11/08 15:06:47 vapier Exp $ - -# FIXME : can use gnutls -inherit gnome2 eutils - -DESCRIPTION="Gnome Virtual Filesystem" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 LGPL-2" -SLOT="2" -KEYWORDS="arm x86 ppc alpha ~sparc hppa amd64 mips ia64" -IUSE="doc ssl samba ipv6" - -RDEPEND=">=dev-libs/glib-2 - >=gnome-base/gconf-1.2 - >=gnome-base/orbit-2.9 - >=gnome-base/libbonobo-2 - >=dev-libs/libxml2-2.2.8 - - gnome-base/gnome-mime-data - >=x11-misc/shared-mime-info-0.14 - - app-admin/fam - ssl? ( >=dev-libs/openssl-0.9.5 - !gnome-extra/gnome-vfs-sftp ) - samba? ( >=net-fs/samba-3 - !gnome-extra/gnome-vfs-extras )" - -DEPEND="${RDEPEND} - >=dev-util/intltool-0.29 - >=dev-util/pkgconfig-0.12.0 - doc? ( >=dev-util/gtk-doc-1 )" - -G2CONF="${G2CONF} \ - $(use_enable ssl openssl) \ - $(use_enable samba) \ - $(use_enable ipv6) \ - --disable-schemas-install - --without-gtk" - -DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README TODO" - -src_install() { - - gnome2_src_install - - # FIXME: there are cleaner ways to do this - echo "trash: libvfolder-desktop" >> ${D}/etc/gnome-vfs-2.0/modules/default-modules.conf - -} - -# Fix bonobo -USE_DESTDIR="1" diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.6.2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.6.2.ebuild deleted file mode 100644 index 8c4264908aa2..000000000000 --- a/gnome-base/gnome-vfs/gnome-vfs-2.6.2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# 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.6.2.ebuild,v 1.2 2004/11/08 15:06:47 vapier Exp $ - -inherit gnome2 eutils - -DESCRIPTION="Gnome Virtual Filesystem" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 LGPL-2" -SLOT="2" -KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~mips ~ia64 ~ppc64 ~arm" -IUSE="doc ssl gnutls samba ipv6" - -RDEPEND=">=dev-libs/glib-2 - >=gnome-base/gconf-1.2 - >=gnome-base/orbit-2.9 - >=gnome-base/libbonobo-2 - >=dev-libs/libxml2-2.2.8 - - gnome-base/gnome-mime-data - >=x11-misc/shared-mime-info-0.14 - - app-admin/fam - - ssl? ( >=dev-libs/openssl-0.9.5 - !gnome-extra/gnome-vfs-sftp ) - gnutls? ( !ssl? ( net-libs/gnutls - !gnome-extra/gnome-vfs-sftp ) ) - - samba? ( >=net-fs/samba-3 - !gnome-extra/gnome-vfs-extras )" -# ssl/gnutls USE deps : if both are enabled choose openssl -# foser 19 Apr 2004 - -DEPEND="${RDEPEND} - >=dev-util/intltool-0.29 - >=dev-util/pkgconfig-0.12.0 - doc? ( >=dev-util/gtk-doc-1 )" - -G2CONF="${G2CONF} \ - $(use_enable ssl openssl) \ - $(use_enable gnutls) \ - $(use_enable samba) \ - $(use_enable ipv6) \ - --disable-schemas-install - --without-gtk" - -# this works because of the order of conifgure parsing -# so should always be behind the use_enable options -# foser > ${D}/etc/gnome-vfs-2.0/modules/default-modules.conf - -} - -# Fix bonobo -USE_DESTDIR="1" diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.8.3-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.8.3-r1.ebuild new file mode 100644 index 000000000000..edf0d65bbdb9 --- /dev/null +++ b/gnome-base/gnome-vfs/gnome-vfs-2.8.3-r1.ebuild @@ -0,0 +1,93 @@ +# 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.3-r1.ebuild,v 1.1 2004/11/21 17:53:21 foser Exp $ + +inherit gnome2 eutils + +DESCRIPTION="Gnome Virtual Filesystem" +HOMEPAGE="http://www.gnome.org/" +LICENSE="GPL-2 LGPL-2" + +SLOT="2" +KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~mips ~ia64 ~ppc64 ~arm" +IUSE="doc ssl gnutls samba ipv6 hal howl" + +SRC_URI="${SRC_URI} + mirror://gentoo/${P}-updated_hal_support.patch" + +RDEPEND=">=dev-libs/glib-2 + >=gnome-base/gconf-1.2 + >=gnome-base/orbit-2.9 + >=gnome-base/libbonobo-2 + >=dev-libs/libxml2-2.6 + app-arch/bzip2 + dev-libs/popt + + virtual/fam + + gnome-base/gnome-mime-data + >=x11-misc/shared-mime-info-0.14 + + ssl? ( >=dev-libs/openssl-0.9.5 + !gnome-extra/gnome-vfs-sftp ) + gnutls? ( !ssl? ( net-libs/gnutls + !gnome-extra/gnome-vfs-sftp ) ) + samba? ( >=net-fs/samba-3 + !gnome-extra/gnome-vfs-extras ) + hal? ( >=sys-apps/hal-0.4 + >=sys-apps/dbus-0.22 ) + howl? ( >=net-misc/howl-0.9.6-r1 )" + +# ssl/gnutls USE deps : if both are enabled choose openssl +# foser 19 Apr 2004 + +DEPEND="${RDEPEND} + >=dev-util/intltool-0.29 + >=dev-util/pkgconfig-0.12.0 + doc? ( >=dev-util/gtk-doc-1 )" + +G2CONF="${G2CONF} \ + $(use_enable ssl openssl) \ + $(use_enable gnutls) \ + $(use_enable samba) \ + $(use_enable ipv6) \ + $(use_enable hal) \ + $(use_enable howl) \ + --disable-schemas-install + --without-gtk" + +# this works because of the order of conifgure parsing +# so should always be behind the use_enable options +# foser > ${D}/etc/gnome-vfs-2.0/modules/default-modules.conf + +} + +# Fix bonobo +USE_DESTDIR="1" diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.8.3.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.8.3.ebuild deleted file mode 100644 index 89ae1d14f15d..000000000000 --- a/gnome-base/gnome-vfs/gnome-vfs-2.8.3.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# 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.3.ebuild,v 1.3 2004/11/12 10:26:10 obz Exp $ - -inherit gnome2 eutils - -DESCRIPTION="Gnome Virtual Filesystem" -HOMEPAGE="http://www.gnome.org/" -LICENSE="GPL-2 LGPL-2" - -SLOT="2" -KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~mips ~ia64 ~ppc64 ~arm" -IUSE="doc ssl gnutls samba ipv6 hal howl" - -SRC_URI="${SRC_URI} - mirror://gentoo/${P}-updated_hal_support.patch" - -RDEPEND=">=dev-libs/glib-2 - >=gnome-base/gconf-1.2 - >=gnome-base/orbit-2.9 - >=gnome-base/libbonobo-2 - >=dev-libs/libxml2-2.6 - app-arch/bzip2 - dev-libs/popt - - virtual/fam - - gnome-base/gnome-mime-data - >=x11-misc/shared-mime-info-0.14 - - ssl? ( >=dev-libs/openssl-0.9.5 - !gnome-extra/gnome-vfs-sftp ) - gnutls? ( !ssl? ( net-libs/gnutls - !gnome-extra/gnome-vfs-sftp ) ) - samba? ( >=net-fs/samba-3 - !gnome-extra/gnome-vfs-extras ) - hal? ( >=sys-apps/hal-0.4 - >=sys-apps/dbus-0.22 ) - howl? ( >=net-misc/howl-0.9.6-r1 )" - -# ssl/gnutls USE deps : if both are enabled choose openssl -# foser 19 Apr 2004 - -DEPEND="${RDEPEND} - >=dev-util/intltool-0.29 - >=dev-util/pkgconfig-0.12.0 - doc? ( >=dev-util/gtk-doc-1 )" - -G2CONF="${G2CONF} \ - $(use_enable ssl openssl) \ - $(use_enable gnutls) \ - $(use_enable samba) \ - $(use_enable ipv6) \ - $(use_enable hal) \ - $(use_enable howl) \ - --disable-schemas-install - --without-gtk" - -# this works because of the order of conifgure parsing -# so should always be behind the use_enable options -# foser > ${D}/etc/gnome-vfs-2.0/modules/default-modules.conf - -} - -# Fix bonobo -USE_DESTDIR="1" -- cgit v1.2.3-65-gdbad