Remove largefile USE support and default to it

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

5 files changed, 27 insertions, 16 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 10862d4a0751..e28559bc3913 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.94 2011/02/26 21:03:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.95 2011/03/10 19:14:03 jlec Exp $
+
+  10 Mar 2011; Justin Lecher <jlec@gentoo.org> grass-6.3.0.ebuild,
+  grass-6.4.0.ebuild, metadata.xml:
+  Remove largefile USE support and default to it
 
   26 Feb 2011; Raúl Porcel <armin76@gentoo.org> grass-6.3.0.ebuild,
   grass-6.4.0.ebuild:
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 978c217e7b55..8653d4f875df 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX grass-6.3.0-gcc44.patch 387 RMD160 d104b2cbea3ee14d8f266da122d9e4aef63dc6b0 SHA1 1ce70dbb99f64419361816a75e6948d8960d4f4f SHA256 210e7f7f34ec04caf41bd312f5c90c7be206656766e98725f27185e0c8759f80
 AUX grass-6.3.0-html-nonviz.patch 763 RMD160 054b336fcc47d64e56a40d2dda955732047ceb08 SHA1 e8f10078f8cccc5a47d2f2c8bed1d9ace7ed2598 SHA256 e870d724170a9d629a5d0bb8897a2e2f5d1b25eed204a7450061f26d48192981
 AUX grass-6.3.0-o_creat.patch 1469 RMD160 dd2cec8103c07eabd906f3792544bf2225cb1287 SHA1 3bb27a3069abb47b3ac6a9480c508a036d1f3aba SHA256 b9bb9ea09414fbcb00b52520cd4e98147d3de199401efe9996eb6f911fd7ef05
@@ -6,7 +9,14 @@ AUX grass-pkgconf.patch 1322 RMD160 7b48d8e05a07090d8d36d2fb96b385f2d655e066 SHA
 AUX grass_icon.png 4470 RMD160 b4a6deeb6ce859a57c6aba3c4095e2dd718f36e9 SHA1 6839c28ec1d01c486d45a245a159fced3c0d0810 SHA256 c6c873f24bb59b8ff98000b500ca3a047ca86af216b4b7b1593baef5f2fbe6a9
 DIST grass-6.3.0.tar.gz 17688547 RMD160 66db4223fc0d5172371903f71d68f1dd024ad2d2 SHA1 c4b0b1407655f8ed1e16e911df191323fe00eb9e SHA256 a84658a7065a3ece09d3d18a3b601515484d1e5dbb3a92b8fbac3c37e368acf4
 DIST grass-6.4.0.tar.gz 22569021 RMD160 b0bd2d2ce048a5f10f345786bc81fa4bd22df019 SHA1 c91e8501c7a756a94d2be47729f640d33b2a7468 SHA256 1db0422de4bb6146322721760b3c2b310850069ee320e03b6a625e4472f477a7
-EBUILD grass-6.3.0.ebuild 8475 RMD160 d98e04851a515168ca9b513b0c999fb519843218 SHA1 079341bc3c2acb9e17fa2ba44b778c0a9479c0e3 SHA256 963b6594cf6d64b8a1600ec2a1bf0daa1cabfc1e188c53a3bc12d340cd96e853
-EBUILD grass-6.4.0.ebuild 8328 RMD160 fbdbacf15e6af866152ddb16791172f960b69faf SHA1 02892035e691fb8e8cec06beb688ae7d789ef894 SHA256 76daa7b2eaf4af8de16e6e37ac5ed4d321f852662ea05dbca9a53bf1cda88db0
-MISC ChangeLog 18796 RMD160 44382aff1f3cd7293c9168851be537033f72cf29 SHA1 987305630c35a4438e2b20d14ef5c7d46f94eb31 SHA256 fb5831d6a905a92a19f7a6c606215ee77bb1c1cba1991b8594adc53ccacd388b
-MISC metadata.xml 689 RMD160 e86713ba2244d319bd1d76241c6e23d9bbb1ed35 SHA1 e6ef423536dc2e57b8f699fe24fe6af865f747df SHA256 e47a71f5bbefcdbce341e5445a88d1f7954762370a7f15628c56e7a31243f70e
+EBUILD grass-6.3.0.ebuild 8432 RMD160 94af7d9ae466f8997f342ac839d0324bf3ba9301 SHA1 79372cb66b73a3c643b3a8b222cbddde93b2ab12 SHA256 296dd2e6fa966f1c0fe93832a0bb10faf89e2889e34274aed88291cac618655b
+EBUILD grass-6.4.0.ebuild 8276 RMD160 2fd692215c812bd7245e6dc1f7998b8501f1e254 SHA1 17ccb533398a2f8c23f7349c7a3c0bc34a89e556 SHA256 30ea010e658f452bd97031c208d1cf19bd3fbbf272de37d9960cd08501dff15b
+MISC ChangeLog 18946 RMD160 f1b29a9ffaecaa675ae7f5788b14ac55e650ad3f SHA1 6099fe7f22cec58e3b07c54b0a5a2d45398245c7 SHA256 7df18cf381a9550168f2790ef57456268d4e65f7ed4744e45a53dbc62a15cc63
+MISC metadata.xml 623 RMD160 f3ab7360eb95e18d25fa0f35bd8817e8628e3246 SHA1 497c577a971010147239a61515ab66a678881569 SHA256 d6200460324878b71cae01dc1193c77749b88b7c2e723041d9f426487c50c85f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk15IwEACgkQgAnW8HDreRZiBACgziQ3e51FN64Hpk5guxDCV8LJ
+zMYAoJzWAjOj7N2ioE23dz0P91d/INQs
+=fMxN
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/grass/grass-6.3.0.ebuild b/sci-geosciences/grass/grass-6.3.0.ebuild
index 7bceae0af171..8c34e9d156c1 100644
--- a/sci-geosciences/grass/grass-6.3.0.ebuild
+++ b/sci-geosciences/grass/grass-6.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.20 2011/02/26 21:03:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.21 2011/03/10 19:14:03 jlec Exp $
 
 EAPI=1
 
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="6"
 KEYWORDS="amd64 ppc ~ppc64 x86"
 
