| 1 |
scarabeus 10/04/30 08:54:30 |
| 2 |
|
| 3 |
Modified: ChangeLog grass-6.4.0_rc6.ebuild |
| 4 |
Log: |
| 5 |
Opengl requires tcl/tk. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.78 sci-geosciences/grass/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?rev=1.78&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?rev=1.78&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?r1=1.77&r2=1.78 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v |
| 18 |
retrieving revision 1.77 |
| 19 |
retrieving revision 1.78 |
| 20 |
diff -u -r1.77 -r1.78 |
| 21 |
--- ChangeLog 30 Apr 2010 08:48:39 -0000 1.77 |
| 22 |
+++ ChangeLog 30 Apr 2010 08:54:30 -0000 1.78 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for sci-geosciences/grass |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.77 2010/04/30 08:48:39 scarabeus Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.78 2010/04/30 08:54:30 scarabeus Exp $ |
| 28 |
+ |
| 29 |
+ 30 Apr 2010; Tomáš Chvátal <scarabeus@g.o> |
| 30 |
+ grass-6.4.0_rc6.ebuild: |
| 31 |
+ Opengl requires tcl/tk. |
| 32 |
|
| 33 |
*grass-6.4.0_rc6 (30 Apr 2010) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 sci-geosciences/grass/grass-6.4.0_rc6.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc6.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc6.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc6.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: grass-6.4.0_rc6.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc6.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- grass-6.4.0_rc6.ebuild 30 Apr 2010 08:48:39 -0000 1.1 |
| 51 |
+++ grass-6.4.0_rc6.ebuild 30 Apr 2010 08:54:30 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $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 $ |
| 56 |
+# $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 $ |
| 57 |
|
| 58 |
EAPI="3" |
| 59 |
|
| 60 |
@@ -63,7 +63,10 @@ |
| 61 |
x11-libs/libXp |
| 62 |
x11-libs/libXpm |
| 63 |
x11-libs/libXt |
| 64 |
- opengl? ( virtual/opengl ) |
| 65 |
+ opengl? ( |
| 66 |
+ virtual/opengl |
| 67 |
+ ${TCL_DEPS} |
| 68 |
+ ) |
| 69 |
python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1 ) ) |
| 70 |
!python? ( ${TCL_DEPS} ) |
| 71 |
!wxwidgets? ( ${TCL_DEPS} ) |
| 72 |
@@ -123,10 +126,14 @@ |
| 73 |
local myconf TCL_LIBDIR |
| 74 |
|
| 75 |
if use X; then |
| 76 |
+ TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5" |
| 77 |
myconf+=" |
| 78 |
+ --with-tcltk-libs=${TCL_LIBDIR} |
| 79 |
$(use_with opengl) |
| 80 |
--with-x |
| 81 |
" |
| 82 |
+ use opengl && myconf+=" --with-tcltk" |
| 83 |
+ |
| 84 |
if use python && use wxwidgets; then |
| 85 |
WX_BUILD=yes |
| 86 |
WX_GTK_VER=2.8 |
| 87 |
@@ -138,10 +145,9 @@ |
| 88 |
else |
| 89 |
WX_BUILD=no |
| 90 |
# use tcl gui if wxwidgets are disabled |
| 91 |
- TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5" |
| 92 |
+ |
| 93 |
myconf+=" |
| 94 |
--with-tcltk |
| 95 |
- --with-tcltk-libs=${TCL_LIBDIR} |
| 96 |
--without-wxwidgets |
| 97 |
" |
| 98 |
fi |
Archives