From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6EB82138330 for ; Thu, 24 May 2018 09:36:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41DDEE0822; Thu, 24 May 2018 09:36:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B766E0822 for ; Thu, 24 May 2018 09:36:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4779D335C30 for ; Thu, 24 May 2018 09:36:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87A7427A for ; Thu, 24 May 2018 09:36:14 +0000 (UTC) From: "Amy Liffey" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Liffey" Message-ID: <1527154507.dcd269d46b29948c6cefc0ca5a855a5180ff87d2.amynka@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.4.0.ebuild X-VCS-Directories: sci-geosciences/grass/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Liffey X-VCS-Revision: dcd269d46b29948c6cefc0ca5a855a5180ff87d2 X-VCS-Branch: master Date: Thu, 24 May 2018 09:36:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f40c835e-9957-40e4-a2fb-37271492df40 X-Archives-Hash: 0041e6c928ea5c01801fd088d902be78 commit: dcd269d46b29948c6cefc0ca5a855a5180ff87d2 Author: Amy Liffey gentoo org> AuthorDate: Wed May 23 21:44:10 2018 +0000 Commit: Amy Liffey gentoo org> CommitDate: Thu May 24 09:35:07 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd269d4 sci-geosciences/grass: version bump 7.4.0 Suggested-by: Thomas Bettler gmail.com> Closes: https://bugs.gentoo.org/645892 Package-Manager: Portage-2.3.24, Repoman-2.3.6 sci-geosciences/grass/Manifest | 1 + sci-geosciences/grass/grass-7.4.0.ebuild | 281 +++++++++++++++++++++++++++++++ 2 files changed, 282 insertions(+) diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 78918b930a1..9aaa7fc6c7a 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1 +1,2 @@ DIST grass-7.2.0.tar.gz 48315008 BLAKE2B 927da2119e199cee7cbf55a172141abfe9ce86499e307b355fec2cdf79ec3424acddc4410e3049e7cade5dd3da39e618af7e1003093f87de5735a981984b46c6 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b +DIST grass-7.4.0.tar.gz 56329374 BLAKE2B 924ecd9ad073dd3c59542a871780397a2516e1f0d912b4644978154ea6305ccf50229655aa7f38ab20f2bf85e4a4783cd793fff5101423dd6c212108d638d1df SHA512 b0393ec5d149e2146cc1f30cdcea00e31039bf0a2541486ab0ecd5debe260d267d74e60761b45ce306ad9942264cce9134dbafbf3c75a55df1c610499877d321 diff --git a/sci-geosciences/grass/grass-7.4.0.ebuild b/sci-geosciences/grass/grass-7.4.0.ebuild new file mode 100644 index 00000000000..a5e3ddaf60e --- /dev/null +++ b/sci-geosciences/grass/grass-7.4.0.ebuild @@ -0,0 +1,281 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" # bug 572440 +WANT_AUTOCONF="2.1" +WX_GTK_VER=3.0 + +inherit autotools gnome2 python-single-r1 versionator wxwidgets xdg-utils + +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.4.0" +KEYWORDS="~amd64 ~ppc ~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:3.0[cairo,opengl?] + x11-libs/cairo[X,opengl?] + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXt + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + sys-devel/flex + sys-devel/gettext + sys-devel/bison + X? ( + dev-lang/swig + x11-base/xorg-proto + )" + +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + opengl? ( X )" + +PATCHES=( + "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch +) + +#pre_pkg_setup() { +# export LIBS="$(pkg-config --libs libtirpc) ${LIBS}" +# export CPPFLAGS="$(pkg-config --cflags libtirpc) ${CPPFLAGS}" +# einfo "LIBS='${LIBS}' CPPFLAGS='${CPPFLAGS}' # bug #588980" +#} + +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 " + ewarn "where 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 " + ewarn "where 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 \):#ifdef HAVE_OGR\n\1\n#endif:' \ + -i "${S}/vector/v.external/main.c" || die "failed to sed main.c" + + default + eautoconf + + ebegin "Fixing python shebangs" + python_fix_shebang -q "${S}" + eend $? + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + shopt -s nullglob + mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl + +} + +src_configure() { + if use X; then + WX_BUILD=yes + setup-wxwidgets + fi + + addwrite "${EPREFIX}/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 "${EPREFIX}/usr/include/mysql") \ + $(use_with mysql mysql-libs "${EPREFIX}/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 "${EPREFIX}/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="${EPREFIX}/usr/bin/gdal-config" \ + $(use_with liblas liblas "${EPREFIX}/usr/bin/liblas-config") \ + $(use_with X wxwidgets "${WX_CONFIG}") \ + $(use_with netcdf netcdf "${EPREFIX}/usr/bin/nc-config") \ + $(use_with geos geos "${EPREFIX}/usr/bin/geos-config") \ + --with-proj-includes="${EPREFIX}/usr/include/libprojectM" \ + --with-proj-libs="${EPREFIX}/usr/$(get_libdir)" \ + --with-proj-share="${EPREFIX}/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 + docinto html + dodoc -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 + 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 + xdg_desktop_database_update + gnome2_icon_cache_update + fi +} + +pkg_postrm() { + if use X; then + xdg_desktop_database_update + gnome2_icon_cache_update + fi +}