gentoo auto-resync : 12:02:2023 - 09:56:54

4 files changed, 306 insertions, 8 deletions

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 217245e23591..d8626c4f8933 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,6 +1,8 @@
 AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
 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-r5.ebuild 7057 BLAKE2B 00ba45cca744b783ab69522994b75d7f674c474c6f3bacea6a054bc58a2d7ab652a809bd551d436d1f00bd1efc89304dbf14f16fe8e93b18bc32b4786c38429b SHA512 d58ad7ca9d83cf9436a065794f22bd7e0d03606e247ca2e8311f293363941c0754d06a05de670707e794d52f5159ff64d087e6b03e38833a6912d5fd566ed250
-EBUILD grass-8.2.0-r6.ebuild 7383 BLAKE2B 17246501f11796e05f5628f68734dc92ac1a9117cfbc256876c2199efd0bd3c9a2ea4b96246aa7d831e207a78577f496e64f7a244533be2e93bf4b5048c10fb5 SHA512 1f94e09f9cb81b51ffc81c1d366482d1c4f12cd43001e17cbc70375dc9b18e21770018c736a6181c068d10ac8209a92bc5b9067932dc2702ad88972976def668
-EBUILD grass-9999.ebuild 7329 BLAKE2B 626494b1d623bf3566df44e3e16fc7ea376c6eba10ace64a1088156c5d5d2e1ca3f54d12df606d8a10089b47248603e9054f1532b53f2b33dee16cb68c329bed SHA512 6d7182eec1ca2410873b01023c3713cdbdd36eb1b98f2e29c56def0bc48ff7682379b1370e2a2ed9ebfb5ba0c523e93d08b021b928873bf558e4d9f2f56fb84a
+EBUILD grass-8.2.0-r6.ebuild 7423 BLAKE2B 0da1dcf450ff6e4a3a256ba6c27c1605d6d3310a2928318e514c29e8b0e15dc94ca00329722f6dbe579aa8232eeccab6c72762083ddaf82ef601d3f0d6a16f8b SHA512 449842eb7b47cc730eb0c53a4c4be0607bd02d15ac5926e683a8489dc926bf4a5f8a4feeedf91bae082c083bc197e89db201911d631257d8bcc771e5321343dc
+EBUILD grass-8.2.1.ebuild 7485 BLAKE2B da0b87e066bfefe44a0408493b94f1c5760d89af81b75600e3eca677804c5f3af1de5df75f7c1b9613e07656331855634baa079ff724659d42034b3446fae2f4 SHA512 95b523ea0f24ae861220c1ad923f72ae336ff2f86cf774479cbdb22b20a8c809612e216017dc7c61afe1aa3fd71bed7a9266c3329df64b7e9e6f791160025458
+EBUILD grass-9999.ebuild 7425 BLAKE2B 80ac52744591d81e1ff8360ec07fe64e7f32c528f19a4bbcf0168455e51d04191805615f0adcfbf824c219a6a7c630df1cb80a3b2da4116cc8fea9e2ecb2ca9c SHA512 c33fe998096de1cea56074caa0a991600c245688ec974f67de48a9a306937deb06a3e4281b7e569768aefe94b512637f4389d80ba97d803ab013348bb7eb6b0a
 MISC metadata.xml 1260 BLAKE2B f1947bde5f78b608d59997dfe2475021e1646f3c70d78ba9d9140642bff040107f0b202bf91f5ebb05191169274c2fd564889992dfadfcada6b95f4bd1c08e9d SHA512 6bcbe13f8daccb68ea167d7cc9797643ab9b50c1c183c52d53a7cacc4f9ddfbaac583426b13be47bed67bd5a3d6b99a9a8447886749b3f87e8d45420ce111538
diff --git a/sci-geosciences/grass/grass-8.2.0-r6.ebuild b/sci-geosciences/grass/grass-8.2.0-r6.ebuild
index 2439b5ce2439..89da9d5144ac 100644
--- a/sci-geosciences/grass/grass-8.2.0-r6.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r6.ebuild
@@ -13,17 +13,21 @@ 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
-	SLOT="0/8.3"
 	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
 else
 	MY_P="${P/_rc/RC}"
-	SLOT="0/$(ver_cut 1-2 ${PV})"
 	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
 		KEYWORDS="amd64 ~x86"
diff --git a/sci-geosciences/grass/grass-8.2.1.ebuild b/sci-geosciences/grass/grass-8.2.1.ebuild
new file mode 100644
index 000000000000..0b77a9524bf5
--- /dev/null
+++ b/sci-geosciences/grass/grass-8.2.1.ebuild
@@ -0,0 +1,286 @@
+# 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 bzip2 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:=
+	sci-libs/xdrfile
+	sys-libs/zlib
+	media-libs/libglvnd
+	media-libs/glu
+	blas? (
+		virtual/cblas[eselect-ldso(+)]
+		virtual/blas[eselect-ldso(+)]
+	)
+	bzip2? ( app-arch/bzip2:= )
+	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 <impl>"
+			ewarn "where <impl> 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 <impl>"
+			ewarn "where <impl> 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 bzip2 bzlib)
+		$(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-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index ed97dc748c64..80491b81b91a 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -13,26 +13,30 @@ 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
-	SLOT="0/8.3"
 	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
 else
 	MY_P="${P/_rc/RC}"
-	SLOT="0/$(ver_cut 1-2 ${PV})"
 	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~ppc ~x86"
+		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"
+IUSE="blas bzip2 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 )"
@@ -56,6 +60,7 @@ RDEPEND="
 		virtual/cblas[eselect-ldso(+)]
 		virtual/blas[eselect-ldso(+)]
 	)
+	bzip2? ( app-arch/bzip2:= )
 	fftw? ( sci-libs/fftw:3.0= )
 	geos? ( sci-libs/geos:= )
 	lapack? ( virtual/lapack[eselect-ldso(+)] )
@@ -179,6 +184,7 @@ src_configure() {
 		$(use_with threads pthread)
 		$(use_with openmp)
 		$(use_with opencl)
+		$(use_with bzip2 bzlib)
 		$(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)