commit: 5bdc6d89ee08ba95a7202ee153350464cd9e0727 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Thu May 12 14:48:20 2022 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Thu May 12 14:56:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdc6d89
sci-geosciences/grass: add 8.0.2, liblas flag --> las Now the flag name matches dev-games/openscenegraph, added corresponding warning Closes: https://bugs.gentoo.org/680854 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sci-geosciences/grass/Manifest | 1 + .../grass/{grass-9999.ebuild => grass-8.0.2.ebuild} | 15 +++++++++++---- sci-geosciences/grass/grass-9999.ebuild | 8 +++++--- sci-geosciences/grass/metadata.xml | 1 + 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index fb06ff6d00f4..a0364e0e9b96 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -2,3 +2,4 @@ DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8 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 +DIST grass-8.0.2.tar.gz 65665825 BLAKE2B 496dab376b38c74d2206096f8b1bf848888c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f SHA512 fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-8.0.2.ebuild similarity index 93% copy from sci-geosciences/grass/grass-9999.ebuild copy to sci-geosciences/grass/grass-8.0.2.ebuild index f0e2a49326c0..bda087019d91 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-8.0.2.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizu HOMEPAGE="https://grass.osgeo.org/"; LICENSE="GPL-2" -SLOT="0/8.3" +SLOT="0/8.0" GVERSION=${SLOT#*/} MY_PM="${PN}${GVERSION}" @@ -32,7 +32,7 @@ else 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" +IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} opengl? ( X )" @@ -59,7 +59,7 @@ RDEPEND=" fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) - liblas? ( sci-geosciences/liblas ) + las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) @@ -90,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) @@ -179,7 +184,7 @@ src_configure() { $(use_with threads pthread) $(use_with openmp) $(use_with opencl) - $(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config) + $(use_with las 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) @@ -269,6 +274,8 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ pkg_postinst() { use X && xdg_pkg_postinst + ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed' + ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)' } pkg_postrm() { diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild index f0e2a49326c0..33808453c9c7 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -32,7 +32,7 @@ else 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" +IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} opengl? ( X )" @@ -59,7 +59,7 @@ RDEPEND=" fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) - liblas? ( sci-geosciences/liblas ) + las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) @@ -179,7 +179,7 @@ src_configure() { $(use_with threads pthread) $(use_with openmp) $(use_with opencl) - $(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config) + $(use_with las 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) @@ -269,6 +269,8 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ pkg_postinst() { use X && xdg_pkg_postinst + ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed' + ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)' } pkg_postrm() { diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml index 5114a3d95217..66b650a3707b 100644 --- a/sci-geosciences/grass/metadata.xml +++ b/sci-geosciences/grass/metadata.xml @@ -21,6 +21,7 @@ <use> <flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds extended options to the v.select module</flag> <flag name="liblas">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag> + <flag name="las">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag> <flag name="opencl">Enable OpenCL support</flag> </use> <upstream>
