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
commit079c159a4fc477ebfe0125437f400b68f3bfd72d (patch)
tree48c8837e26f5ec4a71bc6d1d28af2e8fd88e78f5 /gnome-base
parentadd a live ebuild for the 1.0-bugfix branch (diff)
downloadhistorical-079c159a4fc477ebfe0125437f400b68f3bfd72d.tar.gz
historical-079c159a4fc477ebfe0125437f400b68f3bfd72d.tar.bz2
historical-079c159a4fc477ebfe0125437f400b68f3bfd72d.zip
dont apply the vfat schemas patch on bsd as it conflicts with our already existing patch
Package-Manager: portage-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/Manifest14
-rw-r--r--gnome-base/gnome-mount/gnome-mount-0.8-r1.ebuild4
3 files changed, 20 insertions, 5 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/Manifest b/gnome-base/gnome-mount/Manifest
index 809148948a8e..bb5d1dfe2b6f 100644
--- a/gnome-base/gnome-mount/Manifest
+++ b/gnome-base/gnome-mount/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX gnome-mount-0.6-freebsd-schemas.patch 2554 RMD160 73783e4a8dd6a753530b50b970777624c915ab0d SHA1 e24311a3aec500ec5218b2f5ea0ddf2ee08e90b5 SHA256 0b4911f49c1e9906022348d03f697dbe0b600ee99d62096eb429d43d1f233a87
AUX gnome-mount-0.6-include-locale-h.patch 253 RMD160 3a45892d5117e42f5cda39fa3dbdfcde484e5609 SHA1 f071c5e6ec8ca4f2b26e5c8439937da9f3301091 SHA256 c848331ed247eb678c759a07bcc9cbbed443f6a38009d8d035ba2516b7552e2f
AUX gnome-mount-0.8-fstablock.patch 3281 RMD160 7b0d5f5f4ba4bed2776488425a732708f6155080 SHA1 50f06c9dd1d903cca6b96d9cd20f42692b3be837 SHA256 1aa891d6c578458ee4b465b8a27172edb826fe8b589fabf5a8ff4418b10f8a5a
@@ -8,7 +11,14 @@ DIST gnome-mount-0.7.tar.gz 484021 RMD160 b920e428f1d4e7020150b8ad588ad35f3c822a
DIST gnome-mount-0.8.tar.gz 505788 RMD160 003800eda3edb7747714b1002bd1a1b50ea44fe9 SHA1 846ba178cf9009f3e32c7f55f912b3ca6b9ecedb SHA256 44ca6b78b49a4181435e489c7b7d416c8f26442dcecdc01ec4b981274ed957e2
EBUILD gnome-mount-0.6.ebuild 1165 RMD160 fa66e47f22c781468f6b4136161be6e9c2b22e49 SHA1 004d2e983b326dc0a0840f9d5fa328f0d409c39c SHA256 6f591fb7702f4a935c0595aca55faf5ac0d35733da9a733c844007f1918dd4c7
EBUILD gnome-mount-0.7.ebuild 1082 RMD160 8d7dc958c21ed86a3927b9c454cd0e3b832bebd2 SHA1 c8e3b6c4afeed34f1b486e2ccb8fa26a9a842c7e SHA256 abc379789094532ba83b160955ad952cb8e9c8e939d71953053d12a971058a46
-EBUILD gnome-mount-0.8-r1.ebuild 1595 RMD160 dc014081f28e3a17ac7c4841bb0c84a933a7fe62 SHA1 1c54be643dda525229386a03667eff013a2ad86c SHA256 b0a7116d281b71f3af536909f3c202b875d67b8fbfd14804ffad2b18ca0fb2d6
+EBUILD gnome-mount-0.8-r1.ebuild 1622 RMD160 1f797b2c092cc95fdc1a142f87a4459a8e694614 SHA1 3f75ac9adc603f3f8495986c5024dd47f8dd3f08 SHA256 d03b189bc4e314ee1431fc71c038ea963eeabd74e3f07b28066e82ad9123a49d
EBUILD gnome-mount-0.8.ebuild 1244 RMD160 5e80c829a9a7749a4bb2063fdddcaf3b25f7202a SHA1 0b7cf7d9787c00e172d799a008feba98d7e62a7a SHA256 3233e2ac7836e8a90a235559fee9ce6b23ce641c7b9cc2f90287ec45b5f7e6eb
-MISC ChangeLog 8727 RMD160 af4457afe203ad019f95d76b24be4bfb6e7b2663 SHA1 8f9345b733177f9818fad9c3e8e9334eabb6fa87 SHA256 fb4549d759050a7598b877f17070fb4810d54c1c3387707b583bc60c75fd98aa
+MISC ChangeLog 8903 RMD160 dd644f587488f0032d43fc61ea66ab589b74ec09 SHA1 e8f00b42969a2225b38914ffeb7a3fc87d7573c7 SHA256 9f17acf7524de7fb8acf95007f621fbddcf4263464c167ea8c8355e41706464e
MISC metadata.xml 254 RMD160 6a737fb45f6f2fd20426f7b0bbaece103a1cf891 SHA1 5320b8e2ae1cdee69cc65091497d9e100c364e64 SHA256 f9d82c574f40e1436601a877ad0895aff511f02edd3656608279ccad35650a31
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoNPp4ACgkQvFcC4BYPU0oZxACgpJ8K4TXbOtsbFAASIhE9dhpR
+hFkAniibo6mQPotF8OkSJbuVHON2POZi
+=svIq
+-----END PGP SIGNATURE-----
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"