commit: c025a5cc57243c1b2304fb250af235b012a95a53 Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de> AuthorDate: Wed Feb 23 20:47:38 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Feb 26 02:25:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c025a5cc
sci-geosciences/grass: version bump 8.0.1 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/24332 Signed-off-by: Sam James <sam <AT> gentoo.org> sci-geosciences/grass/Manifest | 1 + .../{grass-9999.ebuild => grass-8.0.1.ebuild} | 31 +++++++++++++++++----- sci-geosciences/grass/grass-9999.ebuild | 24 +++++++++++++---- 3 files changed, 45 insertions(+), 11 deletions(-) diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 4c2956704d54..fb06ff6d00f4 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,3 +1,4 @@ DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df DIST grass-7.8.7.tar.gz 66333084 BLAKE2B 809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42 SHA512 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303 DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42 +DIST grass-8.0.1.tar.gz 64928098 BLAKE2B 81512a5e95727202705a06e11dcb243a393bb6d7b5756957ffe055c867aa18933d84a31ed5e006e8c25bff558aa3ce5acab9e90660b1537192ffa11c92cdf4cc SHA512 ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-8.0.1.ebuild similarity index 92% copy from sci-geosciences/grass/grass-9999.ebuild copy to sci-geosciences/grass/grass-8.0.1.ebuild index d0b73c80b283..42780861df19 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-8.0.1.ebuild @@ -3,21 +3,35 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="sqlite" # bug 572440 WX_GTK_VER="3.0-gtk3" -inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg +inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" HOMEPAGE="https://grass.osgeo.org/"; -EGIT_REPO_URI="https://github.com/OSGeo/grass.git"; LICENSE="GPL-2" -SLOT="0/8.1" +SLOT="0/8.0" + GVERSION=${SLOT#*/} -MY_P="${PN}${GVERSION}" -MY_PM="${MY_P/.}" +MY_PM="${PN}${GVERSION}" +MY_PM="${MY_PM/.}" + +if [[ ${PV} =~ "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/OSGeo/grass.git"; +else + MY_P="${P/_rc/RC}" + SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"; + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~ppc ~x86" + fi + + S="${WORKDIR}/${MY_P}" +fi + IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -76,6 +90,11 @@ BDEPEND=" virtual/pkgconfig X? ( dev-lang/swig )" +PATCHES=( + # bug 746590 + "${FILESDIR}/${PN}-flock.patch" +) + pkg_setup() { if use lapack; then local mylapack=$(eselect lapack show) diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild index d0b73c80b283..31ad3a913914 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -3,21 +3,35 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="sqlite" # bug 572440 WX_GTK_VER="3.0-gtk3" -inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg +inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" HOMEPAGE="https://grass.osgeo.org/"; -EGIT_REPO_URI="https://github.com/OSGeo/grass.git"; LICENSE="GPL-2" SLOT="0/8.1" + GVERSION=${SLOT#*/} -MY_P="${PN}${GVERSION}" -MY_PM="${MY_P/.}" +MY_PM="${PN}${GVERSION}" +MY_PM="${MY_PM/.}" + +if [[ ${PV} =~ "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/OSGeo/grass.git"; +else + MY_P="${P/_rc/RC}" + SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"; + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~ppc ~x86" + fi + + S="${WORKDIR}/${MY_P}" +fi + IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE}
