summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-03-23 10:44:11 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-03-23 10:44:11 +0000
commita2124ae292679c456b27a48aa76c3f20f97eb159 (patch)
tree8cbbd611ae891356da62a160bff1ed01285f00ba /gnome-base/gnome-vfs
parentActually fix the deps... (diff)
downloadgentoo-2-a2124ae292679c456b27a48aa76c3f20f97eb159.tar.gz
gentoo-2-a2124ae292679c456b27a48aa76c3f20f97eb159.tar.bz2
gentoo-2-a2124ae292679c456b27a48aa76c3f20f97eb159.zip
old
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-vfs')
-rw-r--r--gnome-base/gnome-vfs/Manifest3
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-home_dir_fakeroot.patch160
-rw-r--r--gnome-base/gnome-vfs/gnome-vfs-2.24.3-r1.ebuild134
3 files changed, 0 insertions, 297 deletions
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 789664228106..17e87d696ded 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -2,16 +2,13 @@ AUX gnome-vfs-2.12.0-afs.patch 663 RMD160 a8ac6fbb9792b02090d3783ce10481bbc6b3b8
AUX gnome-vfs-2.15.2-headers-define.patch 569 RMD160 5ff16b2fc13ef170a39dad9c300a8fb1581f8f93 SHA1 f448746dd581d8bee99377d860f3d4fb51659eb8 SHA256 ac0136ec0df6ba7efac5ac3403809383e7f681556f082537ee866d0398110918
AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 RMD160 816b75d144fc264a34e45f0e2d17e37f528f1682 SHA1 a3011624f5078b468c0a67023109723f9455bd83 SHA256 b68247cc6abf30d183efb51480793917e820ce461b0c62003321aceced177345
AUX gnome-vfs-2.20.0-automagic-deps.patch 2008 RMD160 91c4b7b771548b6645a1bf1764cff9af7947da43 SHA1 da27fcb4652a8f3a9e042a916371bbf03f03ad71 SHA256 478f55fe5e38714a22854351d46a031cacf1c003855865a8bdd1c2f1ececb5c5
-AUX gnome-vfs-2.20.0-home_dir_fakeroot.patch 5197 RMD160 1d2b5909c8ea2c901597ed3784ae3d2524f1145e SHA1 1ff4d5fc865f92c2ae8616511fbfe2efdad080fd SHA256 61b2959ceaeae412cc96dac1258dec47182f6935c4a6145c756541e6e038fe95
AUX gnome-vfs-2.20.1-automagic-deps.patch 643 RMD160 0e984be0bf21114192174b87ed9cb9b91df38ff9 SHA1 75c330ed9dd352aae758c7691d766ba7df1a7885 SHA256 7d50fa5944125190ce0b0d47013bc4ff4fbfe2908520828dc9ced80d9b47ed02
AUX gnome-vfs-2.24.0-gnutls27.patch 1332 RMD160 4524693921a3a7675d50da69dec6766dbd2b5861 SHA1 f7fefc9d6c9d39b02d421ee96c5707f00debb170 SHA256 66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d
AUX gnome-vfs-2.24.0-uuid-mount.patch 2452 RMD160 3c7069f905861ddad103a0696cac41033905e231 SHA1 91a57c3e51da5e27f7a4382d559935c1370af3d1 SHA256 beb9aace30a3976fae53c1d6972e2dc1dbc1040de804197c01ecea296f3eda25
AUX gnome-vfs-2.24.4-build-tests-asneeded.patch 632 RMD160 8135b3d02f5b82bc297fe35617e077cfbee8feaf SHA1 71eff46e892e5b9da952054671f7c6eb2ce9a506 SHA256 aa87d5a019cb2ebfa3f66b64f7bebb19ed143a825d33e9d7370f89f9630b0214
AUX gnome-vfs-2.24.4-disable-test-async-cancel.patch 689 RMD160 5289d40fdad2581985a6a97295df101904a8f0c4 SHA1 d24a56fd996e5cb315626e5d69dae820109f5f2d SHA256 77dcd6c2dd00d05b036efee3014334e4d96bcbd40de9d4632290df6125dbfbbe
AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 RMD160 ee9a680747ed1060dd41bc64fd78d9791faa2fa8 SHA1 97b5a7ab01ba0976fac02accad7671ade5b8cbe0 SHA256 4d1841e7c296f7774aea01649d28549b5d04db486c5c7cd0b4c0e63ba04e4dc0
-DIST gnome-vfs-2.24.3.tar.bz2 1830456 RMD160 652afba47a33b05128d354927d2648b39b50f35a SHA1 56aed067eea79175bc186a00003c07a42e5e9aa6 SHA256 3b0f342e79813bfc11d8e636db96b3ffd16c9ca48b07306410e09a3fd1065b4a
DIST gnome-vfs-2.24.4.tar.bz2 1890370 RMD160 6a5952bea02dfc96782b6f1129fe765f5313a75b SHA1 0dc634e7dd979fd218f378902c0ca1af80738961 SHA256 62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa
-EBUILD gnome-vfs-2.24.3-r1.ebuild 3753 RMD160 ca26d4fbbec508077b9865d86972d04f802cc725 SHA1 250818052a61326905cb036aee99892afd06c1c7 SHA256 50936945c6124fe5cd604679ca04b862a8f44233b8d649b42595a4ea92024bc0
EBUILD gnome-vfs-2.24.4-r1.ebuild 3589 RMD160 8f24fef2906a0955755e94698fa2a5fcce6f9dca SHA1 ccdd16419ce08da878b4721aa953e0cc417a16f0 SHA256 2da04e1155d92ac19ffd2c5b79a212ef2e3b7376472a0bd57292b45155a15cb5
EBUILD gnome-vfs-2.24.4.ebuild 3613 RMD160 47d651288b6a6d4df2595ebfca909368f64de0bd SHA1 d0ea987d20bc30829db73918e5030d1bae61d38a SHA256 4c15f985f06de79d53ab0fcf5343d16e5a8b21350403cc188535cbe267cc2c37
MISC ChangeLog 45366 RMD160 f6e8b509d778d2326fe8232b2e8b3eaec2d70c9e SHA1 19a34d54a290785aac04fd4b680f8262641aea6b SHA256 e333874a26e08ed03b2bca3b663eaf0bc7faa3f1e1a45563706372faded43098
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-home_dir_fakeroot.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-home_dir_fakeroot.patch
deleted file mode 100644
index 65345944d601..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-home_dir_fakeroot.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-application-registry.c
-===================================================================
---- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-application-registry.c 2007-01-03 07:50:44.000000000 +0100
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-application-registry.c 2007-10-11 10:13:16.429551115 +0200
-@@ -965,7 +965,7 @@
- NULL);
- gnome_registry_dir.system_dir = TRUE;
-
-- user_registry_dir.dirname = g_build_filename (g_get_home_dir(),
-+ user_registry_dir.dirname = g_build_filename (gnome_vfs_get_home_dir(),
- ".gnome",
- "application-info",
- NULL);
-Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-init.c
-===================================================================
---- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-init.c 2007-03-05 10:05:05.000000000 +0100
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-init.c 2007-10-11 10:13:16.429551115 +0200
-@@ -59,29 +59,6 @@
-
- static GPrivate * private_is_primary_thread;
-
--static gboolean
--ensure_dot_gnome_exists (void)
--{
-- gboolean retval = TRUE;
-- gchar *dirname;
--
-- dirname = g_build_filename (g_get_home_dir (), ".gnome2", NULL);
--
-- if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) {
-- if (g_mkdir (dirname, S_IRWXU) != 0) {
-- g_warning ("Unable to create ~/.gnome2 directory: %s",
-- g_strerror (errno));
-- retval = FALSE;
-- }
-- } else if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) {
-- g_warning ("Error: ~/.gnome2 must be a directory.");
-- retval = FALSE;
-- }
--
-- g_free (dirname);
-- return retval;
--}
--
- static void
- gnome_vfs_thread_init (void)
- {
-@@ -112,7 +89,8 @@
- char *bogus_argv[2] = { "dummy", NULL };
- */
-
-- if (!ensure_dot_gnome_exists ()) {
-+ /* The first call also checks that ~/.gnome2 is writable. */
-+ if (!gnome_vfs_get_home_dir ()) {
- return FALSE;
- }
-
-Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.c
-===================================================================
---- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-private-utils.c 2007-01-03 07:50:44.000000000 +0100
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.c 2007-10-11 10:14:48.814815851 +0200
-@@ -1086,3 +1086,54 @@
- }
- #endif
-
-+static gboolean
-+ensure_dot_gnome_exists (gchar *home_dir)
-+{
-+ gboolean retval = TRUE;
-+ gchar *dirname;
-+
-+ dirname = g_build_filename (home_dir, ".gnome2", NULL);
-+
-+ if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) {
-+ if (g_mkdir (dirname, S_IRWXU) != 0) {
-+ g_warning ("Unable to create ~/.gnome2 directory: %s",
-+ g_strerror (errno));
-+ retval = FALSE;
-+ }
-+ } else if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) {
-+ g_warning ("Error: ~/.gnome2 must be a directory.");
-+ retval = FALSE;
-+ }
-+
-+ g_free (dirname);
-+ return retval;
-+}
-+
-+/**
-+ * gnome_vfs_get_home_dir:
-+ *
-+ * If ~/.gnome2 is writable, return the home directory
-+ * Otherwise, return the contents of the HOME environment variable
-+ *
-+ * Return value: home directory if successful, NULL otherwise.
-+ * Do not free the value returned.
-+ */
-+const gchar *
-+gnome_vfs_get_home_dir (void)
-+{
-+ static gchar *home = NULL;
-+
-+ if (home == NULL) {
-+ gchar *tmp = g_get_home_dir ();
-+ if (ensure_dot_gnome_exists (tmp)) {
-+ home = g_strdup (tmp);
-+ } else {
-+ gchar *tmp2 = g_getenv ("HOME");
-+ if (!g_str_equal (tmp, tmp2) && ensure_dot_gnome_exists (tmp2)) {
-+ home = g_strdup (tmp2);
-+ }
-+ }
-+ }
-+
-+ return home;
-+}
-Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.h
-===================================================================
---- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-private-utils.h 2007-01-03 07:50:44.000000000 +0100
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.h 2007-10-11 10:13:16.433551342 +0200
-@@ -124,6 +124,8 @@
-
- #endif
-
-+const gchar *gnome_vfs_get_home_dir (void);
-+
- G_END_DECLS
-
- #endif /* _GNOME_VFS_PRIVATE_UTILS_H */
-Index: gnome-vfs-2.20.0/modules/file-method.c
-===================================================================
---- gnome-vfs-2.20.0.orig/modules/file-method.c 2007-10-11 10:13:16.345546327 +0200
-+++ gnome-vfs-2.20.0/modules/file-method.c 2007-10-11 10:13:16.433551342 +0200
-@@ -1536,7 +1536,7 @@
- GList *p;
- char *buffer, *escaped_path, *escaped_mount_point;
-
-- cache_file_parent = append_to_path (g_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
-+ cache_file_parent = append_to_path (gnome_vfs_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
- cache_file_path = append_to_path (cache_file_parent, TRASH_ENTRY_CACHE_NAME);
-
- if (mkdir_recursive (cache_file_parent, 0777) != 0) {
-@@ -1675,7 +1675,7 @@
- cached_trash_directories = NULL;
-
- /* read in the entries from disk */
-- cache_file_path = g_build_filename (g_get_home_dir (),
-+ cache_file_path = g_build_filename (gnome_vfs_get_home_dir (),
- TRASH_ENTRY_CACHE_PARENT,
- TRASH_ENTRY_CACHE_NAME,
- NULL);
-@@ -1947,7 +1947,7 @@
- return GNOME_VFS_ERROR_INVALID_URI;
-
- /* We will need the URI and the stat structure for the home directory. */
-- home_directory = g_get_home_dir ();
-+ home_directory = gnome_vfs_get_home_dir ();
-
- if (gnome_vfs_context_check_cancellation (context)) {
- g_free (full_name_near);
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.3-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.3-r1.ebuild
deleted file mode 100644
index d0218c1689fc..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.3-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2010 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.24.3-r1.ebuild,v 1.9 2010/12/26 01:05:29 ssuominen Exp $
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="acl avahi doc fam gnutls hal ipv6 kerberos samba ssl"
-
-RDEPEND=">=gnome-base/gconf-2
- >=dev-libs/glib-2.9.3
- >=dev-libs/libxml2-2.6
- app-arch/bzip2
- fam? ( virtual/fam )
- gnome-base/gnome-mime-data
- >=x11-misc/shared-mime-info-0.14
- >=dev-libs/dbus-glib-0.71
- samba? ( >=net-fs/samba-3 )
- gnutls? (
- net-libs/gnutls
- !gnome-extra/gnome-vfs-sftp )
- ssl? (
- !gnutls? (
- >=dev-libs/openssl-0.9.5
- !gnome-extra/gnome-vfs-sftp ) )
- hal? ( >=sys-apps/hal-0.5.7 )
- avahi? ( >=net-dns/avahi-0.6 )
- kerberos? ( virtual/krb5 )
- acl? (
- sys-apps/acl
- sys-apps/attr )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- gnome-base/gnome-common
- >=dev-util/intltool-0.40
- >=dev-util/pkgconfig-0.9
- >=dev-util/gtk-doc-am-1.13
- doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-schemas-install
- --disable-static
- --disable-cdda
- --disable-howl
- $(use_enable acl)
- $(use_enable avahi)
- $(use_enable fam)
- $(use_enable gnutls)
- $(use_enable hal)
- $(use_enable ipv6)
- $(use_enable kerberos krb5)
- $(use_enable samba)
- $(use_enable ssl openssl)"
- # Useless ? --enable-http-neon
-
- if use hal ; then
- G2CONF="${G2CONF}
- --with-hal-mount=/usr/bin/gnome-mount
- --with-hal-umount=/usr/bin/gnome-umount
- --with-hal-eject=/usr/bin/gnome-eject"
- fi
-
- # this works because of the order of configure parsing
- # so should always be behind the use_enable options
- # foser <foser@gentoo.org 19 Apr 2004
- use gnutls && use ssl && G2CONF="${G2CONF} --disable-openssl"
-
- if ! has_version sys-apps/pmount; then
- ewarn "You should install and setup sys-apps/pmount if you use programs"
- ewarn "which rely on gnome-vfs for mounting."
- fi
-}
-
-src_unpack() {
- gnome2_src_unpack
-
- # Allow the Trash on afs filesystems (#106118)
- epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
-
- # Fix compiling with headers missing
- epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
-
- # Fix for crashes running programs via sudo
- epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
-
- # Fix automagic dependencies, upstream bug #493475
- epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
- epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
-
- # Fix to identify ${HOME} (#200897)
- # thanks to debian folks
- epatch "${FILESDIR}"/${PN}-2.20.0-home_dir_fakeroot.patch
-
- # Configure with gnutls-2.7, bug #253729
- epatch "${FILESDIR}"/${PN}-2.24.0-gnutls27.patch
-
- # Prevent duplicated volumes, bug #193083
- epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
-
- # Fix deprecated API disabling in used libraries - this is not future-proof, bug 212163
- # upstream bug #519632
- sed -i -e '/DISABLE_DEPRECATED/d' \
- daemon/Makefile.am daemon/Makefile.in \
- libgnomevfs/Makefile.am libgnomevfs/Makefile.in \
- modules/Makefile.am modules/Makefile.in \
- test/Makefile.am test/Makefile.in
- sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' \
- programs/Makefile.am programs/Makefile.in
-
- # Fix use of broken gtk-doc.make
- if use doc; then
- sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" -i gtk-doc.make
- else
- sed "/^TARGET_DIR/i \GTKDOC_REBASE=true" -i gtk-doc.make
- fi
-
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
-}
-
-src_test() {
- unset DISPLAY
- # Fix bug #285706
- unset XAUTHORITY
- emake check || die "tests failed"
-}