diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2008-09-21 21:23:39 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2008-09-21 21:23:39 +0000 |
| commit | 119a86d2f6e4267460bdfa6c5fd5f08ec2845776 (patch) | |
| tree | 94f6c16715c5f8e4b55ff0cecf00bebf4c37f310 /sci-geosciences | |
| parent | Fix patch, xor is more elegant. (diff) | |
| download | historical-119a86d2f6e4267460bdfa6c5fd5f08ec2845776.tar.gz historical-119a86d2f6e4267460bdfa6c5fd5f08ec2845776.tar.bz2 historical-119a86d2f6e4267460bdfa6c5fd5f08ec2845776.zip | |
updated for bug #237495 (forces python when wxwindows is enabled)
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.5 x86_64
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/grass/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-geosciences/grass/Manifest | 4 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-6.3.0.ebuild | 13 |
3 files changed, 14 insertions, 8 deletions
diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog index 1ca5405d8e55..089bd3923a87 100644 --- a/sci-geosciences/grass/ChangeLog +++ b/sci-geosciences/grass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-geosciences/grass # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.62 2008/08/14 07:07:57 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.63 2008/09/21 21:23:39 nerdboy Exp $ + + 21 Sep 2008; Steve Arnold <nerdboy@gentoo.org> grass-6.3.0.ebuild: + Updated for bug #237495 (forces python when wxwindows is enabled). 14 Aug 2008; Steve Arnold <nerdboy@gentoo.org> grass-6.2.0-r1.ebuild, grass-6.2.1.ebuild, grass-6.2.3.ebuild, grass-6.3.0.ebuild: diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index a1ed111ec500..8725a3986c6b 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -19,6 +19,6 @@ EBUILD grass-6.0.1.ebuild 3185 RMD160 9861427db9a4a846941eacd6d8f35cb057460d1b S EBUILD grass-6.2.0-r1.ebuild 5419 RMD160 42562878ea957f71624c075d94d1cf219123093e SHA1 9eb7146dc71e5b65485a8caa50102fec635f9406 SHA256 71bc9f7a977860bbf8e2eae83efc205a57fd70c2cd00aa6a9dd98663c5f90bf3 EBUILD grass-6.2.1.ebuild 6507 RMD160 4f383e98f43b50e6cc3ca594e33c1b80cafcfaed SHA1 fc78c4076f8d15f53ff568e5f031ac565f7705b4 SHA256 cbf66c333e16f85979aaaba47614fe8798aa6f30948083968ef30b83bd1a231a EBUILD grass-6.2.3.ebuild 7022 RMD160 5aaf43cbcf3cd3878e2439b24e8a0b5e9bcbcb26 SHA1 4080ab8f4bde1d41fb832d8a83f0119276d42d7f SHA256 3055f55ade77a246c9574c486d8e0273fed40e7283555f501ebcb3c3b6f9b843 -EBUILD grass-6.3.0.ebuild 8486 RMD160 99136c099ae16e5e9418ec7683df7c84b8165cbe SHA1 77d04fe44e07d4929977ada16754e0f9f0ca41a3 SHA256 b35a85fa662e6f5930901d9a2d378b052e700e56b798392c823daa80889ad2fd -MISC ChangeLog 12934 RMD160 c8839bbf53c06de8f25a27cc0dfabcdb8b33aaed SHA1 3f2df7f3be1977e338ccb1a340e85168693ed37d SHA256 37285edb2dad4a8204498f86b3bbd4eddac7a2b70e54f54150660de4c9b93308 +EBUILD grass-6.3.0.ebuild 8623 RMD160 2e63643ed183d68bbfad2b825c926c825d37f126 SHA1 a04ba50043d9a316786f44a7a14eb13d9f95d867 SHA256 113d484f1d713876f0620cfcbf97277353a57c674f229e58837e4a73050cf00c +MISC ChangeLog 13073 RMD160 8f3783938c89437d2a9e7fc4631f5f9135fdd1c5 SHA1 c45a355ec68d8f6250d4a0dbd1d0ee2ec55fd9bd SHA256 6600f1ada88687cc83c32557d5b089902ef085d12324b5388c398ecbded601c2 MISC metadata.xml 874 RMD160 af77ae02605e55ba00b9b9214f675184920ca3f4 SHA1 28750209e745c85d4b1b1b5cd34b2db337f2882d SHA256 7793471ab20fc541e0c7fb7ec42593450a32efdee19da114ac656c57a118c781 diff --git a/sci-geosciences/grass/grass-6.3.0.ebuild b/sci-geosciences/grass/grass-6.3.0.ebuild index e25e74eb5eba..d71f29d52ea1 100644 --- a/sci-geosciences/grass/grass-6.3.0.ebuild +++ b/sci-geosciences/grass/grass-6.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.3 2008/08/14 07:07:57 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.4 2008/09/21 21:23:39 nerdboy Exp $ inherit eutils distutils fdo-mime versionator wxwidgets @@ -77,8 +77,8 @@ pkg_setup() { local myblas elog "" elog "This version enables the experimental wxpython interface, which" - elog "you may want to try, since the legacy GUI seems a little wonky" - elog "in this version; just enable the wxwindows USE flag and rebuild" + elog "you may want to try. If the legacy GUI seems a little wonky in" + elog "this version, just enable the wxwindows USE flag and rebuild" elog "grass to use it." elog "" if use gmath; then @@ -133,7 +133,8 @@ src_unpack() { src_compile() { local myconf - use python || use wxindows && distutils_python_version + # wxwindows needs python (see bug #237495) + use wxwindows && distutils_python_version myconf="--prefix=/usr --with-cxx --enable-shared \ --with-gdal=$(type -P gdal-config) --with-curses --with-proj \ @@ -159,6 +160,9 @@ src_compile() { # query for the location... LIBGDI="/usr/$(get_libdir)/python${PYVER}/site-packages/wx-${WX_GTK_VER}-gtk2-unicode/wx/_gdi_.so" myconf="${myconf} --with-python --with-wxwidgets=${WX_CONFIG}" + else + # USE=python must be enabled above if wxwindows is enabled + myconf="${myconf} $(use_with python) --without-wxwidgets" fi else myconf="${myconf} --without-tcltk --without-x" @@ -220,7 +224,6 @@ src_compile() { $(use_with odbc) \ $(use_with png) \ $(use_with postgres) \ - $(use_with python) \ $(use_with readline) \ $(use_with tiff) || die "configure failed!" |