From cfe3085898b714794b1afb7a1d8279dc2c20d4b5 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Tue, 9 Mar 2010 17:57:08 +0000 Subject: [PATCH] Version bump (bug #308493), fix pulling in of sys-fs/fuse if external-fuse is turned off (bug #282408). Package-Manager: portage-2.1.8.2/cvs/Linux x86_64 --- sys-fs/ntfs3g/ChangeLog | 6 +++++- sys-fs/ntfs3g/Manifest | 10 ++++++---- sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild | 16 ++++++++++++++-- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/sys-fs/ntfs3g/ChangeLog b/sys-fs/ntfs3g/ChangeLog index 223ae72168c6..24ddae60fb87 100644 --- a/sys-fs/ntfs3g/ChangeLog +++ b/sys-fs/ntfs3g/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/ntfs3g # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.91 2010/03/09 17:35:47 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.92 2010/03/09 17:57:08 chutzpah Exp $ + + 09 Mar 2010; Patrick McLean ntfs3g-2010.3.6.ebuild: + Version bump (bug #308493), fix pulling in of sys-fs/fuse if external-fuse + is turned off (bug #282408). *ntfs3g-2010.3.6 (09 Mar 2010) diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest index a0e6ee93a646..4dcc474b069d 100644 --- a/sys-fs/ntfs3g/Manifest +++ b/sys-fs/ntfs3g/Manifest @@ -7,17 +7,19 @@ DIST ntfs-3g-2009.11.14.tgz 824103 RMD160 15378f5d54ba93fad21ba2de8e34c36c38ea9b DIST ntfs-3g-2009.3.8.tgz 652489 RMD160 01f723861da5e6d761a570c7eb9a690139b76a32 SHA1 532ae4b6c58ec246eba3b6fc7f0fca78a01cd49b SHA256 c3d54a0f52e558ef21108c3d8aac5f444239178ce75d8bd29f293a1a0b8a4772 DIST ntfs-3g-2009.4.4.tgz 652496 RMD160 d11b452794dc454396019beacd5f98faa757211f SHA1 a8e54d38e8cae1cdd1178bbbb42a1e5670ae7089 SHA256 bcd39ebe90541f512e605b62911f14f6107239c4ff032d56d5da3dc3c05e0d0f DIST ntfs-3g-2010.1.16.tgz 824098 RMD160 0cf54a744e1a0d4be22947ae6bde8517f0bfea78 SHA1 fb0c820eac3a8e5ac5a6e23b95eca19866ead538 SHA256 223cf09633d59afc820882f0ebf0014f877afaaca65647b34ad17c66f450eda4 +DIST ntfs-3g-2010.3.6.tgz 837069 RMD160 9a6f69d43a6f59aa2251452fec8f2000e7b15f89 SHA1 ddbecaf15ab8a679024a2c934e692942eaf0d44b SHA256 cca0a36e914824f626b4f6f94318f84ca0d9996ad61e161fe112a6401601895f EBUILD ntfs3g-2009.11.14.ebuild 1469 RMD160 c649274e3ef465ea22c6df57175b38d6d36ae13f SHA1 f82ff1457b4429f12d3b6928daa732fce3d1f058 SHA256 2adc096362dcb2d013692d311b1b4ea7b22ad2c47764755bd1e445fec66c658e EBUILD ntfs3g-2009.3.8.ebuild 1296 RMD160 ff6c77f4901e9d892272f15bd8ebbbe764932ca5 SHA1 c7d6653835e1fa7fd548e8ca44d6f888a9bf343c SHA256 65e889741ee16813c64d3da8bbc30a1ce6ed26ba02a5180055d8db9018682ec7 EBUILD ntfs3g-2009.4.4-r1.ebuild 1419 RMD160 e527d06f1aea8c976313544b96ce33357b8283f0 SHA1 f2f83570bdcfc87ba7242bcb13ac9a3b1f335993 SHA256 b339f1f7ae99c7fe6b7b928536f6b32936b3246d71125ce4400be877e612df80 EBUILD ntfs3g-2009.4.4.ebuild 1418 RMD160 de06f3e3d71fa1f87c79b5d669e165d37cfba9bb SHA1 b72a08e7e259a7412ed40d2950636101751aa458 SHA256 e1309ec9cfdca705e97a59b7414d71fdd46f408adbf330063775b915454dfc20 EBUILD ntfs3g-2010.1.16.ebuild 1507 RMD160 e23cc5604347db06471ef59cbd19f059ac395b59 SHA1 a5e2cc091cb3069e3182e7fb4f8af4c29468ad93 SHA256 1456cb73e2f84844a8647e347e8798d67b8d36495f58075631e7bf93088376d1 -MISC ChangeLog 14590 RMD160 fe4b1c56bc415828d1265a366cb50c582e69a68c SHA1 25b88446cf6d30488a7708bdaa9a8bdb36049be8 SHA256 7a70bc367d546afafef99cde6ec9c19d0017747576dac7b4d521a89f01943dbf +EBUILD ntfs3g-2010.3.6.ebuild 1800 RMD160 2cb84f7ea612b06140b2a005bcee40dc1891a0cd SHA1 4e3d5cfc31d77526ad8e5a3ac3aa9dc2d2d64b65 SHA256 26317293c764dbeba3cd5ee2f6857bda02777545a0af19bf1e3a2826ae9e76c9 +MISC ChangeLog 14917 RMD160 7a2059c2c8787c2fc7f847f6de7eb33771331d59 SHA1 2ba05203359ff41f94daadf6f4a7f27622682e38 SHA256 297be67206e5fd180253f3bd49f1fcd84846f7b9bd0e9d1381070dd3a17adafe MISC metadata.xml 788 RMD160 6528c9e9099b23bd832e4d39c74cae7473142d4a SHA1 2bac5c9df750610addbb7a78bdcf32bf1d9c1973 SHA256 b2cd22af199923e1180a22ba5bc65f98e3e3070be84001ee8b7ca41693a74afa -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAktyLE4ACgkQcsIHjyDViGTGkACgzSER5A/iItEFaXm9npmYAXZN -UaoAn1IXT/6rv7eZJyWVN4A4LX8UpisT -=yqg/ +iEYEARECAAYFAkuWi/0ACgkQWt/XSf2CZdnYWwCcDPm6Y5FwhkINDNFaoMVvkYYu +YjcAn0v3LL6aVvLdIDtSi3tOjODgG8sM +=tdlk -----END PGP SIGNATURE----- diff --git a/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild b/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild index 2cd6a7b3adff..926ebe0e68ea 100644 --- a/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild +++ b/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild,v 1.1 2010/03/09 17:35:47 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2010.3.6.ebuild,v 1.2 2010/03/09 17:57:08 chutzpah Exp $ EAPI=2 +inherit linux-info MY_PN="${PN/3g/-3g}" MY_P="${MY_PN}-${PV}" @@ -16,13 +17,24 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="acl debug hal suid +external-fuse" -RDEPEND=">=sys-fs/fuse-2.6.0 +RDEPEND="external-fuse? ( >=sys-fs/fuse-2.6.0 ) hal? ( sys-apps/hal )" DEPEND="${RDEPEND} sys-apps/attr" S="${WORKDIR}/${MY_P}" +pkg_setup() { + if use external-fuse && use kernel_linux; then + if kernel_is lt 2 6 9; then + die "Your kernel is too old." + fi + CONFIG_CHECK="~FUSE_FS" + FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g" + linux-info_pkg_setup + fi +} + src_configure() { econf \ --docdir="/usr/share/doc/${PF}" \ -- 2.26.2