summaryrefslogtreecommitdiff
path: root/sci-geosciences
diff options
context:
space:
mode:
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/Manifest.gzbin11103 -> 11098 bytes
-rw-r--r--sci-geosciences/gdal-grass/Manifest4
-rw-r--r--sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild53
-rw-r--r--sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild51
-rw-r--r--sci-geosciences/gpscorrelate/Manifest3
-rw-r--r--sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch27
-rw-r--r--sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild (renamed from sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild)29
-rw-r--r--sci-geosciences/grass/Manifest9
-rw-r--r--sci-geosciences/grass/files/grass-7.2.0-gcc7.patch94
-rw-r--r--sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch10
-rw-r--r--sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch32
-rw-r--r--sci-geosciences/grass/grass-7.2.0-r1.ebuild265
-rw-r--r--sci-geosciences/grass/grass-7.4.0.ebuild281
-rw-r--r--sci-geosciences/grass/grass-7.4.1.ebuild284
-rw-r--r--sci-geosciences/laszip/Manifest5
-rw-r--r--sci-geosciences/laszip/files/laszip-2.2.0_fix-build-system.patch50
-rw-r--r--sci-geosciences/laszip/laszip-2.2.0.ebuild26
-rw-r--r--sci-geosciences/laszip/laszip-3.4.1.ebuild2
-rw-r--r--sci-geosciences/liblas/Manifest2
-rw-r--r--sci-geosciences/liblas/liblas-1.8.1.ebuild48
-rw-r--r--sci-geosciences/merkaartor/Manifest2
-rw-r--r--sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild6
22 files changed, 54 insertions, 1229 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 91aae98465a4..25ff2004a57f 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
Binary files differ
diff --git a/sci-geosciences/gdal-grass/Manifest b/sci-geosciences/gdal-grass/Manifest
index f498e16d81a6..f57ef0bab81a 100644
--- a/sci-geosciences/gdal-grass/Manifest
+++ b/sci-geosciences/gdal-grass/Manifest
@@ -1,7 +1,3 @@
-DIST gdal-grass-2.0.0.tar.gz 56286 BLAKE2B 191402442bc3c16f3d07f538b9eae266e75c74efbecb235dc11cb3529e4758fc8354ab5e65ec4a8805595c6f1209d70e5f76a7006d546eb3d2e8f9e4966842ff SHA512 cefa60773c2acd5c1627b896e3298d02f51979c12f70ce67b88c0b886a13de2f62821a3d3e50984f5c676ef37819c685795949b06db57004a0edf8039e898d7e
-DIST gdal-grass-2.1.0.tar.gz 54299 BLAKE2B 09b9a408584618cefcc989feebc75431ae3efed2c9f6504e65ccf28bbc02a6e5125cb049accece7fd598aeef0bb1d5cb572067fc5a764a49c99627132d650f65 SHA512 fb06b71839849de413f68beb8f2cd1c2273cc48b5205fe1b255ffc4976f8f913b4b226eba186a24f5b40fe5fbb1ceeab760d06915222e4a4b269a6fbc7bc9417
DIST gdal-grass-2.1.3.tar.gz 54478 BLAKE2B 172200d8362b12583f0f73316b8c6d34875682c9d76c095745152c8d4fd1da1d9d1e94df5928225f6fda5712e987379c7c3192fa81d02b9cee9145fb577faee1 SHA512 c11776f92e591f1c0136e439ab6c672015171c5b750cb9332c73b49b3173c1d57efb4854b152a1d8e1b438c68a1130b4a46a189e1be0b99af9a8fb931f246e39
-EBUILD gdal-grass-2.0.0-r1.ebuild 1244 BLAKE2B ce04fdefce1170072cb2346ad4d0e812102956ffdebb857c8e7375c8cd8fd8395fc075bdebb69017fb043ade2473b48dafba09589bee1749ba0b5add8b7ef13c SHA512 60c1cdb7628beccbdd78aa120a0a7d03188457a1976e4a25e49af2cf0b3f5336d4720d3a5bf8950f595a2e6278a3989018dedbff322fb7fa1f35ad8d57f62083
-EBUILD gdal-grass-2.1.0.ebuild 1228 BLAKE2B 0eda99e944f3b363813c24103de49cb2e53487c1a31cde230150a694d3550a30bcc1ab15ff53dc9ce2a9b232ab9aaf6cb8cea2fb2353f725ebf0c68612f54533 SHA512 f0cd6fccb7b2a0a4781ed3b59a872ee6f83bfbaaf35c2ca7cfe070bf7ecea140e561460ad2fc422c971209b576e7040bfcc9d84d90e0b67a1eb84699bd13e119
EBUILD gdal-grass-2.1.3.ebuild 1338 BLAKE2B 8446c1ca6087b98fd7bf66f7f9533d2325503fce01935ad7245c8073abe9b583b4026bfe7cec66f07620acbffc77beef136fe527cbbab9f60aeb047a91b6a663 SHA512 0f31ea8d593720ea177a47c7aa96f04381aee17115ee0023ddebe5600ed60b0952a306478e5b46f4f48d53b83ef257158567c456739c7b21e3a15a307967d0e2
MISC metadata.xml 374 BLAKE2B e5c65df3d92edf2be292e76594e43f701f3a3dc25af1ed82daedfa550a65f698c867d840eb926e8d114ceb86c659c8d4db16fc90f8b6936f5670d1465cc88afb SHA512 be40eaf2149affadb4a8bbdc2817f44ea5d7117ad09797fb1ffe1db4a146129cde3955ad8b8c7e9283f9c2b8b86a6dc3bcf3d889d14c00481936ed388d632898
diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild
deleted file mode 100644
index b480a2b497b9..000000000000
--- a/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="GDAL plugin to access GRASS data"
-HOMEPAGE="https://www.gdal.org/"
-SRC_URI="https://download.osgeo.org/gdal/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="postgres"
-RDEPEND="
- >=sci-libs/gdal-2.0.0
- sci-geosciences/grass:0=
-"
-DEPEND="${RDEPEND}
- dev-libs/expat
- dev-libs/json-c:=
- virtual/jpeg
- media-libs/tiff
- sci-libs/libgeotiff
- sci-libs/proj
- sys-libs/zlib
- postgres? ( dev-db/postgresql )"
-
-# these drivers are copied at install from the already installed GRASS
-QA_PREBUILT="/usr/share/gdal/grass/driver/db/*"
-
-src_prepare() {
- sed -e 's:mkdir ${GRASSTABLES_DIR}$:mkdir -p ${GRASSTABLES_DIR}:' \
- -i Makefile.in || die
- default
-}
-
-src_configure() {
- econf \
- --with-grass="/usr/$(get_libdir)/grass70" \
- --with-gdal="/usr/bin/gdal-config" \
- $(use_with postgres postgres-includes "/usr/include/postgresql")
-}
-
-src_install() {
- #pass the right variables to 'make install' to prevent a sandbox access violation
- emake DESTDIR="${D}" \
- GRASSTABLES_DIR="${D}$(gdal-config --prefix)/share/gdal/grass" \
- AUTOLOAD_DIR="${D}/usr/$(get_libdir)/gdalplugins" \
- install
-}
diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild
deleted file mode 100644
index 1d121dde9203..000000000000
--- a/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="GDAL plugin to access GRASS data"
-HOMEPAGE="https://www.gdal.org/"
-SRC_URI="https://download.osgeo.org/gdal/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="postgres"
-RDEPEND="
- >=sci-libs/gdal-2.0.0
- sci-geosciences/grass:0=
-"
-DEPEND="${RDEPEND}
- dev-libs/expat
- dev-libs/json-c:=
- media-libs/tiff
- sci-libs/libgeotiff
- sci-libs/proj
- sys-libs/zlib
- virtual/jpeg
- postgres? ( dev-db/postgresql )"
-
-# these drivers are copied at install from the already installed GRASS
-QA_PREBUILT="/usr/share/gdal/grass/driver/db/*"
-
-src_prepare() {
- sed -e 's:mkdir ${GRASSTABLES_DIR}$:mkdir -p ${GRASSTABLES_DIR}:' \
- -i Makefile.in || die
- default
-}
-
-src_configure() {
- econf \
- --with-grass="/usr/$(get_libdir)/grass70" \
- --with-gdal="/usr/bin/gdal-config" \
- $(use_with postgres postgres-includes "/usr/include/postgresql")
-}
-
-src_install() {
- #pass the right variables to 'make install' to prevent a sandbox access violation
- emake DESTDIR="${D}" \
- GRASSTABLES_DIR="${D}$(gdal-config --prefix)/share/gdal/grass" \
- AUTOLOAD_DIR="${D}/usr/$(get_libdir)/gdalplugins" \
- install
-}
diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest
index 05453feb0246..1bf5359ee5f7 100644
--- a/sci-geosciences/gpscorrelate/Manifest
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -1,4 +1,5 @@
+AUX gpscorrelate-1.6.1-exiv2-0.27.1.patch 630 BLAKE2B db4ecda22bfe9b666c67b1d079aeb06a3e7db3be5fd47f5b84e38d42a9ef6ff3f5b63913e66ed1b39af7bc821c6d6c13cf33ac4015fca141dd9b66c682005afd SHA512 d7af75d0f513d9104c3a39e191447dc1269cf3fc59c3289703e298f8e671a96849247e2b979153fee9f70469416e249e5dcd6f6ebbacae4eb2d52e1897a326ed
AUX gpscorrelate-1.6.1-makefile.patch 1609 BLAKE2B 717dce73444a68d09658b5c3c446e27ff1b7666584eadaeeb862d87dd8ad44983e30b1b24fa4387f50032bf2dee671ce84af3bf168d3743768d270c412b36be5 SHA512 274a3db1a2a752338966beae989e2075f81b6d51b1d7f51d9810d7b6e01ea581468e2add05e631f6f8626ee234a6c7e700cf90ce7dc08a7d5c5cad282a6f7f59
DIST gpscorrelate-1.6.1.tar.gz 154531 BLAKE2B 664a87e7be4e9cbdabd71653df4b968b0de33abe61d666b8b101d74ed9288bbceee9884bfa6e1c117a52bd13b69d11983342eb16cf07ee2c166d60f8ea5ca965 SHA512 c7e50980adc7173e6addb15b0a6451f44d8bbac5511643445b9bed85226abb4153b67032a5e9f95f6fe2f192d5b3d1965fecd3c00a21709a0d6e5dc59720132f
-EBUILD gpscorrelate-1.6.1.ebuild 944 BLAKE2B 20d7c5cd2fbbac3661021b46bf510503e9b7f7ab7676ebc9bf466873d211f5270e740113c2e93facd9def3cece34102de08658425f20f45b33bae91c2d5e201b SHA512 198d0e6428d6ce9d0609620067c8440065ec0b92855e63b059a43361f4102e451c6afa6ab4ce7b6fb27e0844eb8109e714538ca8829537aeb882005638612ffc
+EBUILD gpscorrelate-1.6.1-r1.ebuild 1070 BLAKE2B aef2a9c146422b57c45492b4fe9253ef8eaf98b6e6d08343c13bd7d546db6d1e04f35ea91890306d17357b1194a2336376ff61505d27baa28eb605538be4b160 SHA512 0b8fce0cd10a47f93945903661c1a7db0a82cc12d3f52a22f8357fbabf95367b5f77824f98bf21d91d7e7a6b0fcd3433a7d236204e0676cd7b5cba172ff1b34a
MISC metadata.xml 356 BLAKE2B a17eee6261dcce3b6111da9da119544f46a0e0b6742f2a9280933f1d6f5a36cc96a422270698649c2dd77c228580b7f8df1fe8c66546c568fe1659893ae2aefb SHA512 e9c7c6dc654cb5276c1b211c8e4817fd09cb0ed3689b53d423733e651ec4a912b4f54dbbd08299bd80c6ae637ee41e91ca1ebb323ff2cc29e3b36dbe40566fb2
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
new file mode 100644
index 000000000000..16921b72a1f6
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-exiv2-0.27.1.patch
@@ -0,0 +1,27 @@
+From c82aa1e76e3faeaec605df618c87223513efb3b9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 29 Jun 2019 10:27:24 +0200
+Subject: [PATCH] Fix build with exiv2-0.27.1
+
+Use catchall header as recommended by exiv2 upstream.
+---
+ exif-gps.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/exif-gps.cpp b/exif-gps.cpp
+index fb9f2cb..61b4736 100644
+--- a/exif-gps.cpp
++++ b/exif-gps.cpp
+@@ -41,8 +41,7 @@
+ #include <unistd.h>
+
+
+-#include "exiv2/image.hpp"
+-#include "exiv2/exif.hpp"
++#include "exiv2/exiv2.hpp"
+
+ #include "gpsstructure.h"
+ #include "exif-gps.h"
+--
+2.22.0
+
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild
index 07204797db36..859bf5a9d68f 100644
--- a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild
+++ b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit eutils toolchain-funcs
+inherit desktop toolchain-funcs
DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS trace"
HOMEPAGE="https://github.com/freefoote/gpscorrelate"
@@ -14,18 +14,22 @@ SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
IUSE="doc gtk"
-RDEPEND="
- dev-libs/libxml2:2
- media-gfx/exiv2:=
- gtk? ( x11-libs/gtk+:2 )
-"
-DEPEND="${RDEPEND}
+BDEPEND="
app-text/docbook-xml-dtd:4.2
dev-libs/libxslt
virtual/pkgconfig
"
+DEPEND="
+ dev-libs/libxml2:2
+ media-gfx/exiv2:=
+ gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-1.6.1-makefile.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-makefile.patch"
+ "${FILESDIR}/${P}-exiv2-0.27.1.patch"
+)
src_compile() {
tc-export CC CXX
@@ -42,7 +46,10 @@ src_install() {
domenu ${PN}.desktop
fi
if use doc; then
- dohtml doc/*
+ rm doc/gpscorrelate-manpage.xml* || die
+ local DOCS=()
+ local HTML_DOCS=( doc/. )
+ einstalldocs
fi
doman ${PN}.1
}
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index cc7fa6759869..582aaeb7806d 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,13 +1,4 @@
AUX grass-7.0.1-declare-inespg.patch 647 BLAKE2B ec303cc88965ff24d9521a3d2fdec3cd62f14bb9830a37942aa3373acc5351b07022f782c8f22f560bbf1f794fd46fa524b7ddab07a360c3e6f34cf3c1258972 SHA512 9206619090c0f138c734f7fe48467cd343cd01120ac4d7eaec3d822b7cac1cbc6e4630bfedd68e7bdd6966716116a1d6714faf373a1eceb08726acd16ca34bb4
-AUX grass-7.2.0-gcc7.patch 8766 BLAKE2B f380b60ae11f11193920f87bd5f3dd83b39e5341ca3eff18d5cf822b132093e79565cb10b2d78aedbacdda97746a52ccd9f270781d77fcb953cdd6496f2f0033 SHA512 5ad83335e4d37529f874fc447ab4f4afef37dff603a4102958fdf8bf4c9294579fd8cf9a0028a7cd429c5c335109e54c888f2a3fdb1a83ad965e1a02d773b75b
-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
-DIST grass-7.4.0.tar.gz 56329374 BLAKE2B 924ecd9ad073dd3c59542a871780397a2516e1f0d912b4644978154ea6305ccf50229655aa7f38ab20f2bf85e4a4783cd793fff5101423dd6c212108d638d1df SHA512 b0393ec5d149e2146cc1f30cdcea00e31039bf0a2541486ab0ecd5debe260d267d74e60761b45ce306ad9942264cce9134dbafbf3c75a55df1c610499877d321
-DIST grass-7.4.1.tar.gz 57969640 BLAKE2B 1d3d0fd20611971ec349bf0e26ef7d886b7047e1ec48f48584f8ba2e5562f352433c9869420d7e030e66fb5a9e60de20e6a78d1fd5142380fbcab51f700766d8 SHA512 66616e495aa798cd1ad7a0284a386f7e99741918596b816a712788114e7dc491be0b5f19551f102b436518a5cabcdedbc61042acf0a9b06b9d8df12b4de26c90
DIST grass-7.4.4.tar.gz 58454921 BLAKE2B bf8f85e4dad800a32ac0c23025b0844dde17c806aeec7d150d3263ff8fae80deab7b7052cfb664e138b2af1e5fbe3282db087d7545d42710db6d9890f0b285ee SHA512 9971bd1184c4b2eb38ecf5efafd28094c2d05d22e9ae53a8b074a15e26c029dd13c4627b442a428bca4030fd9118e49422863515cf0fc58dd46e70d2923a9f83
-EBUILD grass-7.2.0-r1.ebuild 6837 BLAKE2B acf0edfd8446fdcec8472da00e43a586d232b7b79491a74411fb78b756f7ef1548033af0865445e252f9a6296f96540d64a822ff4b4a1eeebc7dcee5232ed474 SHA512 18a871959cbc426a5c7e443e0aed1f77f2396784682260ed5bc195cc73073eea1a939e63a594915cf6d02840da6b848d171bd5bd2a8282c18ac564adb12b3456
-EBUILD grass-7.4.0.ebuild 7315 BLAKE2B b7722198a4b64815d0649fbd146d877d65de5ec7ed423fd92a165dd5cc9e61ddbc7bc4cb4804523ad16f7e1c1becbc65d3749557e6253de68b6692efc902b4a9 SHA512 e11e91e434b55005b99bfc9accfb057beb89a0a9818f4cc9b409ce695ab6b8080bfe4e3be6bc0c204eb921002c16507876213d2cd04bfcd766f658b801285857
-EBUILD grass-7.4.1.ebuild 7525 BLAKE2B 3652695a03ed74ba6d4b3032caefaad116087d81cc80db9de0c7016fb3dec092a9620d5530e4b9b66af634c34ff10550e0895dce58046ac417b5bb0b9f88020e SHA512 9c89d98cd121e05222f9305867113c111f82959409f35c7c281e53a0174b875179a75b6112bba0cbb219300aaa7fae6b727409e0cdf28c6f3476a524bcf1bce5
EBUILD grass-7.4.4.ebuild 7333 BLAKE2B b42f1776211b07f341982bad5f2153e30d67a8e7f7d30171795cda9fc3880212f7762e621359df049d550cd0f64c659f8a8cbcc085f4848eaf8c360a36f716a9 SHA512 0343ff9a4e7451c9c074b10cb4f10e559ab613172d4c4eca41e48e17ad55ef085a925b04e84746c5c4d39bc62ddb032be55a4f2d62b04811e79d20f8dc5ef83b
MISC metadata.xml 814 BLAKE2B 0b1eacbba651c73fa3586014f44722e8eaedcdebf199651dbfce15a3f76538a4a6b498876e46cbd184aa777d4a6762cc0561614d5fc77d764002cdfa8a670ae9 SHA512 1dbb667232d8ebfbff53e2a66a5bdf8ef1d8e894d94c4e03348b658d99d8e8cf0ec159fe9421380c8bd4491ea71499fc10d6f20b3ca35208224eab82cce27635
diff --git a/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch b/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch
deleted file mode 100644
index 97be4d7d8606..000000000000
--- a/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Index: releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/lextab.py
-===================================================================
---- a/lib/python/ctypes/ctypesgencore/parser/lextab.py (revision 71218)
-+++ b/lib/python/ctypes/ctypesgencore/parser/lextab.py (revision 71219)
-@@ -1,59 +1,8 @@
- # lextab.py. This file automatically created by PLY (version 2.2). Don't edit!
--_lextokens = {
-- 'RIGHT_OP': None,
-- 'RIGHT_ASSIGN': None,
-- 'DEC_OP': None,
-- 'PP_MACRO_PARAM': None,
-- 'DIV_ASSIGN': None,
-- 'PP_DEFINE': None,
-- 'PP_END_DEFINE': None,
-- 'PP_DEFINE_MACRO_NAME': None,
-- 'HEADER_NAME': None,
-- 'NEWLINE': None,
-- 'CHARACTER_CONSTANT': None,
-- 'PP_STRINGIFY': None,
-- 'AND_ASSIGN': None,
-- 'PTR_OP': None,
-- 'ELLIPSIS': None,
-- 'IDENTIFIER': None,
-- 'ADD_ASSIGN': None,
-- 'PERIOD': None,
-- 'AND_OP': None,
-- 'OTHER': None,
-- 'LPAREN': None,
-- 'LEFT_OP': None,
-- 'LE_OP': None,
-- 'OR_OP': None,
-- 'SUB_ASSIGN': None,
-- 'MOD_ASSIGN': None,
-- 'STRING_LITERAL': None,
-- 'PP_IDENTIFIER_PASTE': None,
-- 'PP_NUMBER': None,
-- 'PP_DEFINE_NAME': None,
-- 'XOR_ASSIGN': None,
-- 'OR_ASSIGN': None,
-- 'GE_OP': None,
-- 'MUL_ASSIGN': None,
-- 'LEFT_ASSIGN': None,
-- 'INC_OP': None,
-- 'NE_OP': None,
-- 'EQ_OP': None}
--_lexreflags = 0
--_lexliterals = ''
-+_lextokens = {'RIGHT_OP': None, 'RIGHT_ASSIGN': None, 'DEC_OP': None, 'PP_MACRO_PARAM': None, 'DIV_ASSIGN': None, 'PP_DEFINE': None, 'PP_END_DEFINE': None, 'PP_DEFINE_MACRO_NAME': None, 'HEADER_NAME': None, 'NEWLINE': None, 'CHARACTER_CONSTANT': None, 'PP_STRINGIFY': None, 'AND_ASSIGN': None, 'PTR_OP': None, 'ELLIPSIS': None, 'IDENTIFIER': None, 'ADD_ASSIGN': None, 'PERIOD': None, 'AND_OP': None, 'OTHER': None, 'LPAREN': None, 'LEFT_OP': None, 'LE_OP': None, 'OR_OP': None, 'SUB_ASSIGN': None, 'MOD_ASSIGN': None, 'STRING_LITERAL': None, 'PP_IDENTIFIER_PASTE': None, 'PP_NUMBER': None, 'PP_DEFINE_NAME': None, 'XOR_ASSIGN': None, 'OR_ASSIGN': None, 'GE_OP': None, 'MUL_ASSIGN': None, 'LEFT_ASSIGN': None, 'INC_OP': None, 'NE_OP': None, 'EQ_OP': None}
-+_lexreflags = 0
-+_lexliterals = ''
- _lexstateinfo = {'INITIAL': 'inclusive', 'DEFINE': 'exclusive'}
--_lexstatere = {
-- 'INITIAL': [
-- ('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [
-- None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_INITIAL_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [
-- None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>[FflL]?)(?!\\w))', [
-- None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [
-- None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_INITIAL_newline>\\n)|(?P<t_INITIAL_pp_define>\\#define)', [
-- None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [
-- ('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [
-- None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_DEFINE_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [
-- None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>[FflL]?)(?!\\w))', [
-- None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [
-- None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_DEFINE_newline>\\n)|(?P<t_DEFINE_pp_param_op>(\\#\\#)|(\\#))', [
-- None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]}
-+_lexstatere = {'INITIAL': [('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_INITIAL_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_INITIAL_newline>\\n)|(?P<t_INITIAL_pp_define>\\#define)', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_DEFINE_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_DEFINE_newline>\\n)|(?P<t_DEFINE_pp_param_op>(\\#\\#)|(\\#))', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]}
- _lexstateignore = {'INITIAL': ' \t\x0b\x0c\r', 'DEFINE': ' \t\x0b\x0c\r'}
- _lexstateerrorf = {'INITIAL': 't_INITIAL_error', 'DEFINE': 't_DEFINE_error'}
-Index: releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/pplexer.py
-===================================================================
---- a/lib/python/ctypes/ctypesgencore/parser/pplexer.py (revision 71218)
-+++ b/lib/python/ctypes/ctypesgencore/parser/pplexer.py (revision 71219)
-@@ -52,7 +52,7 @@
- 'L': '[a-zA-Z_]',
- 'H': '[a-fA-F0-9]',
- 'E': '[Ee][+-]?\s*{D}+',
-- 'FS': '[FflL]',
-+ 'FS': '([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)',
- 'IS': '[uUlL]*',
- }
- # Helper: substitute {foo} with subs[foo] in string (makes regexes more lexy)
-@@ -226,10 +226,10 @@
- exp = m.group("exp")
- suf = m.group("suf")
-
-- if dp or exp or (suf and suf in ("Ff")):
-+ if dp or exp or (suf and suf not in ("Ll")):
- s = m.group(0)
- if suf:
-- s = s[:-1]
-+ s = s[:-len(suf)]
- # Attach a prefix so the parser can figure out if should become an
- # integer, float, or long
- t.value = "f" + s
diff --git a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch
deleted file mode 100644
index 115ff06febc3..000000000000
--- a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: /grass/trunk/lib/raster/R.h
-===================================================================
---- /grass/trunk/lib/raster/R.h (revision 71264)
-+++ /grass/trunk/lib/raster/R.h (revision 71265)
-@@ -1,5 +1,4 @@
- #include <grass/config.h>
- #include <grass/gis.h>
--#include <rpc/types.h>
- #ifdef HAVE_GDAL
- #include <gdal.h>
diff --git a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch
deleted file mode 100644
index c1361f6af088..000000000000
--- a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: /grass/branches/releasebranch_7_2/lib/raster/get_row.c
-===================================================================
---- /grass/branches/releasebranch_7_2/lib/raster/get_row.c (revision 71943)
-+++ /grass/branches/releasebranch_7_2/lib/raster/get_row.c (revision 71944)
-@@ -15,6 +15,4 @@
- #include <unistd.h>
- #include <sys/types.h>
--
--#include <rpc/types.h> /* need this for sgi */
-
- #include <grass/config.h>
-Index: /grass/branches/releasebranch_7_2/lib/raster/open.c
-===================================================================
---- /grass/branches/releasebranch_7_2/lib/raster/open.c (revision 71943)
-+++ /grass/branches/releasebranch_7_2/lib/raster/open.c (revision 71944)
-@@ -13,6 +13,4 @@
- */
-
--#include <rpc/types.h>
--#include <rpc/xdr.h>
- #include <unistd.h>
- #include <string.h>
-Index: /grass/branches/releasebranch_7_2/lib/raster/range.c
-===================================================================
---- /grass/branches/releasebranch_7_2/lib/raster/range.c (revision 71943)
-+++ /grass/branches/releasebranch_7_2/lib/raster/range.c (revision 71944)
-@@ -13,5 +13,4 @@
-
- #include <unistd.h>
--#include <rpc/types.h> /* need this for sgi */
-
- #include <grass/raster.h>
diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
deleted file mode 100644
index 6b99aa466e7b..000000000000
--- a/sci-geosciences/grass/grass-7.2.0-r1.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://grass.osgeo.org/"
-SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7.2.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
- "${FILESDIR}/${P}"-gcc7.patch
- "${FILESDIR}/${P}"-glibc-2.26-{1,2}.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"
-
- default
- eautoconf
-
- ebegin "Fixing python shebangs"
- python_fix_shebang -q "${S}"
- eend $?
-}
-
-src_configure() {
- if use X; then
- WX_BUILD=yes
- setup-wxwidgets
- 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
- 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
- # 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
- xdg_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use X; then
- 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
deleted file mode 100644
index 4b0679f5b2c9..000000000000
--- a/sci-geosciences/grass/grass-7.4.0.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://grass.osgeo.org/"
-SRC_URI="https://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 <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"
-
- 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
-}
diff --git a/sci-geosciences/grass/grass-7.4.1.ebuild b/sci-geosciences/grass/grass-7.4.1.ebuild
deleted file mode 100644
index 7c4d6e63529f..000000000000
--- a/sci-geosciences/grass/grass-7.4.1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://grass.osgeo.org/"
-SRC_URI="https://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 <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"
-
- 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/laszip/Manifest b/sci-geosciences/laszip/Manifest
index 7be7714e1dea..a02ff08762b0 100644
--- a/sci-geosciences/laszip/Manifest
+++ b/sci-geosciences/laszip/Manifest
@@ -1,6 +1,3 @@
-AUX laszip-2.2.0_fix-build-system.patch 1516 BLAKE2B e79bff26c87b51667394c361379bee1d6f048d928b051dd9c357834b50a9980da8ecd248aa63acb25ca76ae19130d99a7b2db183056869670731b818f56da84a SHA512 3b2a8523491ffeded85e7aad50b1792f1f26354838afb7ab2e36bb29e2178cd1fb75601c238d59eff7779bb87a7fd5d93696a2da01951df188e66833ce6ff301
-DIST laszip-src-2.2.0.tar.gz 407457 BLAKE2B d183ab6acf67708b3fc293ade228f516cc364d4cd494f5758cbba93969605f66e450aaa01a07660fd8976031b7747b40e0400573558d0f14b0e19874bf7d9fe3 SHA512 44dacb0d0ab79ac02c784549f42c4522451646b322835afc78fbf8bb82be40e023d374635c2a18989c73a5553e05b55d7c32f35d510f816704020b0e02365824
DIST laszip-src-3.4.1.tar.gz 219421 BLAKE2B b1bb3f66d9209c6a137af84c8d220ee6a50309139721b8e0befb4f56991e8153fc6446666ca5c2cdcb57abf297694f1f679a3961dabdff6450bc6dcc965ef6cd SHA512 001602a602dda1e43a08ee306b9c7c23faaf5777d551c269aac4a21b1c99449d2f12f46a0f95ff237003a0ab691eaca15b43b2f4d354651abc5d54930a39a134
-EBUILD laszip-2.2.0.ebuild 618 BLAKE2B 2f9dc6350f6d45c5939c1ef36819ac26c973b94b1ade0a1cb4bfd1158de1014cf51357a37609f7f1c03b6affe409db2650f439304dfb8415df654068ea2fb1df SHA512 ccc87347bd374b875dc2c242cb25496fa77ee5355f737338ca676b878a55dc0d5bc28c228b103aac1845387b27beb4cb06308f2823a4a7c5b426ae9c8fccb14a
-EBUILD laszip-3.4.1.ebuild 438 BLAKE2B e84b85733b083c3839354f73320f0be0d37f27535bca9c03aadf6a081f97be9a72f20025cc8e398001323ba53c8438a321f07cefc018604b4302290d7a39a62a SHA512 1ef97c2167411a429cae672e57b60c485328494c7bc3986217f7ab5c9086ca8841a28a35d215b59843c51ee6e58ee05569480715c154584e0e1af40c2ae521ca
+EBUILD laszip-3.4.1.ebuild 434 BLAKE2B 9cedceabf3583fbee6a489614605b90b92f3a15757f6daa57a7f648ee73635f5e8ba7b8786912b2dd8b5618108003fefa1ed25163bad638b92b2bcd70a716240 SHA512 c5af2f586d2ffd68ddd8afe4a292685c0b1f6c621d5d537a65ef830aa2d82b94fdd4b3fbdd5ca65ec777a9cd68b20f56264b69c8699cca599058a044c5077703
MISC metadata.xml 486 BLAKE2B a8de1ac6ab5f2981a1e9c514e233d1b84b48bc953aa6056b47ab0f9b5fa234db0380e35a24fb3d3effeafe8fb63b411aa815a99152789a44a732176c291c2541 SHA512 29ba500c7d71620ad3fe1673395ba4073910ba2c898efabe3d6305cd2085bbd00b1c03e21ddbefa17a505973b6083d0fc3faeedd2b1561486e8fe90647b27039
diff --git a/sci-geosciences/laszip/files/laszip-2.2.0_fix-build-system.patch b/sci-geosciences/laszip/files/laszip-2.2.0_fix-build-system.patch
deleted file mode 100644
index 4587331eba3f..000000000000
--- a/sci-geosciences/laszip/files/laszip-2.2.0_fix-build-system.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- laszip-src-2.2.0/configure.ac
-+++ laszip-src-2.2.0/configure.ac
-@@ -21,9 +21,6 @@
-
- m4_define([debug_default],[no])
-
--CFLAGS="-Wall -Wno-long-long -pedantic $CFLAGS"
--CXXFLAGS="-Wall -Wno-long-long -pedantic -std=c++98 $CXXFLAGS"
--
- dnl #########################################################################
- dnl Checks for programs.
- dnl #########################################################################
-@@ -68,8 +65,8 @@
- CXXFLAGS="$CXXFLAGS -g -DDEBUG"
- AC_MSG_RESULT(yes)
- else
-- CFLAGS="$CFLAGS -O3 -DNDEBUG"
-- CXXFLAGS="$CXXFLAGS -O3 -DNDEBUG"
-+ CFLAGS="$CFLAGS -DNDEBUG"
-+ CXXFLAGS="$CXXFLAGS -DNDEBUG"
- AC_MSG_RESULT(no)
- fi
-
---- laszip-src-2.2.0/src/Makefile.am
-+++ laszip-src-2.2.0/src/Makefile.am
-@@ -1,6 +1,6 @@
- SUBDIRS = .
-
--AM_CPPFLAGS = -I. -I../include -I../include/laszip
-+AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/include/laszip
- noinst_LTLIBRARIES = liblibrary.la
-
- liblibrary_la_SOURCES = arithmeticmodel.cpp \
---- laszip-src-2.2.0/tools/Makefile.am
-+++ laszip-src-2.2.0/tools/Makefile.am
-@@ -1,5 +1,5 @@
-
--AM_CPPFLAGS = -I../include -I../include/laszip
-+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/laszip
- LDADD = ../liblaszip.la
-
- laszippertest_SOURCES = laszippertest.cpp
---- laszip-src-2.2.0/include/laszip/Makefile.am
-+++ laszip-src-2.2.0/include/laszip/Makefile.am
-@@ -1,4 +1,4 @@
--laszipdir = $(includedir)/
-+laszipdir = $(includedir)/laszip/
-
- laszip_HEADERS = lasunzipper.hpp \
- laszip.hpp \
diff --git a/sci-geosciences/laszip/laszip-2.2.0.ebuild b/sci-geosciences/laszip/laszip-2.2.0.ebuild
deleted file mode 100644
index 02addaad7d04..000000000000
--- a/sci-geosciences/laszip/laszip-2.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils flag-o-matic
-
-DESCRIPTION="Library for free and lossless compression of the LAS LiDAR format"
-HOMEPAGE="https://laszip.org/"
-SRC_URI="https://github.com/LASzip/LASzip/releases/download/v${PV}/${PN}-src-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${P}_fix-build-system.patch
-)
-
-src_configure() {
- append-flags -fno-strict-aliasing
- autotools-utils_src_configure
-}
diff --git a/sci-geosciences/laszip/laszip-3.4.1.ebuild b/sci-geosciences/laszip/laszip-3.4.1.ebuild
index 27cff79b9aa1..921a15518827 100644
--- a/sci-geosciences/laszip/laszip-3.4.1.ebuild
+++ b/sci-geosciences/laszip/laszip-3.4.1.ebuild
@@ -11,6 +11,6 @@ SRC_URI="https://github.com/LASzip/LASzip/releases/download/${PV}/${PN}-src-${PV
SLOT="0"
LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
S="${WORKDIR}/${PN}-src-${PV}"
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index fdfb5137e808..6030231441ca 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -1,8 +1,6 @@
AUX liblas-1.8.0_remove-std-c++98.patch 1141 BLAKE2B 880a1d478c16e680b45e1a064cef2c50d6c662ef1ca15c6beb6548d9dda056e19d2bc30fa87f067e566abf22d1c1b72496539f073d749878933c00bf7d099d8d SHA512 90defe2149a8cf8766022af6cf1248985c350e56bb9fcae99daf9551acf9272b93ea9b9c25ecef86803e75deb0ab50c2a0f919c35705d54ca38c7cafe5940f03
AUX liblas-1.8.1-CVE-2018-20540.patch 1628 BLAKE2B c62bf39a1dd73ec8b1d82d9c4ae499f902ce7c34d0dac20ac3fae58983048503fca393dabcae8206a5e3ef17680bfd627d2005928ce161c37073ecf4d90fb47d SHA512 549c4b29620519521bfbf3bbaa8c01c90e7bf7f7aca411822e2a846476e3cde14212049c95f51f1db981c2f4c65fd1ad1e9644691aebb9db2c4142a883a3c316
AUX liblas-1.8.1-fix-overload-call.patch 641 BLAKE2B 3c4d95080a8fb33bf4652c9d2757a8c4e3bcc0eed910639dc1981fc08a9afbdc960c39f9bbcd06ca2e16091b8ca89d4deeb8424c77458f0d5161cb5c282937da SHA512 9a3b655567708b7c0e31234cb7ae92762923b5bbb13326be31f636ae6335fa726494e1be52c2e102bbf0b6702677fddf51276ce73bb996316b24377ad567a6c6
-DIST libLAS-1.8.1.tar.bz2 3920203 BLAKE2B 2ef8e822c5d1c07d929e788c59e6e5b942aba637fb764d37e1505d136c75cd4a28efc4702b022bcfee8063b684956b4466c9ec00e737d7024ca2719d7b11f341 SHA512 1cb39c557af0006c54f1100d0d409977fcc1886abd155c1b144d806c47f8675a9f2125d3a9aca16bae65d2aabba84d5e5e322b42085e7db312f3d53f92342acf
DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6
EBUILD liblas-1.8.1-r2.ebuild 1123 BLAKE2B d1f798381b274dcadbc420107cb61b7cc62cb15e3f411a6e7bab0d1f76f14d1f973be353adc1fa6087aadefae222f3916fb62997a5ff2e8290857aee41a0b11c SHA512 7a4b7b78333be4c2c364c9961bc237b1d1c7c35ae1a28e8b5fad59f4aadadf6bf736faf3a8f5ad49bddabbd0c14d1a34e2646dfb9bf58c664bfa64a3229bc6ed
-EBUILD liblas-1.8.1.ebuild 986 BLAKE2B c9af42b8c995edc65e44129edb303a61df2a154ece99e1772520a5debd96803e5be5a1d6d72a0297371b6d236910aef3aa3c68f2853ccd5dbad366becfe2d84a SHA512 2f5ccdcc9ad4a14f868f6d3996079fd0030e369e3cfb02fa0bda923cd8122fa78e2c4472ede1c6258955d35cbc7b34092d7ebf66e20f4aadd3249dd9553cfece
MISC metadata.xml 497 BLAKE2B cdae8ef4bfaffefd73a5751950379c704581e09a9f435fc52bac7520f3632fc37007d21750616a05060e2f9213a8ee05278c565be9b80ee8529ff9e5a6c07b6c SHA512 21d5b18461e131a543ba5a5ac1b2f06652d5d49ebd0e590f0bd0971deb337efeb813698613e4bbf200a934a3afa9b20dbb80d6659778c22c8a97d9471007d3d7
diff --git a/sci-geosciences/liblas/liblas-1.8.1.ebuild b/sci-geosciences/liblas/liblas-1.8.1.ebuild
deleted file mode 100644
index 2b0d2893bd8a..000000000000
--- a/sci-geosciences/liblas/liblas-1.8.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS"
-HOMEPAGE="http://www.liblas.org"
-SRC_URI="http://download.osgeo.org/${PN}/libLAS-${PV}.tar.bz2"
-
-# tests known to fail due to LD_LIBRARY_PATH issue
-RESTRICT="test"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
-IUSE="gdal"
-
-RDEPEND="
- dev-libs/boost:=
- sci-geosciences/laszip
- sci-libs/libgeotiff
- gdal? ( sci-libs/gdal )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/libLAS-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.0_remove-std-c++98.patch
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # add missing linkage
- sed -e 's:${LAS2COL} ${LIBLAS_C_LIB_NAME}:& ${CMAKE_THREAD_LIBS_INIT}:' \
- -i "${S}/apps/CMakeLists.txt" || die
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DWITH_GDAL=$(usex gdal)"
- -DLIBLAS_LIB_SUBDIR=$(get_libdir)
- )
- cmake-utils_src_configure
-}
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 8128edbcd07b..5438baf92c21 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -4,6 +4,6 @@ AUX merkaartor-0.18.3-webengine1.patch 6601 BLAKE2B efcb88f07abc23ff5221f42beb43
AUX merkaartor-0.18.3-webengine2.patch 1647 BLAKE2B eb11ac314da643a6db425b8c0f520e315218420be2a438995a9f9deaaebf48c9f5e1bb65fa59bb20aab0c269f8730e299aedbaa40152eba44ae2b7a8c0139885 SHA512 faf8a4b22da050a88278672a77029c87a2b30658efc424a4c046a8fcecd491f763278076aad32cb88d8bd254d3f5837e272f178ca97c88a55831199aff0a138a
AUX merkaartor-0.18.3-webengine3.patch 4895 BLAKE2B 38a9a6a87774094a8a6b1104dc2f5a4156bb908799ae6388b6d90ad41d9ef1a288368e7854dcdeddcd1db6a316c3488c90d7760c8757787be605a5e3de0c9afc SHA512 8b7478f5d3342f288f368b22ccfae113c0358d81ddce31eb211671202ac97ac314d73e0762ab66f0f708edfbeef3dfd5a4a6a2da7a37bf8f93b2151cfa56def2
DIST merkaartor-0.18.3.tar.gz 7104234 BLAKE2B e7d84297452ad20daf2ab18c4aef3736758d98e6f839be1152651aa0196ccee2983d89935f121d4436245d7fdd1fa6b97cd99e6a154158cad4751eba02819a74 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915
-EBUILD merkaartor-0.18.3-r4.ebuild 2396 BLAKE2B 67cee765fa25b9ac7bf20ca89e10f51152ace48710eec72399c8b2d28b9521b4878655318caf90345c2d549af0346a73c70d1b81c6acc3f6ee3d8074bf5f102d SHA512 3a10b813895d1e5526e2bd718c4d17185ac5205c5e0d20f5952681776f409990aff108e2645a704595561858d562f3fb0c9db9adde0776e3b81f535a1217a926
+EBUILD merkaartor-0.18.3-r4.ebuild 2462 BLAKE2B 296c8018e70f8addce82ff4000e5396efca396d8856e2302881db3750697c2ae09f74c3a533bcf7db990a2d319075781c8220d715bab87648bfbd4a8370b328a SHA512 abee2b7969b621436f300b87c4604846e8a3f712abbf64b849b16192bc75b9bff61fad1eb304f38df89a89c506efb4d545f73f738f4f6afbc69d08956773e431
EBUILD merkaartor-9999.ebuild 2293 BLAKE2B 3dc5a0124e7a40bdcc2adf52e55ab2dc5368057e7d7e4fbd8990ef67e5d986f2497f7dde191e882cf2a26542dfa5bf8c6d213a1b6a79f095e56184dbc49856b4 SHA512 1366d4dd45c937b73c2125e549bf7fb0a4e97d38c3a76bc737966440735dbe451cecec9db5958ee9455abff00409deda507207f3b39cf8b00b7abc2ca5a31b9e
MISC metadata.xml 575 BLAKE2B d9a30a01f5b6c55e9a4865f6f1aa92ea610ad2f1aa9ab1bcb129dfbf03f9579fe7f3d8bdf604da0564b4d53b65d54b8c32f3628f1e8e389f6368d14cfca9997b SHA512 d9e5293c9bf7a3bfc7fd691d5a61c7de6c284941da73883590e4956bb4a7b26215e003a9096b9fdaa1f7590765aad583bec04ad6ec8778bc4a26a422a3e2da38
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
index d3bb9dded76e..7c990dab3794 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-inherit gnome2-utils l10n qmake-utils xdg-utils
+inherit gnome2-utils l10n qmake-utils xdg-utils flag-o-matic
DESCRIPTION="Qt based map editor for the openstreetmap.org project"
HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
@@ -65,6 +65,8 @@ src_prepare() {
}
src_configure() {
+ append-flags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+
# TRANSDIR_SYSTEM is for bug #385671
eqmake5 \
PREFIX="${ED%/}/usr" \
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-02 23:52:39 +0000