From 0922e7f160098c343e6e41a5e167a69b9e035db6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 May 2023 05:33:06 +0100 Subject: gentoo auto-resync : 06:05:2023 - 05:33:06 --- sci-geosciences/grass/Manifest | 5 +- sci-geosciences/grass/grass-8.2.0-r8.ebuild | 283 ---------------------------- sci-geosciences/grass/grass-8.2.1-r2.ebuild | 2 +- sci-geosciences/grass/grass-9999.ebuild | 2 +- 4 files changed, 4 insertions(+), 288 deletions(-) delete mode 100644 sci-geosciences/grass/grass-8.2.0-r8.ebuild (limited to 'sci-geosciences/grass') diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 785c72ab7765..822033882088 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -2,7 +2,6 @@ AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3 SHA512 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930 DIST grass-8.2.1.tar.gz 66827246 BLAKE2B d48e9169e7a444ed378b968f7d3cd76a6626c3a8d0ced9191c95842e2180178f9fa40a85b0c6a07742f22029b654f93909cacaef2ef2ed017b545183c7f163a3 SHA512 3d48519881d2ad0862185aa7541f39fd5ba19e53918655962b66855b330d693a1cfe9370c0283eefd49a2813e5e9f3399edc03e4e1e15518106342b3b105c661 EBUILD grass-8.2.0-r7.ebuild 7039 BLAKE2B 3a3d71eab47f8b6e756461698ca002b59d1c7d68de4b0c9dcb336ba7a20345eb0e0f564f2fcc30ad02285c235b899f85531a19dba0d204032b75c051db4c0a1f SHA512 4a45392b214a476579dbb7e71a3fe6e907498d625ca8a4659c590dbb1199c343e7f83155363b45f682411390c60554d8b5ff2f157d1f5d8b4b8c57e9ad53c920 -EBUILD grass-8.2.0-r8.ebuild 7405 BLAKE2B 8ed340e77927d627ae10df1715343b3f1f466252dfa3356d31c19e381b8a37289c26b72cf1f0559e60d67e0a23e2e4275f1987f4547569832559b47c76e2d5ca SHA512 a715a045fceabe0197278121b324fef1a3dfdd5a0e9f78941903f91f4cf90d3af9f1980ce9b8493db7050a8d104e3d4a2d71d7f36f83906f65e27a6fc3ce1158 -EBUILD grass-8.2.1-r2.ebuild 7471 BLAKE2B 45e7afaa159a80b3847238919c036c69854fb1905e7c8e2de05069aa9dbeef592449b752a0b2e08817b2b088b4e270cb4c19d00b1a0eae2eab859dac8637ce9c SHA512 f490e553ba9be346929203f07cc2ded5f1d05f43f71225a5741f4bc52e00309d3369d6601fdc0ce507a2d3dfb024a0911328edf83e825e842a0d4ef786dc1a7a -EBUILD grass-9999.ebuild 7413 BLAKE2B 003369709d334b14b3c7cdd71e4d95296b209866d05ad80d825f000eb8e72c594181f4ea2542259625844c07a00f469b23c657a4f5b3fada69c0b686ac806fc8 SHA512 8a5680607a8c4ccea97e4cd977d208b6ce9520d1f03b0417b394d6c0cadf4474049ddeda44ecfdf55837ee66c6f0137e32766ace3ece6c3d930ae7de0b35d696 +EBUILD grass-8.2.1-r2.ebuild 7476 BLAKE2B caf0cc4956ecf1c1e546fa94375694af9c04bd2402b513b50943637dd34802fc0458a72db13a53c31dab8d541db2abfe3e8f67b2fbbf7a683dfa5edce1f353eb SHA512 96b263115bc0e719d6d8d6268dd704a37c5ef1011c247529a57103635dca0154ca6138983b74d6265becef849cbc75207c962b47861ae3484a19ac9e584ad4ed +EBUILD grass-9999.ebuild 7418 BLAKE2B 6b5c73b7c4d1b271dda2a6b96dbf78803440cc9cf9cdb502648900fb6cfc42e71c70d2da85b4002acd326a0c4af65b99ee4a0932b1d39e47c72041ee9871d7f8 SHA512 0ecf99a2f65a740227f14fcb4cc7cc6c0eae27b1c3cd49db133096e553e46ccc864ca9ded025a087939493830ad9c7b1096f28c3f771b94c5ce96bafd8b2b546 MISC metadata.xml 1260 BLAKE2B f1947bde5f78b608d59997dfe2475021e1646f3c70d78ba9d9140642bff040107f0b202bf91f5ebb05191169274c2fd564889992dfadfcada6b95f4bd1c08e9d SHA512 6bcbe13f8daccb68ea167d7cc9797643ab9b50c1c183c52d53a7cacc4f9ddfbaac583426b13be47bed67bd5a3d6b99a9a8447886749b3f87e8d45420ce111538 diff --git a/sci-geosciences/grass/grass-8.2.0-r8.ebuild b/sci-geosciences/grass/grass-8.2.0-r8.ebuild deleted file mode 100644 index 037ead627c64..000000000000 --- a/sci-geosciences/grass/grass-8.2.0-r8.ebuild +++ /dev/null @@ -1,283 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) -PYTHON_REQ_USE="sqlite" # bug 572440 - -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/" - -LICENSE="GPL-2" - -if [[ ${PV} =~ "9999" ]]; then - SLOT="0/8.3" -else - SLOT="0/$(ver_cut 1-2 ${PV})" -fi - -GVERSION=${SLOT#*/} -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 ~x86" - fi - - S="${WORKDIR}/${MY_P}" -fi - -IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - opengl? ( X )" - -RDEPEND=" - ${PYTHON_DEPS} - >=app-admin/eselect-1.2 - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ') - sci-libs/gdal:= - sys-libs/gdbm:= - sys-libs/ncurses:= - sci-libs/proj:= - sys-libs/zlib - media-libs/libglvnd - media-libs/glu - blas? ( - virtual/cblas[eselect-ldso(+)] - virtual/blas[eselect-ldso(+)] - ) - fftw? ( sci-libs/fftw:3.0= ) - geos? ( sci-libs/geos:= ) - lapack? ( virtual/lapack[eselect-ldso(+)] ) - las? ( sci-geosciences/liblas ) - mysql? ( dev-db/mysql-connector-c:= ) - netcdf? ( sci-libs/netcdf:= ) - odbc? ( dev-db/unixODBC ) - opencl? ( virtual/opencl ) - opengl? ( virtual/opengl ) - pdal? ( >=sci-libs/pdal-2.0.0:= ) - png? ( media-libs/libpng:= ) - postgres? ( >=dev-db/postgresql-8.4:= ) - readline? ( sys-libs/readline:= ) - sqlite? ( dev-db/sqlite:3 ) - tiff? ( media-libs/tiff:= ) - truetype? ( media-libs/freetype:2 ) - X? ( - dev-python/wxpython:4.0 - x11-libs/cairo[X] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt - ) - zstd? ( app-arch/zstd:= )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -BDEPEND=" - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - X? ( dev-lang/swig )" - -PATCHES=( - # bug 746590 - "${FILESDIR}/${PN}-flock.patch" -) - -pkg_setup() { - if use lapack; then - local mylapack=$(eselect lapack show) - if [[ -z "${mylapack/.*reference.*/}" ]] && \ - [[ -z "${mylapack/.*atlas.*/}" ]]; then - ewarn "You need to set lapack to atlas or reference. Do:" - ewarn " eselect lapack set " - ewarn "where is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - if use blas; then - local myblas=$(eselect blas show) - if [[ -z "${myblas/.*reference.*/}" ]] && \ - [[ -z "${myblas/.*atlas.*/}" ]]; then - ewarn "You need to set blas to atlas or reference. Do:" - ewarn " eselect blas set " - ewarn "where is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - # Fix unversioned python calls - sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die - sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die - - default - - # When patching the build system, avoid running autoheader here. The file - # config.in.h is maintained manually upstream. Changes to it may lead to - # undefined behavior. See bug #866554. - # AT_NOEAUTOHEADER=1 eautoreconf - - 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 - local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - local 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() { - addwrite /dev/dri/renderD128 - - local myeconfargs=( - --enable-shared - --disable-w11 - --without-opendwg - --with-regex - --with-gdal="${EPREFIX}"/usr/bin/gdal-config - --with-proj-includes="${EPREFIX}"/usr/include/proj - --with-proj-libs="${EPREFIX}"/usr/$(get_libdir) - --with-proj-share="${EPREFIX}"/usr/share/proj/ - $(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 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) - $(use_with threads pthread) - $(use_with openmp) - $(use_with opencl) - $(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config) - $(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config) - $(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config) - $(use_with geos geos "${EPREFIX}"/usr/bin/geos-config) - $(use_with X x) - $(use_with zstd) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - # we don't want to link against embedded mysql lib - emake CC="$(tc-getCC)" MYSQLDLIB="" -} - -src_install() { - emake DESTDIR="${ED}" \ - INST_DIR=/usr/$(get_libdir)/${MY_PM} \ - prefix=/usr/ BINDIR=/usr/bin \ - install - - pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die - - local HTML_DOCS=( docs/html/. ) - einstalldocs - - # translations - if use nls; then - insinto /usr/share/locale - doins -r locale/. - fi - - popd >/dev/null || die - - # link libraries in the ~standard~ place - local f file - for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do - file="${f##*/}" - dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file} - 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="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/ - for f in "${scriptMakeDir}"/*; do - file="${f##*/}" - echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die - sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die - done - - # 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}\"):\ -GISBASE = os.path.normpath(\"${gisbase}\"):" \ - -i "${ED}"/usr/bin/grass || die - - # get proper fonts path for fontcap - sed -i \ - -e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \ - "${ED}"${gisbase}/etc/fontcap || die - - # set proper python interpreter - sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\ -os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ - -i "${ED}"/usr/bin/grass || die - - # set proper GISDBASE directory path in the demolocation .grassrc${GVERSION//.} file - sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \ - -i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die - - if use X; then - local GUI="--gui" - make_desktop_entry "/usr/bin/grass ${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 "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die -} - -pkg_postinst() { - use X && xdg_pkg_postinst -} - -pkg_postrm() { - use X && xdg_pkg_postrm -} diff --git a/sci-geosciences/grass/grass-8.2.1-r2.ebuild b/sci-geosciences/grass/grass-8.2.1-r2.ebuild index 3f2fa48bc572..491dfe74bf6b 100644 --- a/sci-geosciences/grass/grass-8.2.1-r2.ebuild +++ b/sci-geosciences/grass/grass-8.2.1-r2.ebuild @@ -30,7 +30,7 @@ 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 x86" + KEYWORDS="amd64 ~ppc x86" fi S="${WORKDIR}/${MY_P}" diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild index c335853ae4e4..4b7fab7cb764 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -30,7 +30,7 @@ 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 ~x86" + KEYWORDS="~amd64 ~ppc ~x86" fi S="${WORKDIR}/${MY_P}" -- cgit v1.2.3