From 0374a8491c853f9331b95ed2a38e688e4d2edce5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 18 Nov 2022 12:58:33 +0000 Subject: gentoo auto-resync : 18:11:2022 - 12:58:32 --- sci-geosciences/grass/Manifest | 6 +++--- sci-geosciences/grass/grass-8.2.0-r2.ebuild | 12 ++---------- sci-geosciences/grass/grass-8.2.0.ebuild | 12 ++---------- sci-geosciences/grass/grass-9999.ebuild | 12 ++---------- 4 files changed, 9 insertions(+), 33 deletions(-) (limited to 'sci-geosciences/grass') diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index cd4ff2a6c771..50a7ea3ca707 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,6 +1,6 @@ AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3 SHA512 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930 -EBUILD grass-8.2.0-r2.ebuild 7572 BLAKE2B 130c45a5e2e82f7b31e101402da6039ac8beded3cd91cd7c314c0992b3c2d2485179de45f2efde76edf23a4f36246d9d205e3eea07c1070eaf878684a866adb6 SHA512 13610dc97e07e9446b85ef73cd996fb4eb343d98523c0c71df0a10bc6c7010498cbcc670c4d373213301a901113522b338054849466e30394579822fcf113a84 -EBUILD grass-8.2.0.ebuild 7245 BLAKE2B 77ed6246ae85e8ded446cfb27f409b7d990da223c00925592a0bf924dea55ca0c152c744cdf0d674a2122db78ded0edb94652fa140ebad125370b0251d00aa47 SHA512 6eff9cb951f5e9a46a7f2c041984a24a9ede682383c0a67a3ed32f45c8a0dcbd0ea3fd1c9402d6beab85e753217188fba2e67c9a735c0f28db343da5f988fcdb -EBUILD grass-9999.ebuild 7518 BLAKE2B 093f24df67d0b7091335db4d0a218f170af7a8ea85255a180548226cdb57c01ad626ac3ada474d8cd9c003f0b25ccc5d91b3d0cd127f44c505ef5f43438fc381 SHA512 33700ee8e4b818e51bd3ead3981ceeb60610a810335c3627d1343d9870d2cac3b044c3708b82bb8d450055ac1fef2059f39925c738bfe270862a4f101135bf7f +EBUILD grass-8.2.0-r2.ebuild 7394 BLAKE2B a4e5cb76fd61fe4be66d922f8b7b5e8d2103e1203b7d241ed5e0a5557207dcae83fcfa3f725d4b0e607b00621259d858ecd5992b526dedc56544bb8386edf9a4 SHA512 0296d7c933b060e627649dec30b26dd341675d39e91f7c3adc019a3d62406230e76badf5411230fddd3ea7a0520075966f06270e9c3d337a51ca6657c6dd4d6c +EBUILD grass-8.2.0.ebuild 7067 BLAKE2B f9e154b7e374a4f58c8478ffe8d730f75c42390b85ac0eb8a3f8d528e471e408bbeae3033381785d03c7fb60610d7b2b5c005f73e5daef87d4aadf63454829b2 SHA512 cfe290642a865fafd4f7a609261109a61329c839c58f28d91b500f6c8bf290958a0577174259fd2794a818c5b43ed3b1b60b0821621ecb92d6ad23cdcb6b345e +EBUILD grass-9999.ebuild 7340 BLAKE2B cb7bec56b78028c8085bfc082187aa0c247eaa83a8adb804d76433d13b66ced90fd71f2d38bbf8a863df0a8a7bc389f37de13c2a051be4bac1173471a45f9663 SHA512 f3a171808038c1c934f77a4b6a2ff056f96a8be0a27e9859599a65fdfc4f7fcc0a15d39103468b325e9296178c7edcf782f102b3178a6554923e9f0c3cfa3364 MISC metadata.xml 1260 BLAKE2B f1947bde5f78b608d59997dfe2475021e1646f3c70d78ba9d9140642bff040107f0b202bf91f5ebb05191169274c2fd564889992dfadfcada6b95f4bd1c08e9d SHA512 6bcbe13f8daccb68ea167d7cc9797643ab9b50c1c183c52d53a7cacc4f9ddfbaac583426b13be47bed67bd5a3d6b99a9a8447886749b3f87e8d45420ce111538 diff --git a/sci-geosciences/grass/grass-8.2.0-r2.ebuild b/sci-geosciences/grass/grass-8.2.0-r2.ebuild index 284209a9365c..40184550c75b 100644 --- a/sci-geosciences/grass/grass-8.2.0-r2.ebuild +++ b/sci-geosciences/grass/grass-8.2.0-r2.ebuild @@ -5,9 +5,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="sqlite" # bug 572440 -WX_GTK_VER="3.0-gtk3" -inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg +inherit desktop python-single-r1 toolchain-funcs xdg DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" HOMEPAGE="https://grass.osgeo.org/" @@ -154,11 +153,6 @@ src_prepare() { } src_configure() { - if use X; then - local WX_BUILD=yes - setup-wxwidgets - fi - addwrite /dev/dri/renderD128 local myeconfargs=( @@ -192,7 +186,6 @@ src_configure() { $(use_with opencl) $(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-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) $(use_with X x) @@ -265,8 +258,7 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ -i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die if use X; then - local GUI="-gui" - [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" + local GUI="--gui" make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" doicon -s 48 gui/icons/${PN}-48x48.png fi diff --git a/sci-geosciences/grass/grass-8.2.0.ebuild b/sci-geosciences/grass/grass-8.2.0.ebuild index 2fa97add74b3..b5338b1fef9b 100644 --- a/sci-geosciences/grass/grass-8.2.0.ebuild +++ b/sci-geosciences/grass/grass-8.2.0.ebuild @@ -5,9 +5,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="sqlite" # bug 572440 -WX_GTK_VER="3.0-gtk3" -inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg +inherit autotools desktop python-single-r1 toolchain-funcs xdg DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" HOMEPAGE="https://grass.osgeo.org/" @@ -148,11 +147,6 @@ src_prepare() { } src_configure() { - if use X; then - local WX_BUILD=yes - setup-wxwidgets - fi - addwrite /dev/dri/renderD128 local myeconfargs=( @@ -185,7 +179,6 @@ src_configure() { $(use_with openmp) $(use_with opencl) $(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) $(use_with X x) @@ -258,8 +251,7 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ -i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die if use X; then - local GUI="-gui" - [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" + local GUI="--gui" make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" doicon -s 48 gui/icons/${PN}-48x48.png fi diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild index 1746efefa7c6..f104afc0e3a8 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -5,9 +5,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="sqlite" # bug 572440 -WX_GTK_VER="3.0-gtk3" -inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg +inherit desktop python-single-r1 toolchain-funcs xdg DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" HOMEPAGE="https://grass.osgeo.org/" @@ -149,11 +148,6 @@ src_prepare() { } src_configure() { - if use X; then - local WX_BUILD=yes - setup-wxwidgets - fi - addwrite /dev/dri/renderD128 local myeconfargs=( @@ -187,7 +181,6 @@ src_configure() { $(use_with opencl) $(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-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) $(use_with X x) @@ -260,8 +253,7 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ -i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die if use X; then - local GUI="-gui" - [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" + local GUI="--gui" make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" doicon -s 48 gui/icons/${PN}-48x48.png fi -- cgit v1.2.3