commit: 01adcf95566153df774190fcb9faf1320e99c461
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 01:37:46 2017 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 01:49:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01adcf95
sci-geosciences/grass: revbump 7.0.4 to use wxGTK-3
Gentoo-bug: 600986
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../grass/{grass-7.0.4.ebuild => grass-7.0.4-r1.ebuild} | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.0.4.ebuild
b/sci-geosciences/grass/grass-7.0.4-r1.ebuild
similarity index 97%
rename from sci-geosciences/grass/grass-7.0.4.ebuild
rename to sci-geosciences/grass/grass-7.0.4-r1.ebuild
index 828fa14..6ccff6e 100644
--- a/sci-geosciences/grass/grass-7.0.4.ebuild
+++ b/sci-geosciences/grass/grass-7.0.4-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite" # bug 572440
WANT_AUTOCONF="2.1"
+WX_GTK_VER=3.0
inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets
autotools
@@ -19,7 +20,7 @@ HOMEPAGE="http://grass.osgeo.org/";
SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz";
LICENSE="GPL-2"
-SLOT="0/7.0.3"
+SLOT="0/7.0.4"
KEYWORDS="~amd64 ~x86"
IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl
openmp png postgres readline sqlite threads tiff truetype"
@@ -51,7 +52,7 @@ RDEPEND="${PYTHON_DEPS}
tiff? ( media-libs/tiff:0= )
truetype? ( media-libs/freetype:2 )
X? (
- >=dev-python/wxpython-2.8.10.1:2.8[cairo,opengl?]
+ dev-python/wxpython:3.0[cairo,opengl?]
x11-libs/cairo[X,opengl?]
x11-libs/libICE
x11-libs/libSM
@@ -126,7 +127,7 @@ src_prepare() {
epatch "${PATCHES[@]}"
- epatch_user
+ eapply_user
eautoconf
ebegin "Fixing python shebangs"
@@ -137,8 +138,7 @@ src_prepare() {
src_configure() {
if use X; then
WX_BUILD=yes
- WX_GTK_VER=2.8
- need-wxwidgets unicode
+ setup-wxwidgets
fi
addwrite "${ROOT}dev/dri/renderD128"
@@ -196,7 +196,8 @@ src_install() {
# fix docs
dodoc AUTHORS CHANGES
- dohtml -r docs/html/*
+ docinto html
+ dodoc -r docs/html/*
rm -rf docs/ || die
rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
