From 22910f5d14da606bd7f06e19a2f61c5d1a8fc94b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 May 2018 15:22:17 +0100 Subject: gentoo resync : 25.05.2018 --- sci-geosciences/grass/Manifest | 4 +- sci-geosciences/grass/grass-7.2.0-r1.ebuild | 14 +- sci-geosciences/grass/grass-7.4.0.ebuild | 281 ++++++++++++++++++++++++++++ 3 files changed, 290 insertions(+), 9 deletions(-) create mode 100644 sci-geosciences/grass/grass-7.4.0.ebuild (limited to 'sci-geosciences/grass') diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 367d4b69b2f8..a95fbbcfa394 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -3,5 +3,7 @@ AUX grass-7.2.0-gcc7.patch 8766 BLAKE2B f380b60ae11f11193920f87bd5f3dd83b39e5341 AUX grass-7.2.0-glibc-2.26-1.patch 329 BLAKE2B 4168b4ea26f3cbf608b8eb106f77b762ad7d28a8a9f69e5a24dbd6247014a70a2c027445b2e6e4c23d22ca412078012440648c80977058190f5f4ac3413db743 SHA512 90a44add13556e3780ec394db2f7fcbdae88904be4a72248bcc177545a6b6400683a91ab3088b87cd45c6a1507a41e701b99f8a224e8872f3dc2b685421daa93 AUX grass-7.2.0-glibc-2.26-2.patch 1238 BLAKE2B 93dca4f61321f7d721171a0eb079d805c31d28a8e83942380f826f8f04a9ad23a4c22e00198a62df971091521008a994ef8a9f7fd0dd3cd1a25317882cc7364d SHA512 a199c029b1dcc4362dae1fd2bfbc82e6fb7245e001095ad149fa76d8a0bf20f72e5869ff8ef48f14cd6a2ba2546e7b73d030aeb096bb565562b249e511eaa5fd DIST grass-7.2.0.tar.gz 48315008 BLAKE2B 927da2119e199cee7cbf55a172141abfe9ce86499e307b355fec2cdf79ec3424acddc4410e3049e7cade5dd3da39e618af7e1003093f87de5735a981984b46c6 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b -EBUILD grass-7.2.0-r1.ebuild 6889 BLAKE2B e2faac30ea4bfa21d7b8650146c9c5f339b21e4592e977f529e37216ae3599c41f13d4f48ef4a1ed9e5c079148cb93a781a369c12426668ea22becf025c90628 SHA512 39e2f2f170b402b96aea4537d9b2a46196aff5089a0f00e3e65dc8e8b2c7fb9856b0f31b2bb777b9446ed83fd56f9975e9415b34cf0a0b228fa60ed398cf5fe9 +DIST grass-7.4.0.tar.gz 56329374 BLAKE2B 924ecd9ad073dd3c59542a871780397a2516e1f0d912b4644978154ea6305ccf50229655aa7f38ab20f2bf85e4a4783cd793fff5101423dd6c212108d638d1df SHA512 b0393ec5d149e2146cc1f30cdcea00e31039bf0a2541486ab0ecd5debe260d267d74e60761b45ce306ad9942264cce9134dbafbf3c75a55df1c610499877d321 +EBUILD grass-7.2.0-r1.ebuild 6838 BLAKE2B 30bdb9299483718e9fe2872496dd3a8b6e62f22cd452c229fe358da8d3920bd9634fd74ddf53abde208f5ee9b1fd399c28640e1a4b8f1b76a88c072a6240e83a SHA512 cc6b010ee705b3e09b90e0bbabffa4ed94b3d2da4012d8f87381cf44b645a542809035549f87b0b2afc7a5b35a698bfbcac9e9392006d625d02003c1b1319702 +EBUILD grass-7.4.0.ebuild 7316 BLAKE2B 0ccddb16ffb1d3e6e8cb566fd2f3cb435419bd70a69cb62550f65c9647f32251fbbaae281e3cb1eb2ed5807eafa067345deace268acd49f90a412e6522d0aaca SHA512 22cfbca1d55a73c1429bdc14d880f92c08b06f8875751497262b197d1f8f3f250777edeabeb23962312d8beffd856d7a45f83cc975c46807c5057adff4d1fa1e MISC metadata.xml 814 BLAKE2B 0b1eacbba651c73fa3586014f44722e8eaedcdebf199651dbfce15a3f76538a4a6b498876e46cbd184aa777d4a6762cc0561614d5fc77d764002cdfa8a670ae9 SHA512 1dbb667232d8ebfbff53e2a66a5bdf8ef1d8e894d94c4e03348b658d99d8e8cf0ec159fe9421380c8bd4491ea71499fc10d6f20b3ca35208224eab82cce27635 diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild index 233823e1fa49..4c924ed16592 100644 --- a/sci-geosciences/grass/grass-7.2.0-r1.ebuild +++ b/sci-geosciences/grass/grass-7.2.0-r1.ebuild @@ -8,7 +8,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 +inherit autotools gnome2 python-single-r1 versionator wxwidgets xdg-utils MY_PM=${PN}$(get_version_component_range 1-2 ${PV}) MY_PM=${MY_PM/.} @@ -32,8 +32,8 @@ RDEPEND="${PYTHON_DEPS} sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= - sys-libs/zlib - fftw? ( sci-libs/fftw:3.0 ) + sys-libs/zlib:= + fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) blas? ( virtual/blas sci-libs/cblas-reference ) @@ -121,9 +121,7 @@ src_prepare() { sed -e 's:\(#include \):#ifdef HAVE_OGR\n\1\n#endif:' \ -i "${S}/vector/v.external/main.c" || die "failed to sed main.c" - epatch "${PATCHES[@]}" - - eapply_user + default eautoconf ebegin "Fixing python shebangs" @@ -254,14 +252,14 @@ src_install() { pkg_postinst() { if use X; then - fdo-mime_desktop_database_update + xdg_desktop_database_update gnome2_icon_cache_update fi } pkg_postrm() { if use X; then - fdo-mime_desktop_database_update + xdg_desktop_database_update gnome2_icon_cache_update fi } 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 000000000000..a5e3ddaf60ef --- /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 +} -- cgit v1.2.3