sci-geosciences/grass: bump to -7.0.1

Inherit python-single-r1 eclass, three USE flags added and two removed
to update new configure options; set slot operators on required deps,
patches to fix build issues; install desktop file via make_desktop_entry,
tidy EAPI style vars
set new proxy-maintainer 'wraeth', add proxy-maintainers herd in metadata
along with new use flags

Gentoo bug: #514514

Package-Manager: portage-2.2.20.1
This commit is contained in:
Ian Delaney
2015-10-14 23:11:05 +08:00
parent debbe85d13
commit 2fa849db86
5 changed files with 293 additions and 6 deletions

View File

@@ -1 +1,2 @@
DIST grass-6.4.2.tar.gz 24097202 SHA256 670bb74d3000ea0932b7e988d3080d0c629f9eb22a8479bb2987ded473f7b4ca SHA512 537905942965ca949ce241c9e147bb340837f1815d36a1d0170cf18482f66936cb24bda540345d8287a98e4a9275fc129bbc4decf7c3053d123e0f90819b2e5b WHIRLPOOL 65e71c9846f59226bf2ccb3cf224628ac4065dfb2385454083e1db21361e1872192e05763c8a28154f1b536d9b276084efdeb58d730a40f99402ff3e5bf13eb4
DIST grass-7.0.1.tar.gz 33733368 SHA256 0987dd1618fde24b05785a502c7db8c09401a522a7a3ee50543068fab4eb405f SHA512 cb1c356eb19f793530e4e313cc5e81b3be27817eea8961c6e5673b955726e7ae26c38942d6a620dc89c60b8051cdb0ed549c70fdfab8c65f5d17c901521ffaff WHIRLPOOL ed97e45873ea39df32e4ad9ed663087e0077d4bfbbbc9f1fc89729c1d411d550e3354fbc937741c465d94929b6da30311e44926db53fe0f1edb3ce7b850b2266

View File

