From 586819755b4dbfdffdc8a725ab7c0f86095b8489 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Sep 2018 17:37:09 +0100 Subject: gentoo resync : 15.09.2018 --- sci-geosciences/Manifest.gz | Bin 11102 -> 11094 bytes sci-geosciences/grass/Manifest | 2 + sci-geosciences/grass/grass-7.4.1.ebuild | 284 +++++++++++++++++++++ sci-geosciences/qmapshack/Manifest | 5 +- .../qmapshack/files/qmapshack-1.11.1-qt-5.11.patch | 19 ++ .../qmapshack/qmapshack-1.11.1-r1.ebuild | 2 + sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild | 41 +++ 7 files changed, 352 insertions(+), 1 deletion(-) create mode 100644 sci-geosciences/grass/grass-7.4.1.ebuild create mode 100644 sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch create mode 100644 sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild (limited to 'sci-geosciences') diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz index 1d61daae7824..d5876eb67e68 100644 Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index a95fbbcfa394..5a6b97e6b6d9 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -4,6 +4,8 @@ AUX grass-7.2.0-glibc-2.26-1.patch 329 BLAKE2B 4168b4ea26f3cbf608b8eb106f77b762a 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 DIST grass-7.4.0.tar.gz 56329374 BLAKE2B 924ecd9ad073dd3c59542a871780397a2516e1f0d912b4644978154ea6305ccf50229655aa7f38ab20f2bf85e4a4783cd793fff5101423dd6c212108d638d1df SHA512 b0393ec5d149e2146cc1f30cdcea00e31039bf0a2541486ab0ecd5debe260d267d74e60761b45ce306ad9942264cce9134dbafbf3c75a55df1c610499877d321 +DIST grass-7.4.1.tar.gz 57969640 BLAKE2B 1d3d0fd20611971ec349bf0e26ef7d886b7047e1ec48f48584f8ba2e5562f352433c9869420d7e030e66fb5a9e60de20e6a78d1fd5142380fbcab51f700766d8 SHA512 66616e495aa798cd1ad7a0284a386f7e99741918596b816a712788114e7dc491be0b5f19551f102b436518a5cabcdedbc61042acf0a9b06b9d8df12b4de26c90 EBUILD grass-7.2.0-r1.ebuild 6838 BLAKE2B 30bdb9299483718e9fe2872496dd3a8b6e62f22cd452c229fe358da8d3920bd9634fd74ddf53abde208f5ee9b1fd399c28640e1a4b8f1b76a88c072a6240e83a SHA512 cc6b010ee705b3e09b90e0bbabffa4ed94b3d2da4012d8f87381cf44b645a542809035549f87b0b2afc7a5b35a698bfbcac9e9392006d625d02003c1b1319702 EBUILD grass-7.4.0.ebuild 7316 BLAKE2B 0ccddb16ffb1d3e6e8cb566fd2f3cb435419bd70a69cb62550f65c9647f32251fbbaae281e3cb1eb2ed5807eafa067345deace268acd49f90a412e6522d0aaca SHA512 22cfbca1d55a73c1429bdc14d880f92c08b06f8875751497262b197d1f8f3f250777edeabeb23962312d8beffd856d7a45f83cc975c46807c5057adff4d1fa1e +EBUILD grass-7.4.1.ebuild 7526 BLAKE2B e9ee810c6078942b4ee923aa47f1ded25fc18f4c66b131ea6f208affa3b42384384749ded1ac41d4648504ca41834c5f0095fdfd3c72b952022f91b98ed7a604 SHA512 cff8267419a71d3c7b241c0c1f0499984876d6e70a130f1533c5e3376cb0e95cb162854d2206f6b7cd9c9e3d6f4f8f83d598222f99e16b4b4f002d047f88e165 MISC metadata.xml 814 BLAKE2B 0b1eacbba651c73fa3586014f44722e8eaedcdebf199651dbfce15a3f76538a4a6b498876e46cbd184aa777d4a6762cc0561614d5fc77d764002cdfa8a670ae9 SHA512 1dbb667232d8ebfbff53e2a66a5bdf8ef1d8e894d94c4e03348b658d99d8e8cf0ec159fe9421380c8bd4491ea71499fc10d6f20b3ca35208224eab82cce27635 diff --git a/sci-geosciences/grass/grass-7.4.1.ebuild b/sci-geosciences/grass/grass-7.4.1.ebuild new file mode 100644 index 000000000000..5c45e10e1744 --- /dev/null +++ b/sci-geosciences/grass/grass-7.4.1.ebuild @@ -0,0 +1,284 @@ +# 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 +) + +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/$(get_libdir)/${MY_PM}" \ + prefix="${D}/usr/" BINDIR="${D}/usr/bin" \ + PREFIX="${D}/usr/" \ + install + + pushd "${D}/usr/$(get_libdir)/${MY_PM}" &> /dev/null || die + + dodoc AUTHORS CHANGES + docinto html + dodoc -r docs/html/* + + # 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 + fi + + popd &> /dev/null || die + + # link libraries in the ~standard~ place + for fLib in $(ls "${D}/usr/$(get_libdir)/${MY_PM}/lib/"); do + dosym "${MY_PM}/lib/${fLib}" "/usr/$(get_libdir)/${fLib}" + done + + # link headers in the ~standard~ place + dodir "/usr/include/" + dosym "../$(get_libdir)/${MY_PM}/include/grass" "/usr/include/grass" + + # fix paths in addons makefile includes + local scriptMakeDir + scriptMakeDir="${D}/usr/$(get_libdir)/${MY_PM}/include/Make/" + for mkFile in $(ls "${scriptMakeDir}"); do + echo sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die + sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die + done + + # 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 + + ewarn "GRASS addons may fail due to Python 3 incompatibility." + ewarn "If that is tha case you can change the shebang a the beginning of" + ewarn "the script to enforce Python 2 usage." + ewarn "#!/usr/bin/env python" + ewarn "Should be changed into" + ewarn "#!/usr/bin/env python2" +} + +pkg_postrm() { + if use X; then + xdg_desktop_database_update + gnome2_icon_cache_update + fi +} diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest index 3e8ff9c4f80e..68360b14abbd 100644 --- a/sci-geosciences/qmapshack/Manifest +++ b/sci-geosciences/qmapshack/Manifest @@ -1,5 +1,8 @@ +AUX qmapshack-1.11.1-qt-5.11.patch 738 BLAKE2B f67a505ae4c63f7aac616c6dab7c6b0d96ac63a15267c1be50d5f45b6cc0c7f0c8ca98d0f6c92f6970758ba0a5fa062d9f32615dca4eb7ed26878965fd068198 SHA512 7793e38cea40c692893934fbd33d7f60a1f456ca80612a2ec00fc0144717f34fd8eab01ef66b697b1cec52ec56e69d1197932f574d03dbed707c1dfc686fa36d DIST qmapshack-1.11.1.tar.gz 11446871 BLAKE2B fa92b93787306d23110112fd851f0ee02418ac7b27316f57b4045efc4ae726e36c4014682d1ee32879f8894bab7dcac70852384f8b158e01026d7782f67b5ede SHA512 43e1b587bd3f4901b155ea6d1d520cf303681640c1bd521b30ef7f23aaf49b2fffe9b764e5dd3fcaef360b0d32b360b76eb8d737ec5e186aa75362ff2507956e +DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7 SHA512 dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5 DIST qmapshack-1.6.3.tar.gz 5181205 BLAKE2B 89e7a638f35e0e555b237a000992f48b1a126ed9de5c2892ee8e147060866656b87abbc46937cc5187e473681b71a2dfb250160d4847824df4989c352afd676b SHA512 6e9efdd35ebf3980011aea0cefdbcc433e4f0d333cbeff72e70880a41bff972cc27f4517e243f4990b5e04112a50af2651d99cb5c1c6e542341db30e5e000133 -EBUILD qmapshack-1.11.1-r1.ebuild 896 BLAKE2B 2a497d2f61f009b152f993c21df672ec59accfc9b9e4c23099f3b455f28ea176c0d7402784307b8da1fa06d8d887475526fed2328d10874f4caa92b60f8da45f SHA512 a778c772f11caa24027a9963709bdc466a53e2088f8001ee19fcfcba1538472c4be2a821c0b11e315f1b72e168929abf9776a525ebe49867910b26e741d7faa8 +EBUILD qmapshack-1.11.1-r1.ebuild 942 BLAKE2B e999f8e50a37ee1bd4381417d11d1522c58070235779525b3b9b8482801429188fe6b099d006229f626f4b4e43a7cbba84b90ac0786091a0ccb702eafd65ae2e SHA512 c4be5e1ebe57f1143d464e1327b347f988666a58e95c6dcfd6f6ec6b7855db0551c8fe7a378e59d73a1e2a3a46491f1ab92b260ef4c685fe5b077062bfd44fe5 +EBUILD qmapshack-1.12.0.ebuild 922 BLAKE2B fc3b1c8317a13af3a85c85225df00470cc0ea4a2a0968cd843f827e23d0c4dd2f1c078df3c4dc3664b10e0f3e2165d1f92c1447175e2e53d60e78da68016948e SHA512 a146801935f9816c3e3abb09f88468cfd5e2d89881f6130325f17fa58d55705cbb6dfadd93340a531e4efe5b6eae7751bca741f1a20c153f45786385212fc623 EBUILD qmapshack-1.6.3.ebuild 594 BLAKE2B 47fca8a961fe1e76d41cfee2ae99c4716bb3897a596e4ed29cc872e0296eee06fbc47188f84e423b28cf0c2d725f8e0fd5dc8e903761a1fafc4f2eedc481a4c3 SHA512 d6ba2f2fb68520668a89240021ab195477c94648b8fcf50040e671922a19f35d9107a8f0b56d33077bbb4b85f36787e995b26f54462ce8b62247d2fc4d118092 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d diff --git a/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch b/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch new file mode 100644 index 000000000000..404f034176df --- /dev/null +++ b/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch @@ -0,0 +1,19 @@ +# HG changeset patch +# User kiozen +# Date 1528899896 -7200 +# Node ID e9b47af61b0945acb74649bab30dec23ac42f375 +# Parent f52eedfb8f94ea218eb1c55bb8f2fa0c0503238f +[Issue #344 ] Building latest version of QMapShack fails after updating QT from 5.10.1 to 5.11.0 + +diff --git a/src/qmapshack/helpers/CToolBarSetupDialog.cpp b/src/qmapshack/helpers/CToolBarSetupDialog.cpp +--- a/src/qmapshack/helpers/CToolBarSetupDialog.cpp ++++ b/src/qmapshack/helpers/CToolBarSetupDialog.cpp +@@ -20,6 +20,8 @@ + #include "helpers/CToolBarConfig.h" + #include "helpers/CToolBarSetupDialog.h" + ++#include ++ + bool CToolBarSetupDialog::CItemFilter::shouldBeMoved(QListWidgetItem *item) + { + CDialogItem * dialogItem = dynamic_cast(item); diff --git a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild index e49afba1831d..a8ed47130b9a 100644 --- a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild +++ b/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild @@ -28,6 +28,8 @@ RDEPEND="dev-qt/qtwebkit:5 DEPEND="${RDEPEND} dev-qt/linguist-tools:5" +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) + pkg_postinst() { xdg_desktop_database_update xdg_mimeinfo_database_update diff --git a/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild new file mode 100644 index 000000000000..6921f476c72e --- /dev/null +++ b/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils xdg-utils gnome2-utils + +DESCRIPTION="GPS mapping utility" +HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home" +SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz" +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +RDEPEND="dev-qt/qtwebengine:5[widgets] + dev-qt/qtdeclarative:5[widgets] + dev-qt/qtprintsupport:5 + dev-qt/qtdbus:5 + dev-qt/qttest:5 + dev-qt/designer:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5 + dev-libs/quazip + >=sci-geosciences/routino-3.1.1 + sci-libs/gdal + sci-libs/proj + sci-libs/alglib" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5" + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} -- cgit v1.2.3