diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
| commit | c719fdcee603a5a706a45d10cb598762d56a727d (patch) | |
| tree | 620cbf137661399a3fb1eff92914204f9a970713 /sci-geosciences/grass | |
| parent | cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff) | |
gentoo resync : 25.09.2021
Diffstat (limited to 'sci-geosciences/grass')
| -rw-r--r-- | sci-geosciences/grass/Manifest | 2 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-9999.ebuild | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index be3e220526a4..3cdc35ee0b04 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -2,5 +2,5 @@ AUX grass-7.8-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a AUX grass-7.8.5-bool.patch 4472 BLAKE2B b48a2138b9299e91eb15ebe62f29f0a677dfc690477c2997c36fb5e3261ae64d1d3445b3fb4a241a39c504591b07af121e92f1ef9f9efb3ade01e82974f8955a SHA512 1dc95cddca38ea5e8200176a92bb412f4a3295eae18e770a6db3aa0d8cfbf11116dce1c9970bd03d78ee69d23254d2e85637f0a00208aff7aa428e52d631121b DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65 EBUILD grass-7.8.5.ebuild 6993 BLAKE2B a772460a6bc1ce8c2b50bd68dafb4b98c0771bab4ed72e99f685064081f7f9e1edb3abfc9fb308579e864f12beb282383029e89455ab73e4c235ebdc5ec81117 SHA512 cf69543c0883fe7d93bedb72280d04ca8055c6659bc84a6016a86c58c273487aba68948c84b6bc5ff3c84223c375d5ac4c32f7ca53dd175c2e19ded5c2a223b6 -EBUILD grass-9999.ebuild 6869 BLAKE2B a70777bdbcfa1bd020d7f64a6dbcd74194075c18a9bc753fa0cfaf7113c9a1fe8f087e6f3a7ec0ab77d6eca08eac0ce5bad401e95686baec0c3bd0c28618bda9 SHA512 20ff6e8b55ba0090f4beb9750ce67ed3746f443568397a636f4c82dac2eb705dfa73b3541c00ba6b232a7f609a891ef3424fa291cb104e59384d3cdc553346de +EBUILD grass-9999.ebuild 6912 BLAKE2B 7bd4ff92016a41bfc90117141715552cdcba802c108d15de90c2ae94a4df25200e0a5df636e9db5b796fa1620ee2816ce39cbdd86e1e6e9290ced2c41a7c8706 SHA512 5705e43a5087fe307d3d9d1b5551beff4f9b56de9a75757d478d60508faf4be29eb6d1bcae3bcce6a01900ce6a62ba105c9211654ba94b6beacbfeb5b7942edf MISC metadata.xml 1165 BLAKE2B 5cfa38c94f3855681ac0f61ae88c58de766eab048601d8c45324f192de975287088ab424030857f4a84ae6eea01fc0e9033ab36c00e679645545cd857722d060 SHA512 58a86942daa71543093c95015366a08f75fa88075330ffda2431e47d93d79f60c8f60b90c05e2a068283045f54db8f8f45dcb36664268a1207e90fa90bd6d63b diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild index a77634827df1..68ab67f5dad5 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -3,14 +3,14 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..9} ) +PYTHON_COMPAT=( python3_{8,9} ) PYTHON_REQ_USE="sqlite" # bug 572440 -WANT_AUTOCONF="2.1" +WANT_AUTOCONF="2.5" WX_GTK_VER="3.0-gtk3" -inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs wxwidgets xdg +inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg -MY_P="${PN}7.9" +MY_P="${PN}8.0" MY_PM="${MY_P/.}" DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" @@ -216,6 +216,8 @@ src_install() { sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die done + mv ${D}/usr/bin/grass ${D}/usr/bin/${MY_PM} || die + # get proper folder for grass path in script local gisbase=/usr/$(get_libdir)/${MY_PM} sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\ @@ -228,13 +230,13 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \ "${ED}"${gisbase}/etc/fontcap || die # set proper python interpreter - sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\ -os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \ + sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\ +os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ -i "${ED}"/usr/bin/${MY_PM} || die - # set proper GISDBASE directory path in the demolocation .grassrc79 file + # set proper GISDBASE directory path in the demolocation .grassrc80 file sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \ - -i "${ED}"${gisbase}/demolocation/.grassrc79 || die + -i "${ED}"${gisbase}/demolocation/.grassrc80 || die if use X; then local GUI="-gui" |