| 1 |
nerdboy 08/06/25 04:28:50 |
| 2 |
|
| 3 |
Modified: ChangeLog grass-6.3.0.ebuild |
| 4 |
Log: |
| 5 |
Fixed bug #229297, and checked for any wxpython use flag issues. |
| 6 |
(Portage version: 2.1.5.5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.59 sci-geosciences/grass/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?rev=1.59&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?rev=1.59&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?r1=1.58&r2=1.59 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v |
| 18 |
retrieving revision 1.58 |
| 19 |
retrieving revision 1.59 |
| 20 |
diff -u -r1.58 -r1.59 |
| 21 |
--- ChangeLog 24 Jun 2008 07:45:51 -0000 1.58 |
| 22 |
+++ ChangeLog 25 Jun 2008 04:28:50 -0000 1.59 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for sci-geosciences/grass |
| 25 |
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.58 2008/06/24 07:45:51 nerdboy Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.59 2008/06/25 04:28:50 nerdboy Exp $ |
| 28 |
+ |
| 29 |
+ 25 Jun 2008; Steve Arnold <nerdboy@g.o> grass-6.3.0.ebuild: |
| 30 |
+ Fixed oversight (bug #229297) and checked for any wxpython use flag issues; |
| 31 |
+ Tested on both amd64 and x86. |
| 32 |
|
| 33 |
*grass-6.3.0 (24 Jun 2008) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 sci-geosciences/grass/grass-6.3.0.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: grass-6.3.0.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- grass-6.3.0.ebuild 24 Jun 2008 07:45:51 -0000 1.1 |
| 51 |
+++ grass-6.3.0.ebuild 25 Jun 2008 04:28:50 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2008 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.3.0.ebuild,v 1.1 2008/06/24 07:45:51 nerdboy Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.2 2008/06/25 04:28:50 nerdboy Exp $ |
| 57 |
|
| 58 |
inherit eutils distutils fdo-mime versionator wxwidgets |
| 59 |
|
| 60 |
@@ -78,7 +78,8 @@ |
| 61 |
elog "" |
| 62 |
elog "This version enables the experimental wxpython interface, which" |
| 63 |
elog "you may want to try, since the legacy GUI seems a little wonky" |
| 64 |
- elog "in this version; just enable the wxwindows USE flag and build." |
| 65 |
+ elog "in this version; just enable the wxwindows USE flag and rebuild" |
| 66 |
+ elog "grass to use it." |
| 67 |
elog "" |
| 68 |
if use gmath; then |
| 69 |
for d in $(eselect lapack show); do myblas=${d}; done |
| 70 |
@@ -152,8 +153,11 @@ |
| 71 |
--with-tcltk-libs=${TCL_LIBDIR}" |
| 72 |
if use wxwindows; then |
| 73 |
WX_GTK_VER=2.8 |
| 74 |
- need-wxwidgets gtk2 |
| 75 |
- LIBGDI="/usr/$(get_libdir)/python${PYVER}/site-packages/wx-2.8-gtk2-unicode/wx/_gdi_.so" |
| 76 |
+ need-wxwidgets unicode |
| 77 |
+ # The following lib should be there, based on the above and the |
| 78 |
+ # wxpython dependency (in theory). I still need a good way to |
| 79 |
+ # query for the location... |
| 80 |
+ LIBGDI="/usr/$(get_libdir)/python${PYVER}/site-packages/wx-${WX_GTK_VER}-gtk2-unicode/wx/_gdi_.so" |
| 81 |
myconf="${myconf} --with-python --with-wxwidgets=${WX_CONFIG}" |
| 82 |
fi |
| 83 |
else |
| 84 |
@@ -222,7 +226,7 @@ |
| 85 |
|
| 86 |
if use wxwindows; then |
| 87 |
emake -j1 |
| 88 |
- ln -sf "${LIBGDI}" dist.x86_64-pc-linux-gnu/lib/libgdi.so \ |
| 89 |
+ ln -sf "${LIBGDI}" dist.${CHOST}/lib/libgdi.so \ |
| 90 |
|| die "making libgdi link failed" |
| 91 |
cd gui/wxpython/vdigit |
| 92 |
make default -j1 || die "make vdigit failed!" |
| 93 |
|
| 94 |
|
| 95 |
|
| 96 |
-- |
| 97 |
gentoo-commits@l.g.o mailing list |
Archives