gentoo auto-resync : 20:11:2023 - 23:10:12

6 files changed, 12 insertions, 5 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 56cbd22b8c04..3c8c1d026dd3 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 4a29dc28d792..ce8da9029da6 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -12,6 +12,6 @@ DIST freecad-0.21.2.tar.gz 66124278 BLAKE2B 84a4f8008192cd1a2ee1737b537b2668a8c0
 EBUILD freecad-0.20.2-r1.ebuild 10408 BLAKE2B 503eb47d56c92d9a95727825366a7b16a03f6df378e6a0fe300bed5300ccce77af5d13c09fb797cc6b0deed46747001ded8f439331e34e373e4bfd5ba59cf74a SHA512 ea4520aeb24c1baa91469b5f2f672d8d52217a31901600a8f3f4dbb9a7dff3faf9724e9dd79c39b36ff08d5a63f8acce6779eb1ebae004f951a5a857df522a8d
 EBUILD freecad-0.20.2-r2.ebuild 10385 BLAKE2B df9d6c357735e35016585e4514a28f3819fff42b9090dda6fc00c3aa41523985fe249e935b858a4bf39b1faf226712b191db62d27ffc77fbf44bc18abe28ca4c SHA512 fc19d0fd6bdcd1abc0dc8f99ced84e39842d4c3f9289a9d5d544da06799aae400f9d91ab607db02bd96e52dd658fba8b70a18fc96114a5b563eba4b6dbc26ff4
 EBUILD freecad-0.20.2.ebuild 9858 BLAKE2B 254dcc53a8eecf329854e10af1d13bd6995f4d2720268cd0e0e59ca3e5c10385d6edfe18ff1c5a36fe03d4ae0a4bccf4eafa6f778424b9ef281b15e0e368c6e4 SHA512 5e6f6bffadf57ab79b578790e9bf62934f5b598e09cdb8a6f08c07a06ff8a4d8daf297114c88f4abb5400991526abd28bb00cd7be79333b27a8f0f92179b49cb
-EBUILD freecad-0.21.2.ebuild 11187 BLAKE2B 2ebd0a81317cb25b0cb31814df4426b67362ae5d6d084d073b25b4a94d8ff499a8b522336c567c2995742dbbdd899be8d7cdcdc40b411db602b045fc85a06251 SHA512 9fe607edcb80dc9d1cb23b59e4baea9a2046159e94129fbd346c87e7879165602a82e777b11673579601f2c430e49062957bd55e75896abaf16f7066240caa5a
-EBUILD freecad-9999.ebuild 11267 BLAKE2B 104bace00c9e2e02226fe2a2e5012d498f9881d9fbcb5fd84289aefaa9aa7893686dfd011902e7c2829d4db63bcf32e2f2e3e4f6d8fabe4ad223b501f217fc19 SHA512 c278ef1a340836f997d5e2a4b83e7f7faf6d32af1e94497bf9ce3a8ecbd9a30ee95c234118aa48cab71d4f0de6da44c81a4c7f0261cc5d417be6a73226de3d27
+EBUILD freecad-0.21.2.ebuild 11192 BLAKE2B 5ec9540ba5aaee49e0bbd113af5e970a7a9da835a785984276b9b41083fc90d4473b9096a1dc537272cdb034bbb6d5fc317e120c432b90c895190347dd2a0258 SHA512 58ae03de3dd786c5100f29a79a9fd00b30f6600303316b989d451b96debe1c06c1bf42d36821e77049d897605dd64b609b3d329f46fb73056d964519ed7bfafe
+EBUILD freecad-9999.ebuild 11272 BLAKE2B a5ef49fa517655430733bf3587cd632ed0e4fadbd0dde62dcd47cffac302432f1abe346dd803c799e860cd06048533654ebfc2c44f5889ddd9d184811adec997 SHA512 68087fbfbc96a76459d5e45aa34341fffb1ebeee600c396b71c446767561c58dc3e8281e5899c8d5e67846250e5423559f19e0fff4a3914619e2962f61b3dec5
 MISC metadata.xml 3189 BLAKE2B b236dc1ac3c1a56609cc0d40b6f6ed5cb0c70ce06bd3c5dce45c5f3bcf1d06548a3d62e7e5c786278f84a6874ed330a470a753946c1e6963e7b5fa7d43854eb8 SHA512 ac8018f6c6819c237168228bd767659e1fd1b7aec18c8581a284e498a91dceda78ced26f7a5a1f3b110956fd940f72c677984e1127f76c9fd6330a7d54044fa2
