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 | 2b0e8e7c4c747b6085c30332522168c69497c1e8 (patch) | |
| tree | e8e305f41af0adc3207df24fbc6b03340d46dd8b /sci-geosciences/grass | |
| parent | Add new rc version (in-progress) (diff) | |
| download | gentoo-2-2b0e8e7c4c747b6085c30332522168c69497c1e8.tar.gz gentoo-2-2b0e8e7c4c747b6085c30332522168c69497c1e8.tar.bz2 gentoo-2-2b0e8e7c4c747b6085c30332522168c69497c1e8.zip | |
Opengl requires tcl/tk.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences/grass')
| -rw-r--r-- | sci-geosciences/grass/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-6.4.0_rc6.ebuild | 14 |
2 files changed, 15 insertions, 5 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/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 |