@@ -0,0 +1,15 @@
diff --git a/general/g.proj/main.c b/general/g.proj/main.c
index 21d7b95..f81b392 100644
--- a/general/g.proj/main.c
+++ b/general/g.proj/main.c
@@ -41,8 +41,8 @@ int main(int argc, char *argv[]) # undeclared var if OSG disabled
*forcedatumtrans; /* Force override of datumtrans parameters */
struct Option *location, /* Name of new location to create */
-#ifdef HAVE_OGR
*inepsg, /* EPSG projection code */
+#ifdef HAVE_OGR
*inwkt, /* Input file with projection in WKT format */
*inproj4, /* Projection in PROJ.4 format */
*ingeo, /* Input geo-referenced file readable by

View File

@@ -0,0 +1,12 @@
diff --git a/lib/raster/open.c b/lib/raster/open.c
index d5a902f..1beada7 100644
--- a/lib/raster/open.c
+++ b/lib/raster/open.c
@@ -19,6 +19,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <errno.h>
#include <grass/config.h>
#include <grass/gis.h>

View File

@@ -0,0 +1,246 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
WANT_AUTOCONF="2.1"
inherit eutils gnome2 multilib python-single-r1 versionator wxwidgets autotools
MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
MY_PM=${MY_PM/.}
MY_P=${P/_rc/RC}
DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
HOMEPAGE="http://grass.osgeo.org/"
SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="7"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="X cairo cxx fftw gdal geos blas lapack regex mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype wxwidgets"
RDEPEND="
>=app-admin/eselect-1.2
sci-libs/proj
sys-libs/gdbm
sys-libs/ncurses:0=
sys-libs/zlib
cairo? ( x11-libs/cairo[X?,opengl?] )
fftw? ( sci-libs/fftw:3.0 )
geos? ( sci-libs/geos )
gdal? ( sci-libs/gdal )
blas? ( virtual/blas )
lapack? ( virtual/lapack )
mysql? ( virtual/mysql )
netcdf? ( sci-libs/netcdf )
odbc? ( dev-db/unixODBC )
opencl? ( virtual/opencl )
opengl? ( virtual/opengl )
png? ( media-libs/libpng:0= )
postgres? ( >=dev-db/postgresql-8.4:= )
readline? ( sys-libs/readline:0= )
sqlite? ( dev-db/sqlite:3 )
tiff? ( media-libs/tiff:0= )
truetype? ( media-libs/freetype:2 )
wxwidgets? ( >=dev-python/wxpython-2.8.10.1:2.8[cairo,opengl?] )
X? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libXaw
x11-libs/libXext
x11-libs/libXmu
x11-libs/libXp
x11-libs/libXpm
x11-libs/libXt
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
sys-devel/flex
sys-devel/gettext
sys-devel/bison
wxwidgets? ( dev-lang/swig )
X? (
x11-proto/xextproto
x11-proto/xproto
)"
S="${WORKDIR}/${MY_P}"
REQUIRED_USE="
opengl? ( X )
wxwidgets? ( X )
"
pkg_setup() {
if use lapack; then
local mylapack
mylapack=$(eselect lapack show) || die
if [[ -z "${mylapack/.*reference.*/}" ]] && \
[[ -z "${mylapack/.*atlas.*/}" ]]; then
ewarn "You need to set lapack to atlas or reference. Do:"
ewarn " eselect lapack set <impl>"
ewarn "where <impl> is atlas, threaded-atlas or reference"
die "setup failed"
fi
fi
if use blas; then
local myblas
myblas=$(eselect blas show) || die
if [[ -z "${myblas/.*reference.*/}" ]] && \
[[ -z "${myblas/.*atlas.*/}" ]]; then
ewarn "You need to set blas to atlas or reference. Do:"
ewarn " eselect blas set <impl>"
ewarn "where <impl> is atlas, threaded-atlas or reference"
die "setup failed"
fi
fi
python-single-r1_pkg_setup
}
src_prepare() {
# Fix undefined reference to errno in lib/raster/open.c
# see http://trac.osgeo.org/grass/changeset/66398
epatch "${FILESDIR}/${P}-include-errno.patch"
# Fix undeclared variable if OSG is disabled
epatch "${FILESDIR}/${P}-declare-inespg.patch"
epatch_user
eautoconf
}
src_configure() {
if use wxwidgets; then
WX_BUILD=yes
WX_GTK_VER=2.8
need-wxwidgets unicode
fi
econf \
--enable-shared \
--disable-w11 \
$(use_with cxx) \
$(use_with tiff) \
$(use_with png) \
$(use_with postgres) \
$(use_with mysql) \
$(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
$(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/mysql") \
$(use_with sqlite) \
$(use_with opengl) \
$(use_with odbc) \
$(use_with fftw) \
$(use_with blas) \
$(use_with lapack) \
$(use_with cairo) \
$(use_with truetype freetype) \
$(use_with truetype freetype-includes "${ROOT}usr/include/freetype2") \
$(use_with nls) \
$(use_with readline) \
--without-opendwg \
$(use_with regex) \
$(use_with threads pthread) \
$(use_with openmp) \
$(use_with opencl) \
$(use_with gdal gdal "${ROOT}usr/bin/gdal-config") \
--without-liblas \
$(use_with wxwidgets wxwidgets "${WX_CONFIG}") \
$(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
$(use_with geos geos "${ROOT}usr/bin/geos-config") \
--with-proj-includes="${ROOT}usr/include/libprojectM" \
--with-proj-libs="${ROOT}usr/$(get_libdir)" \
--with-proj-share="${ROOT}usr/share/proj/" \
$(use_with X x)
}
src_compile() {
# we don't want to link against embedded mysql lib
emake MYSQLDLIB=""
}
src_install() {
emake DESTDIR="${D}" \
INST_DIR="${D}"/usr/${MY_PM} \
prefix="${D}"/usr BINDIR="${D}"/usr/bin \
PREFIX="${D}"/usr/ \
install
pushd "${D}"/usr/${MY_PM} &> /dev/null
# fix docs
dodoc AUTHORS CHANGES
dohtml -r docs/html/*
rm -rf docs/ || die
rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
# manuals
dodir /usr/share/man/man1
rm -rf man/ || die
# translations
if use nls; then
dodir /usr/share/locale/
mv locale/* "${D}"/usr/share/locale/ || die
rm -rf locale/ || die
# pt_BR is broken
mv "${D}"/usr/share/locale/pt_br "${D}"/usr/share/locale/pt_BR || die
fi
popd &> /dev/null
# place libraries where they belong
mv "${D}"/usr/${MY_PM}/lib/ "${D}"/usr/$(get_libdir)/ || die
# place header files where they belong
mv "${D}"/usr/${MY_PM}/include/ "${D}"/usr/include/ || die
# make rules are not required on installed system
rm -rf "${D}"/usr/include/Make || die
# mv remaining gisbase stuff to libdir
mv "${D}"/usr/${MY_PM} "${D}"/usr/$(get_libdir) || die
# get proper folder for grass path in script
sed -i \
-e "1,\$s:^GISBASE.*:GISBASE=/usr/$(get_libdir)/${MY_PM}:" \
"${D}"usr/bin/${MY_PM} || die
# get proper fonts path for fontcap
sed -i \
-e "s|${D}/usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \
"${D}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die
if use X; then
local GUI="-gui"
[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
doicon gui/icons/${PN}-48x48.png
fi
# install .pc file so other apps know where to look for grass
insinto /usr/$(get_libdir)/pkgconfig/
doins grass.pc
# fix weird +x on tcl scripts
find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
}
pkg_postinst() {
if use X; then
fdo-mime_desktop_database_update
gnome2_icon_cache_update
fi
}
pkg_postrm() {
if use X; then
fdo-mime_desktop_database_update
gnome2_icon_cache_update
fi
}

View File

@@ -1,11 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>sci-geosciences</herd>
<longdescription>The original GIS, yes the first one, developed by the US Army Corp of Engineers, now an active open source GIS.
See the GRASS Documentation Project for more info http://grass.itc.it/gdp/index.php
<herd>sci-geosciences</herd>
<herd>proxy-maintainers</herd><maintainer>
<email>wraeth@wraeth.id.au</email>
<name>Sam Jorna</name>
<description>Proxy maintainer - assign bugs to him</description>
</maintainer>
<longdescription>The original GIS, yes the first one, developed by the US
Army Corp of Engineers, now an active open source GIS. See the GRASS Documentation
Project for more info http://grass.itc.it/gdp/index.php
</longdescription>
<use>
<flag name="gmath">Enable gmath wrapper for BLAS/Lapack (<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag>
</use>
<use>
<flag name="gdal">Use <pkg>sci-libs/gdal</pkg> for import and export
of most external raster and vector map formats</flag>
<flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds
extended options to the v.select module</flag>
<flag name="gmath">Enable gmath wrapper for BLAS/Lapack
(<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag>
<flag name="opencl">Enable OpenCL support</flag>
<flag name="regex">Include support regex functionality</flag>
</use>
</pkgmetadata>