gentoo auto-resync : 18:07:2023 - 00:58:24

3 files changed, 3 insertions, 49 deletions

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index f5d5e9748fc5..378fa0ddd494 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -5,7 +5,7 @@ DIST grass-8.3.0.tar.gz 68481826 BLAKE2B dc918958333387356ec655c0f12f18654522976
 DIST grass-8.3.0RC1.tar.gz 67872978 BLAKE2B 5394d929e5d9aaed157a87a5eef720403cbb82e0900a591f38d7e88c570dbcc22e4aa4cd6bd060f09736700f48426c40da6cdcc22abc6bee8d04af886aa9b805 SHA512 6a74d142061b9b6d7eebc9226ae7b3c0201f8153c5e9d95236ceab143a6a6613d6aba03de59180817ff73f64ed34c5c289bd2d370352f52a8d5eab4d61044ac7
 EBUILD grass-8.2.0-r7.ebuild 7040 BLAKE2B 67ec8b86b1d142b6cb65626b8acb67b3dcef883e4d106000ba60e15a12d38b31d996d22e14dacf19a0272e946ddf463a420ee159f8017e0c7413e42499aacc35 SHA512 79a2f8010fa35e770aa0d294db0cb65ba7573c0eefa1541b2d2677d5e1f37396cbd99bc9c00cdd15ee9ad426547bcf2fc26bdeca394b05290d200ddc57f2dd88
 EBUILD grass-8.2.1-r2.ebuild 7477 BLAKE2B 0a046890bdb1147a5c1c11942ac91be79ae19876508a32501926a1c436f1acb5112d8b4cb1ef9b8f14bac51b233ced8dda6c2686b81b011ca8c0b786a14c6de0 SHA512 2c25567c04f4367f7842181e23d977c06aaa644048e0e2cb6111a6f57e8551125b1888703ef4d32ae1e44b0a49319b5e67256d45d26965499c0176486b718cd7
-EBUILD grass-8.3.0.ebuild 7750 BLAKE2B 11eb85387f9834893b2e7b31ad59da327082c4decc79103fc633813b9af9139d9d88c154ee418947df0fc94e810739be8bbae1b0b256db16332208acb5dd93de SHA512 23d9f9d5f6bf45ed62559abeab547359edfd6b1ecc5e035286251fc43525c7ce53f2b11cf6f468e9216e0b5445028c3f71863480ef463a09d127eb4895d54836
+EBUILD grass-8.3.0.ebuild 6852 BLAKE2B 33d7564a0342300e86afe797ed0205030ca4048507b98f50715888d22988099a97356f6d3eeb2ccdb594f40e0189a97bca0824935336aa47e7410417d7d169d5 SHA512 394a23c33f3875ca4a756e92128c928b0eee7504922b3cbe64619ab7aa9f09ae57e8e91c53c90eb14b1c4f314395fef457df365a78c483ae5eeaa17321fe0cc5
 EBUILD grass-8.3.0_rc1.ebuild 7750 BLAKE2B 11eb85387f9834893b2e7b31ad59da327082c4decc79103fc633813b9af9139d9d88c154ee418947df0fc94e810739be8bbae1b0b256db16332208acb5dd93de SHA512 23d9f9d5f6bf45ed62559abeab547359edfd6b1ecc5e035286251fc43525c7ce53f2b11cf6f468e9216e0b5445028c3f71863480ef463a09d127eb4895d54836
-EBUILD grass-9999.ebuild 7690 BLAKE2B c6564932be32406a7a218e1f11b760e26d1a4efb76c6a22490cfdafcf44cd615bffafccceb3de35c695b1eb0caddc7f137609eac28eccd5e10e8d3aed3975da8 SHA512 2780d6ffbfd5d975b3c1bc74c015282cd2ae68867f6f96b3e55822c1774cce7ce09241ccc2c615f0af09b10cc4b692be032be125a2393b015a838e1705dff3cf
+EBUILD grass-9999.ebuild 6792 BLAKE2B 9cd6264c78b038abeaa85e75e088e962bf723f4947c1e0189cc9300a9777dc6aa64eb50e84f07d90c5692522076c22a2550190bb5259965c8e3d79edc4f4d66f SHA512 1ab79915d2942237cdeadbcd9ec85b728a750a82aecad55c9c1f9e69d359fc389483b095686d8b768c99f8d72d13d5b6f41a7af7dd049688e495575e46704e46
 MISC metadata.xml 1260 BLAKE2B f1947bde5f78b608d59997dfe2475021e1646f3c70d78ba9d9140642bff040107f0b202bf91f5ebb05191169274c2fd564889992dfadfcada6b95f4bd1c08e9d SHA512 6bcbe13f8daccb68ea167d7cc9797643ab9b50c1c183c52d53a7cacc4f9ddfbaac583426b13be47bed67bd5a3d6b99a9a8447886749b3f87e8d45420ce111538
diff --git a/sci-geosciences/grass/grass-8.3.0.ebuild b/sci-geosciences/grass/grass-8.3.0.ebuild
index 212d805be495..e80a47292e49 100644
--- a/sci-geosciences/grass/grass-8.3.0.ebuild
+++ b/sci-geosciences/grass/grass-8.3.0.ebuild
@@ -240,34 +240,11 @@ src_install() {
 	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"
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 4a055a1fe3ea..a4a84ca2dae9 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://grass.osgeo.org/"
 LICENSE="GPL-2"
 
 if [[ ${PV} =~ "9999" ]]; then
-	SLOT="0/8.3"
+	SLOT="0/8.4"
 else
 	SLOT="0/$(ver_cut 1-2 ${PV})"
 fi
@@ -235,34 +235,11 @@ src_install() {
 	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"