-IUSE="ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png \
+IUSE="ffmpeg fftw gmath jpeg motif mysql nls odbc opengl png \
 postgres python readline sqlite tiff truetype wxwidgets X"
 
 RESTRICT="strip"
@@ -214,14 +214,14 @@ src_compile() {
 		$(use_with gmath blas) \
 		$(use_with gmath lapack) \
 		$(use_with jpeg) \
-		$(use_enable largefile) \
 		$(use_with motif) \
 		$(use_with nls) \
 		$(use_with odbc) \
 		$(use_with png) \
 		$(use_with postgres) \
 		$(use_with readline) \
-		$(use_with tiff) || die "configure failed!"
+		$(use_with tiff) \
+		--enable-largefile \
 
 	if use wxwidgets; then
 	    # can't use die here since we need to hack the vdigit build
diff --git a/sci-geosciences/grass/grass-6.4.0.ebuild b/sci-geosciences/grass/grass-6.4.0.ebuild
index 855576efbf26..b89437444a33 100644
--- a/sci-geosciences/grass/grass-6.4.0.ebuild
+++ b/sci-geosciences/grass/grass-6.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0.ebuild,v 1.5 2011/02/26 21:03:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0.ebuild,v 1.6 2011/03/10 19:14:03 jlec Exp $
 
 EAPI="3"
 
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="6"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-IUSE="X cairo cxx ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png postgres python readline sqlite tiff truetype wxwidgets"
+IUSE="X cairo cxx ffmpeg fftw gmath jpeg motif mysql nls odbc opengl png postgres python readline sqlite tiff truetype wxwidgets"
 
 TCL_DEPS="
 	>=dev-lang/tcl-8.5
@@ -51,9 +51,7 @@ RDEPEND="
 	)
 	readline? ( sys-libs/readline )
 	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( media-libs/tiff
-		largefile? ( >=media-libs/tiff-4 )
-	)
+	tiff? ( >=media-libs/tiff-4 )
 	truetype? ( media-libs/freetype:2 )
 	X? (
 		x11-libs/libICE
@@ -210,7 +208,6 @@ src_configure() {
 		$(use_with gmath blas) \
 		$(use_with gmath lapack) \
 		$(use_with jpeg) \
-		$(use_enable largefile) \
 		$(use_with mysql) \
 		--with-mysql-includes=/usr/include/mysql \
 		--with-mysql-libs=/usr/$(get_libdir)/mysql \
@@ -224,6 +221,7 @@ src_configure() {
 		$(use_with tiff) \
 		$(use_with truetype freetype) \
 		--with-freetype-includes="/usr/include/freetype2/" \
+		--enable-largefile \
 		${myconf}
 }
 
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index a4ef59093109..e0cbe3e38441 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -11,6 +11,5 @@ See the GRASS Documentation Project for more info http://grass.itc.it/gdp/index.
 </longdescription>
 <use>
   <flag name='gmath'>Enable gmath wrapper for BLAS/Lapack (<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag>
-  <flag name='largefile'>Enable LFS support for huge files</flag>
 </use>
 </pkgmetadata>