From: Christian Faulhammer Date: Sat, 10 Feb 2007 23:21:53 +0000 (+0000) Subject: moved from tcltk USE flag to tk, see bug 17808 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e025bc4416cbdad5e8c058c470b07fef8532a09c;p=gentoo.git moved from tcltk USE flag to tk, see bug 17808 Package-Manager: portage-2.1.2-r9 --- diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog index 5e82ca789de5..6a63e7be04e9 100644 --- a/sci-geosciences/grass/ChangeLog +++ b/sci-geosciences/grass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-geosciences/grass # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.31 2007/01/29 01:57:03 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.32 2007/02/10 23:21:53 opfer Exp $ + + 10 Feb 2007; Christian Faulhammer grass-6.0.1.ebuild: + moved from tcltk USE flag to tk, see bug 17808 *grass-6.2.0-r1 (29 Jan 2007) diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index b48bff18df4e..10f964c437c5 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 99grass-6 100 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f SHA1 8ef4acdbb4330b64a51e7b8304f9c68fce17c438 SHA256 dce426f95d7be7f7deae328537ad8666d4ff140dc6de0bb65495f23ad1a5e8f8 MD5 f41ae1ddcca30e1eeea2a74100f36ba4 files/99grass-6 100 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f files/99grass-6 100 @@ -21,18 +24,18 @@ EBUILD grass-5.4.0.ebuild 3192 RMD160 08dac7c025c92c4a7eeae3a3e7f7f2f7a6ca50a9 S MD5 119bb03a015ee0166a60fa6cb7e4b0c9 grass-5.4.0.ebuild 3192 RMD160 08dac7c025c92c4a7eeae3a3e7f7f2f7a6ca50a9 grass-5.4.0.ebuild 3192 SHA256 d21ac808cf821a4f4bd7580429e003386fc6f02a304d36b9706ac2c2d9168630 grass-5.4.0.ebuild 3192 -EBUILD grass-6.0.1.ebuild 3488 RMD160 45e9a1d2bb04359883411ea9ac584074fa2453db SHA1 acce377e3702412573ba792d176777eb1767b8df SHA256 a343c4cdac479b9431b9398c6f407a1484d14085f9a691711dcf1ebc639f984f -MD5 b463776f6a9a072e79ee0db4900af5ea grass-6.0.1.ebuild 3488 -RMD160 45e9a1d2bb04359883411ea9ac584074fa2453db grass-6.0.1.ebuild 3488 -SHA256 a343c4cdac479b9431b9398c6f407a1484d14085f9a691711dcf1ebc639f984f grass-6.0.1.ebuild 3488 +EBUILD grass-6.0.1.ebuild 3413 RMD160 af2b7e41630ad14d87b435c1b4bcab476f0f3a19 SHA1 355f70428f9eed7113b96ff33e89a9e33e4b074c SHA256 d2785eac93d52501d4842fef3fdbd6a3cf8ef427eb8dc06c5cc2f5f90b117286 +MD5 800daabbb4546fbda5c6552e74c83dd6 grass-6.0.1.ebuild 3413 +RMD160 af2b7e41630ad14d87b435c1b4bcab476f0f3a19 grass-6.0.1.ebuild 3413 +SHA256 d2785eac93d52501d4842fef3fdbd6a3cf8ef427eb8dc06c5cc2f5f90b117286 grass-6.0.1.ebuild 3413 EBUILD grass-6.2.0-r1.ebuild 5482 RMD160 1c19ad038869d6e6efac97d6521250837845be23 SHA1 ae3d80600d1efa749f369dec4bf57c08bb6cccd0 SHA256 5007215b0a4ac5e17b3be025b2a5c9c4dc4bb4166ea24247672585b53d848a1a MD5 95bb1922888c4fb07911c55da4d242cc grass-6.2.0-r1.ebuild 5482 RMD160 1c19ad038869d6e6efac97d6521250837845be23 grass-6.2.0-r1.ebuild 5482 SHA256 5007215b0a4ac5e17b3be025b2a5c9c4dc4bb4166ea24247672585b53d848a1a grass-6.2.0-r1.ebuild 5482 -MISC ChangeLog 6936 RMD160 9412c566aec37ba62bb9fb952158349d56e95cf1 SHA1 f865c6aeaa774aa1551fab70dc674460bb28955b SHA256 43b760a873d2aa87812950c663893e09e4c1bdc364737c75b9ffae643bb63da9 -MD5 7811491342bcbe6e78528d498ed0222c ChangeLog 6936 -RMD160 9412c566aec37ba62bb9fb952158349d56e95cf1 ChangeLog 6936 -SHA256 43b760a873d2aa87812950c663893e09e4c1bdc364737c75b9ffae643bb63da9 ChangeLog 6936 +MISC ChangeLog 7059 RMD160 0a913a85af7ed004a90cfacae2d01f00c0c0f627 SHA1 d6facd20bfc1542efac661f9a6ac52b8cb770be7 SHA256 fd7495f0bb8e493c0bf6c8061fee7e4c349f0bc1a0afba727922cf0bf20ecb2a +MD5 c4776fcc3c167e417509e93299ccb05f ChangeLog 7059 +RMD160 0a913a85af7ed004a90cfacae2d01f00c0c0f627 ChangeLog 7059 +SHA256 fd7495f0bb8e493c0bf6c8061fee7e4c349f0bc1a0afba727922cf0bf20ecb2a ChangeLog 7059 MISC metadata.xml 492 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b SHA1 bd8657499f8b6cb3b232684afd63c3b5d915ba5e SHA256 976d5771ed6fbabbeba026b0394186b7735135deb79c86aa9388fc5134467e8e MD5 efddef8657f71e6240e2d838ebf178d1 metadata.xml 492 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b metadata.xml 492 @@ -46,3 +49,10 @@ SHA256 50f9fc1916ee615d2490f1a84ed0321970f39c3664820724950a718becf63fa4 files/di MD5 74a5fc63e9fc9b7b327e0858baa19367 files/digest-grass-6.2.0-r1 241 RMD160 a64da970229d571841614cb1097bd6c7dcc608aa files/digest-grass-6.2.0-r1 241 SHA256 1e1ab91d1ef68251fd0784aa3e9ada0962ed1123bb11fe0dc931aa924ad4c045 files/digest-grass-6.2.0-r1 241 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFFzlNmNQqtfCuFneMRAglTAJ4hRccc0KU7MRHBFNfAcv8Ez6a6eQCfVsAT +tiNiISvAayPzZ2NzcO4hq60= +=LazW +-----END PGP SIGNATURE----- diff --git a/sci-geosciences/grass/grass-6.0.1.ebuild b/sci-geosciences/grass/grass-6.0.1.ebuild index 9b69f621e3de..552bb0804f2f 100644 --- a/sci-geosciences/grass/grass-6.0.1.ebuild +++ b/sci-geosciences/grass/grass-6.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.1.ebuild,v 1.11 2007/01/29 01:57:03 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.1.ebuild,v 1.12 2007/02/10 23:21:53 opfer Exp $ inherit eutils @@ -16,7 +16,7 @@ KEYWORDS="amd64 ppc sparc x86" # To-do: get ppc64 gdal deps fixed up # add gdal back to use flags once grass is fixed -IUSE="fftw jpeg motif mysql nls odbc opengl png postgres readline tcltk tiff truetype" +IUSE="fftw jpeg motif mysql nls odbc opengl png postgres readline tk tiff truetype" RESTRICT="nostrip" @@ -41,26 +41,25 @@ RDEPEND=">=sys-devel/make-3.80 truetype? ( >=media-libs/freetype-2.0 ) nls? ( x11-terms/mlterm ) opengl? ( virtual/opengl ) - tcltk? ( >=dev-lang/tcl-8.3.4 - >=dev-lang/tk-8.3.4 ) + tk? ( >=dev-lang/tk-8.3.4 ) motif? ( x11-libs/openmotif ) || ( - ( x11-libs/libXmu - x11-libs/libXext - x11-libs/libXp - x11-libs/libX11 - x11-libs/libXt - x11-libs/libSM - x11-libs/libICE - x11-libs/libXpm - x11-libs/libXaw ) + ( x11-libs/libXmu + x11-libs/libXext + x11-libs/libXp + x11-libs/libX11 + x11-libs/libXt + x11-libs/libSM + x11-libs/libICE + x11-libs/libXpm + x11-libs/libXaw ) virtual/x11 )" DEPEND="${RDEPEND} || ( - ( x11-proto/xproto x11-proto/xextproto ) - virtual/x11 + ( x11-proto/xproto x11-proto/xextproto ) + virtual/x11 )" src_unpack() { @@ -85,15 +84,15 @@ src_compile() { || MYCONF="${MYCONF} --without-mysql" if use opengl; then - MYCONF="${MYCONF} --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib/" + MYCONF="${MYCONF} --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib/" fi # apparently gdal isn't optional with this version # we'll temporarily make it a hard dep for now # if use gdal; then -# MYCONF="${MYCONF} --with-gdal=/usr/bin/gdal-config" +# MYCONF="${MYCONF} --with-gdal=/usr/bin/gdal-config" # else -# MYCONF="${MYCONF} --without-gdal" +# MYCONF="${MYCONF} --without-gdal" # fi export LD_LIBRARY_PATH="/${WORKDIR}/image/usr/grass60/$(get_libdir):${LD_LIBRARY_PATH}" @@ -109,7 +108,7 @@ src_compile() { `use_enable amd64 64bit` \ `use_with opengl` \ `use_with readline` \ - `use_with tcltk` \ + $(use_with tk tcltk) \ ${MYCONF} || die "Error: configure failed!" emake -j1 || die "Error: emake failed!" } @@ -117,7 +116,7 @@ src_compile() { src_install() { make install \ prefix=${D}/usr UNIX_BIN=${D}/usr/bin BINDIR=${D}/usr/bin PREFIX=${D}/usr \ - || die "Error: make install failed!" + || die "Error: make install failed!" sed -i "s:^GISBASE=.*$:GISBASE=/usr/grass60:" \ ${D}/usr/bin/grass60