diff --git a/media-gfx/freecad/freecad-0.21.2.ebuild b/media-gfx/freecad/freecad-0.21.2.ebuild
index c99cbce11039..1932b59458c1 100644
--- a/media-gfx/freecad/freecad-0.21.2.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2.ebuild
@@ -74,7 +74,7 @@ RDEPEND="
 	)
 	fem? (
 		!qt6? ( sci-libs/vtk:=[qt5,rendering] )
-		qt6? ( sci-libs/vtk:=[qt6,rendering] )
+		qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
 	)
 	gui? (
 		>=media-libs/coin-4.0.0
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index d174541cdb9c..3865d158c785 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -74,7 +74,7 @@ RDEPEND="
 	)
 	fem? (
 		!qt6? ( sci-libs/vtk:=[qt5,rendering] )
-		qt6? ( sci-libs/vtk:=[qt6,rendering] )
+		qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
 	)
 	gui? (
 		>=media-libs/coin-4.0.0
diff --git a/media-gfx/pinta/Manifest b/media-gfx/pinta/Manifest
index 637f1f1b35b8..f7c4fc5d0d8d 100644
--- a/media-gfx/pinta/Manifest
+++ b/media-gfx/pinta/Manifest
@@ -58,5 +58,5 @@ DIST system.security.principal.windows.4.7.0.nupkg 511086 BLAKE2B 11731c7ad320a4
 DIST system.text.encoding.codepages.4.5.0.nupkg 4270497 BLAKE2B 651d99416e88b551ba305efacedfd5cf221f7a61bd7add2c90c4c31e04d4543194d5844b82723e4cba55548fae4f99701744f8dc82e1407d09d12614a8c43969 SHA512 6909e55204fe24affcd62bfadb313b851ec56493a029b30dbb194ae65eaedc2721b59d851b92c832779d9af5604f5a614e75f8a96094228c9f193425c6b2cda2
 DIST system.threading.tasks.extensions.4.5.4.nupkg 89582 BLAKE2B 728fc5794745b706a7e3a7d05186f34e2a8c1837cafdc7fc9a1bd8fc6fd42025448cbdfa53415a05d872aa08db1deb31d104054630c9ac7ecd29a2ddd973fd5c SHA512 68052086e77d3c7198737a3da163d67740b7c44f93250c39659b3bf21b6547a9abf64cbf40481f5c78f24361af3aaf47d52d188b371554a0928a7f7665c1fc14
 DIST tmds.dbus.0.11.0.nupkg 100417 BLAKE2B 390b66cf60c78194fb791d9313cba866011058635cdffb6a3ae9cb6918a8b73478d077e6af4f945a05b51a2c1d14b0d2acabb75c949dd7690042975bb159dfd2 SHA512 efa0e5d4e803964da25c23fcd678a6078da9c0ac6a1351a46b507a1209230b97aa90678e1cdae51a122f3d2b8106e0ef34d23d45fc9a680fe21f6e9740665e80
-EBUILD pinta-2.1.1.ebuild 2947 BLAKE2B 268c8265565e3d6a9a7baab54f2e910753063b6311b7fb087e6257fc6e8dd67a9335946d82d7b87620229a11f27528390dbc4ec5b0c37e5bcc6fd7f856eac7b7 SHA512 c88ba0a28236366235015c0eeb3400e7bc41254aacadc624f924b91acae509c052a825e026b65fcfd620523603f06a4a54215685672ff5235b42c01413d5f838
+EBUILD pinta-2.1.1-r1.ebuild 3257 BLAKE2B 38e4fc630a68c91174b41d0a0e4b462bcd369b7e6217eaf65467346781092ef1aa514172e5f23b7e87193c8542e9ac404a10b348a454fc913e7d917e676f210a SHA512 16e33bfc1eead08911c3716e3f7ee448d9f70c9673a0ad782b593d0012fd843a7cf1cba748efac65a09db9b91936b54ef39bc089a8b5895d419881e0c62d2115
 MISC metadata.xml 664 BLAKE2B ce88ef1889c6f6928493e18075b6c17696fca5e2a2df26e1a4f645082b41aa261933aebc66411c66125c07fd1104ca3e1cf9357e2a56185967669221325f1222 SHA512 87208ea2d284ac31559f9672ae16bf20a70c20293b7964927fb27d3261e352f2b63fde6434fac37a8f47aced7249a7bab16fc72080ba9a4cc698839613ce96c7
diff --git a/media-gfx/pinta/pinta-2.1.1.ebuild b/media-gfx/pinta/pinta-2.1.1-r1.ebuild
index 0c8314e184e8..d3493a121fb7 100644
--- a/media-gfx/pinta/pinta-2.1.1.ebuild
+++ b/media-gfx/pinta/pinta-2.1.1-r1.ebuild
@@ -123,6 +123,13 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${ED}" install
 
+	local pinta_home="/usr/$(get_libdir)/${PN}"
+
+	mv "${ED}/usr/bin/pinta" "${ED}/${pinta_home}" || die
+	sed -e 's|dotnet|${DOTNET_ROOT}/dotnet|g' -i "${ED}/${pinta_home}/pinta" \
+		|| die                                              # No interpolation!
+	dotnet-pkg-base_dolauncher "${pinta_home}/${PN}" "${PN}"
+
 	rm "${ED}/usr/share/man/man1/${PN}.1.gz" || die
 	doman xdg/${PN}.1
 }