summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2009-05-15 10:06:19 +0000
committerAlexis Ballier <aballier@gentoo.org>2009-05-15 10:06:19 +0000
commit4da5b61b01c27e526cf8485a16028730ce255261 (patch)
tree4416037659b972d4556287a19bc4be7231697cab /gnome-base
parentadd a live ebuild for the 1.0-bugfix branch (diff)
downloadgentoo-2-4da5b61b01c27e526cf8485a16028730ce255261.tar.gz
gentoo-2-4da5b61b01c27e526cf8485a16028730ce255261.tar.bz2
gentoo-2-4da5b61b01c27e526cf8485a16028730ce255261.zip
dont apply the vfat schemas patch on bsd as it conflicts with our already existing patch
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-mount/ChangeLog7
-rw-r--r--gnome-base/gnome-mount/gnome-mount-0.8-r1.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/gnome-base/gnome-mount/ChangeLog b/gnome-base/gnome-mount/ChangeLog
index 2fa165f7ad6c..0cedd2414462 100644
--- a/gnome-base/gnome-mount/ChangeLog
+++ b/gnome-base/gnome-mount/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/gnome-mount
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.62 2009/04/28 11:20:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.63 2009/05/15 10:06:19 aballier Exp $
+
+ 15 May 2009; Alexis Ballier <aballier@gentoo.org>
+ gnome-mount-0.8-r1.ebuild:
+ dont apply the vfat schemas patch on bsd as it conflicts with our already
+ existing patch
28 Apr 2009; Raúl Porcel <armin76@gentoo.org> gnome-mount-0.8.ebuild:
sh stable
diff --git a/gnome-base/gnome-mount/gnome-mount-0.8-r1.ebuild b/gnome-base/gnome-mount/gnome-mount-0.8-r1.ebuild
index 4f8b6fea5f77..7028eba0662e 100644
--- a/gnome-base/gnome-mount/gnome-mount-0.8-r1.ebuild
+++ b/gnome-base/gnome-mount/gnome-mount-0.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/gnome-mount-0.8-r1.ebuild,v 1.1 2009/02/09 22:28:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/gnome-mount-0.8-r1.ebuild,v 1.2 2009/05/15 10:06:19 aballier Exp $
inherit autotools eutils gnome2
@@ -45,7 +45,7 @@ src_unpack() {
epatch "${FILESDIR}/${PN}-0.6-include-locale-h.patch"
# Better defaults for vfat, bug #257745
- epatch "${FILESDIR}/${P}-vfat-defaults.patch"
+ use kernel_FreeBSD || epatch "${FILESDIR}/${P}-vfat-defaults.patch"
# Fix HAL locking for devices in fstab, bug #257746
epatch "${FILESDIR}/${P}-fstablock.patch"