From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-870228-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 4449159CA3
	for <garchives@archives.gentoo.org>; Tue, 15 Mar 2016 23:26:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 6EE88E080A;
	Tue, 15 Mar 2016 23:26:42 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id E2D2AE080A
	for <gentoo-commits@lists.gentoo.org>; Tue, 15 Mar 2016 23:26:41 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id E4D383408A2
	for <gentoo-commits@lists.gentoo.org>; Tue, 15 Mar 2016 23:26:38 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 4EE41852
	for <gentoo-commits@lists.gentoo.org>; Tue, 15 Mar 2016 23:26:36 +0000 (UTC)
From: "Sam Jorna" <wraeth@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam Jorna" <wraeth@gentoo.org>
Message-ID: <1458084371.eeffd18a64671df7b3fde34445c5f23775021ac9.wraeth@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-geosciences/grass/Manifest sci-geosciences/grass/grass-7.0.3.ebuild
X-VCS-Directories: sci-geosciences/grass/
X-VCS-Committer: wraeth
X-VCS-Committer-Name: Sam Jorna
X-VCS-Revision: eeffd18a64671df7b3fde34445c5f23775021ac9
X-VCS-Branch: master
Date: Tue, 15 Mar 2016 23:26:36 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 88065409-381e-44af-a3d1-70434274032a
X-Archives-Hash: 56743927b95bcb6894784e85e0582b58

commit:     eeffd18a64671df7b3fde34445c5f23775021ac9
Author:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 23:26:02 2016 +0000
Commit:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 23:26:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeffd18a

sci-geosciences/grass: bump to 7.0.3

Version bump to 7.0.3, make usedep on python sqlite unconditional as
per bug #572440, add missing dep.

Gentoo-bug: 574494
Gentoo-bug: 572440
Package-Manager: portage-2.2.28

 sci-geosciences/grass/Manifest           |   1 +
 sci-geosciences/grass/grass-7.0.3.ebuild | 270 +++++++++++++++++++++++++++++++
 2 files changed, 271 insertions(+)

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 09a6c76..f620e10 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1,3 @@
 DIST grass-7.0.1.tar.gz 33733368 SHA256 0987dd1618fde24b05785a502c7db8c09401a522a7a3ee50543068fab4eb405f SHA512 cb1c356eb19f793530e4e313cc5e81b3be27817eea8961c6e5673b955726e7ae26c38942d6a620dc89c60b8051cdb0ed549c70fdfab8c65f5d17c901521ffaff WHIRLPOOL ed97e45873ea39df32e4ad9ed663087e0077d4bfbbbc9f1fc89729c1d411d550e3354fbc937741c465d94929b6da30311e44926db53fe0f1edb3ce7b850b2266
 DIST grass-7.0.2.tar.gz 38102415 SHA256 2eabd84c5426c675b7f3046213bbacb0cee9d0225df15e1530b93f43ec6b190b SHA512 5f6432263e4d52c914dfdd2bc8199f32c8f366b0ffae6a178033af7eee7b3c2632668b3d3cd70219969ecfd5ad6abefe6e65f0eaf72f27784fea3b4b9d51acfe WHIRLPOOL e1f5a90e793db74bcdf891b5f5a00c2bafa2842a6415ec433a45d6604d4943aa3d95b6e4d95265753a4ee8fc6819ec1b66ddea2d11802ac1c7a37150f7cea6d1
+DIST grass-7.0.3.tar.gz 40022685 SHA256 6c414938d831583b97554cb49698529310defba467b11f6a85caf6ca405680df SHA512 93d9e5c2983b41f88f5170923267eb54328124a179fc391893e88eaa9670a608b4b7d339d0043d338a98cb5ef532e19411cd46155a69e6f06a6b28696056add6 WHIRLPOOL 2f171e056c179fc31845dc28e5d354ab8f990c462b65ce5a4b26c89261b6757b781c86bb1ab6f29efb3bde0df29bfa432e4f13d7dc61166b761a6edfa3614246

diff --git a/sci-geosciences/grass/grass-7.0.3.ebuild b/sci-geosciences/grass/grass-7.0.3.ebuild
new file mode 100644
index 0000000..828fa14
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.0.3.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"  # bug 572440
+WANT_AUTOCONF="2.1"
+
+inherit eutils gnome2 fdo-mime 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="0/7.0.3"
+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"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-admin/eselect-1.2
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libprojectm
+	sci-libs/proj
+	sci-libs/xdrfile
+	sci-libs/gdal
+	sys-libs/gdbm
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	fftw? ( sci-libs/fftw:3.0 )
+	geos? ( sci-libs/geos )
+	blas? ( virtual/blas
+		sci-libs/cblas-reference )
+	lapack? ( virtual/lapack )
+	liblas? ( sci-geosciences/liblas )
+	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 )
+	X? (
+		>=dev-python/wxpython-2.8.10.1:2.8[cairo,opengl?]
+		x11-libs/cairo[X,opengl?]
+		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
+	X? (
+		dev-lang/swig
+		x11-proto/xextproto
+		x11-proto/xproto
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	opengl? ( X )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch
+)
+
+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 unversioned python calls
+	local pyver=${EPYTHON/python/}
+	sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die
+	sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die
+
+	# fix header being unconditionally included
+	# see upstream https://trac.osgeo.org/grass/ticket/2779
+	sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
+		-i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
+
+	epatch "${PATCHES[@]}"
+
+	epatch_user
+	eautoconf
+
+	ebegin "Fixing python shebangs"
+	python_fix_shebang -q "${S}"
+	eend $?
+}
+
+src_configure() {
+	if use X; then
+		WX_BUILD=yes
+		WX_GTK_VER=2.8
+		need-wxwidgets unicode
+	fi
+
+	addwrite "${ROOT}dev/dri/renderD128"
+
+	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 X cairo) \
+		$(use_with truetype freetype) \
+		$(use_with truetype freetype-includes "${ROOT}usr/include/freetype2") \
+		$(use_with nls) \
+		$(use_with readline) \
+		--without-opendwg \
+		--with-regex \
+		$(use_with threads pthread) \
+		$(use_with openmp) \
+		$(use_with opencl) \
+		--with-gdal="${ROOT}usr/bin/gdal-config" \
+		$(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
+		$(use_with X 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 CC="$(tc-getCC)" 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 || die
+
+	# 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 || die
+
+	# 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
+	local gisbase
+	gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}"
+	sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \
+		-i "${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
+
+	# set proper python interpreter
+	sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || 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 -s 48 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
+}