diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-04-30 08:54:30 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-04-30 08:54:30 +0000 |
| commit | 91e5ef911e48ae45cc46a2e22e670966fabd17ff (patch) | |
| tree | 1571308b7edcc491a354c2d992b8ff4163a87897 /sci-geosciences | |
| parent | Add new rc version (in-progress) (diff) | |
| download | historical-91e5ef911e48ae45cc46a2e22e670966fabd17ff.tar.gz historical-91e5ef911e48ae45cc46a2e22e670966fabd17ff.tar.bz2 historical-91e5ef911e48ae45cc46a2e22e670966fabd17ff.zip | |
Opengl requires tcl/tk.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/grass/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/grass/Manifest | 10 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-6.4.0_rc6.ebuild | 14 |
3 files changed, 20 insertions, 10 deletions
diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog index 7764b824e8d0..05ca2ba96e00 100644 --- a/sci-geosciences/grass/ChangeLog +++ b/sci-geosciences/grass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-geosciences/grass # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.77 2010/04/30 08:48:39 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.78 2010/04/30 08:54:30 scarabeus Exp $ + + 30 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> + grass-6.4.0_rc6.ebuild: + Opengl requires tcl/tk. *grass-6.4.0_rc6 (30 Apr 2010) diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 6494c11a9317..8e22e4cba961 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -24,13 +24,13 @@ EBUILD grass-6.0.1.ebuild 3185 RMD160 9861427db9a4a846941eacd6d8f35cb057460d1b S EBUILD grass-6.2.1.ebuild 5898 RMD160 55aa97b65c844a9e436f403ea2f8e49aa16620c7 SHA1 57a97027573fb96ebafca2d820b8693b56aedc62 SHA256 fb54121425315410f9cc174b67819ba3d7eb84cc3e9d68ee1d52a2b703879ca1 EBUILD grass-6.3.0.ebuild 8584 RMD160 1bca3fa24ec28bcf0fe1fed886887cb18870c199 SHA1 670624f4df9bb9599ea6e6b25e956d0dabc1ff77 SHA256 a58832dc2a9f23b8136a8c10277c8590ce4aed2240ce042fa77859d1288e2d74 EBUILD grass-6.4.0_rc5.ebuild 7659 RMD160 eaca7a1d7ade7f259bdfdfdbd4bd7905667568a3 SHA1 1aea332d6ab2cf7fdfd2fdd6de1005dede18fed9 SHA256 ad1be0cdf195dc708bbbca82777adad31a4bf4b7fd94180c3ed85b01bbf3254b -EBUILD grass-6.4.0_rc6.ebuild 6368 RMD160 e8d6e8fe1fa76ccb1eba49004ecc5770deb3a2e8 SHA1 c390256588a2ab16c2fb5172e3e199e6c1827d2d SHA256 dd9eba564e2b1927cd8223c98e08202107c04edfac7da5e9aa6de89f41d58c64 -MISC ChangeLog 15942 RMD160 5ba53d0471719ebe69b354df47dfe365f8cd5f30 SHA1 106d56fe3aea3951c7eb60a0e1c2d89aaae495bb SHA256 3be7a5da0ab53893a5f6b7838c932a9d4a29dd88176a58f1cbadd2231f5219cf +EBUILD grass-6.4.0_rc6.ebuild 6431 RMD160 5f132946ccb7547ef1966de654a4679940451337 SHA1 979c829a1ed6c32e9f4372326b87a3ff158be1cc SHA256 960186826e788827fd10b3005656435642a4dbeabfe3bb604904a7cc233f6fd7 +MISC ChangeLog 16050 RMD160 b0e44027ac659b6248b205c420c6b724205d891a SHA1 be677452dc987b6771e4321815d4450ce42e3a53 SHA256 00fdae7c65d11453f5171b9f67cb55469d5cc9ee0aa7b53470846f59fb79b063 MISC metadata.xml 783 RMD160 1b1fa970a119a29ee5502815e2dd8103be600526 SHA1 75c6aef32f661f74e29c550e84af8b637d70e98d SHA256 2cb454a8c266d344c7830cee33fffde971164a0d3456b6ff0c1f28a76f0034cd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkvamVoACgkQHB6c3gNBRYdgSgCfaU/6poIcIc9hrPqDMmVrRwig -S9QAoJBYdf1jkRnRMnn3QCuhL7WvjHvJ -=Qezc +iEYEARECAAYFAkvamrkACgkQHB6c3gNBRYcR4ACgmErTaoILVWwo+YPPkgG9E9u4 +6W4AnjYMvV/8kknl5ZDNoo7RHQcxYvfq +=klWC -----END PGP SIGNATURE----- diff --git a/sci-geosciences/grass/grass-6.4.0_rc6.ebuild b/sci-geosciences/grass/grass-6.4.0_rc6.ebuild index 03270b543149..7e82743355ac 100644 --- a/sci-geosciences/grass/grass-6.4.0_rc6.ebuild +++ b/sci-geosciences/grass/grass-6.4.0_rc6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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_rc6.ebuild,v 1.1 2010/04/30 08:48:39 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc6.ebuild,v 1.2 2010/04/30 08:54:30 scarabeus Exp $ EAPI="3" @@ -63,7 +63,10 @@ RDEPEND=" x11-libs/libXp x11-libs/libXpm x11-libs/libXt - opengl? ( virtual/opengl ) + opengl? ( + virtual/opengl + ${TCL_DEPS} + ) python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1 ) ) !python? ( ${TCL_DEPS} ) !wxwidgets? ( ${TCL_DEPS} ) @@ -123,10 +126,14 @@ src_configure() { local myconf TCL_LIBDIR if use X; then + TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5" myconf+=" + --with-tcltk-libs=${TCL_LIBDIR} $(use_with opengl) --with-x " + use opengl && myconf+=" --with-tcltk" + if use python && use wxwidgets; then WX_BUILD=yes WX_GTK_VER=2.8 @@ -138,10 +145,9 @@ src_configure() { else WX_BUILD=no # use tcl gui if wxwidgets are disabled - TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5" + myconf+=" --with-tcltk - --with-tcltk-libs=${TCL_LIBDIR} --without-wxwidgets " fi |