gentoo auto-resync : 12:03:2024 - 06:46:08

13 files changed, 297 insertions, 16 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 3e20135d3a75..57077e06c1c8 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index 4fe6e782e28a..9b739993aa6f 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -5,5 +5,5 @@ DIST flameshot-12.1.0.tar.gz 15618560 BLAKE2B 975019d71a31f32785f081a05d224f7292
 EBUILD flameshot-0.10.2.ebuild 938 BLAKE2B 505886905aaff0562c06b3dc13e8b79394af3691f8d44931671089dda29de09962cba1a630c0e7275c7117143e63b566afbd1d19e8231c9d9da48f5334bc4b01 SHA512 6069cd9fd339931aa00d9f06125a8708605b978001fff5eb1f71994c54a680eac1231f320c06de92f1e96cc447578d4023aab45ae33c9d8920bff4488e464c68
 EBUILD flameshot-11.0.0.ebuild 870 BLAKE2B c5e5fea8d2b32a01d098223db0c6a5d58624ac500bf2be34382a3740c9449212f355b1498345d4884a9bfb1d2a9837eb91751d931fdc41fc0f9ec5f2a4e33da5 SHA512 d9049678692def8377946b10929bbf244dc0b292720f8916e800ba968d90e19ed3cf76e9fb593544a30dbef06d6c146b285d4f2c003be50e69dd981e3fcdbc9b
 EBUILD flameshot-12.0.0-r2.ebuild 969 BLAKE2B 490a48897bf56801194cb1afc94bbd52bb72644a72c0b5739133c73818cb02adb69db171494f6d5f64dce71107bdad75280fbd5bca20f19903725cd70ca11528 SHA512 d7dd73b964ae828839d5a42e5083b47d96103cedc2fa13041663a3269bd81c759d64454eb73f9fcb52c10cde795eb81e7ce300865042b27504a097969c590fbc
-EBUILD flameshot-12.1.0-r2.ebuild 974 BLAKE2B ca91dfd71678733d2b98f79521d96899b85fa4569c3e49aeb9805a94294c444271e89ebaf65e05dcdb3273788c8b6e8a5d9457b62e9c878d6e4193138397f53a SHA512 2bf932994acb5bd5df0668c094ee46d3cb3d089b66770a1772e1875048ca8d79cc1b1d163f052cedfa83077e32d5bb18e9bc867c527d1f04b39c6d09f0b93ec7
+EBUILD flameshot-12.1.0-r2.ebuild 1189 BLAKE2B 2afbe2cf52c5faaadc468281d108c1ec0b373a32253f2a12f6bfafcd2f1e8e99bab1e57fd15886ac80849e71f9a0c381d53a8a0dc330d5f0a65a564fa4ba0d53 SHA512 b947004d23bb33d9d3cdc09c9027ae44e7f64023448783ad8c4e0b53f88cc5c37f4489bf461a20b63c1c7d8482fb8339c3a0619df4b5982e61ba1b9dbe916765
 MISC metadata.xml 843 BLAKE2B 13d22e8a896623ab7dab785fc73e9871814590bd43e601005d691b7ba7fa7c0690b929857c9b03e801e07691c9989403237ef0c623f178bdb1370d6ea6774bd1 SHA512 b94fec86fab6b8801b36f9a086a5cf2d62c48fd1ca6e41c60f6317acbb9d58382936222a873caad4e3efc1717974830a44bd95c4881194370c9a5826d7c0a620
diff --git a/media-gfx/flameshot/flameshot-12.1.0-r2.ebuild b/media-gfx/flameshot/flameshot-12.1.0-r2.ebuild
index c24b2ab6ac05..b01a0e3e9fc2 100644
--- a/media-gfx/flameshot/flameshot-12.1.0-r2.ebuild
+++ b/media-gfx/flameshot/flameshot-12.1.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Powerful yet simple to use screenshot software"
 HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot"
@@ -37,6 +37,14 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/859613
+	# https://github.com/flameshot-org/flameshot/issues/3531
+	#
+	# Do not trust with LTO either
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	local mycmakeargs=(
 		-DUSE_EXTERNAL_SINGLEAPPLICATION=1
 		-DENABLE_CACHE=0
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 4635a6427efc..173927fef10e 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,8 +1,8 @@
 AUX hugin-2022.0.0-exiv2-0.28.patch 3460 BLAKE2B fab4f433b7a5d0959fc68ee0affae81ba989526713a9b711da8553cdbb9522dac80f1ac52007ba90cbf3066eddd3745ec567d4db9b508cf4e944b1e2c627358d SHA512 b5170d9f3b62fcc2e4e5a51d8766e8db8f1df1dcf6e198dbd739f3f960103a9f5e97a8960fc7d5c9b5e226c74c60762b639b5fb677e38754ee597626c554a10d
 DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be SHA512 752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97
 DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B 5c35f67160d76f961e812a309a0c50bb012beac74dc888ce716e8d0e3da35dbb053ab4e5d5d043b3d3fee9885f2fc1afa962a73e794cd4df920527456d477e89 SHA512 f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8
-EBUILD hugin-2022.0.0-r1.ebuild 2353 BLAKE2B e59e9cac33623bf9a8b5b3008f5e5263667210a73408e1433a80daec4e27ef24298eb138aec665752814e60d34001e7dce72419b92ebcb08cc5165997336b507 SHA512 9d1f989a2671c72abb8c1ccfc1a9021c34a612892cee3510b1b1550de3b0ad9e52468355a196447736caa4942e0afca3c19b1fda8663dd47e2c3836c65efab91
+EBUILD hugin-2022.0.0-r2.ebuild 2335 BLAKE2B 94a779e56b76dcddd24b25265f999e2d8c8258382d70b4cbdf9f67c59a9096913ea2d6a3b3022003c76353a0cf78d50d6155f533f2173c8b20e893fac30e0334 SHA512 202481e1480b57dab5d0467bfe56c67efa02e121b78a3baad71979b69036bea6d2fc7603d8adac7b41c42908d99336a73c39abae55a6b6e80967b1d54069af63
 EBUILD hugin-2022.0.0.ebuild 2181 BLAKE2B 3377bffe29b67fcef72a8b0293ab106ade79d40620a4906531863b5639e2c19ca1b168f874181569d10f0958a2a87f51d4e8081857cc62a36400508c5ccbd690 SHA512 c62f921b2d77c8ed0c04887013a29689d0927847b29b23145a514e04e63f6dc0cbe8e113fdf5e40695dcd8913ddecd4e1566fb44097b7a69117e0adbdb30b923
-EBUILD hugin-2023.0.0.ebuild 2121 BLAKE2B c120fb1f6a6fac448502175561f66dfb8e3196c376da805489972b261e35086765cadfccc173e4d201760535099cb48fd849515954c482a508285830e3975654 SHA512 b431432998797026faf403dd6193adb65f274faffc298f1c683eb3409ceb17d5b1772098aa9e5d6322ee6d1e6d9c4891c2f981f0f08a6295983033573b08e958
-EBUILD hugin-9999.ebuild 2228 BLAKE2B 3f11d6b28d34a6196e67f9983ca4f124bb02f348baaad9a541db9fcde5e1f36072554ed88d6c2abeea82f0401df0f62d263e4b8f7171b72e862810bec076c13f SHA512 e0ffe21ba8f7a6e90006015a9105e1dc3b1df2b97e85438ad086f944703419742034729b89775391cdeb4d0ac6fd7dd1ac50eeb4ee67ba82514d7a6cf67166ab
+EBUILD hugin-2023.0.0-r1.ebuild 2103 BLAKE2B 8041ce0b50c8398f0f74641b4f7befdfa38dd75c88269d42d225966669dff74beee5a9f49b7c858748fa7e2a53795694bd17bda6c22cfcf08d6b149dd766a8d0 SHA512 70203d504e01a751194a1c2b8a59bd323bf6700d38cb04c09cbc4e2ee0756858a8a8cb6e381e7fdc38a9f6f9a591e20a857f39bb8e9e0b0ac3ebbe2bcba58d97
+EBUILD hugin-9999.ebuild 2210 BLAKE2B 9961fb69cdbb3e4fd63e567ad6cc96dc8a81e608b3742733ad3cc0c19be059e591ae41f2f64751dfbb4482863b97546696ac7088f5b3d74c88ec434ee50bdc7e SHA512 900b2d13e4e756b57830af1c0c6f39b7cf9dd26afeaf5d8f3ceb06be567843f8ba30ae15af032a3a7486eb6be03b6838d96d2a90f0c70e2dfe4e52044dbfbb4f
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/hugin-2022.0.0-r1.ebuild b/media-gfx/hugin/hugin-2022.0.0-r2.ebuild
index 8fe47c8a270b..1902077f9eda 100644
--- a/media-gfx/hugin/hugin-2022.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2022.0.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,6 @@ IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
 CDEPEND="
 	dev-db/sqlite:3
 	dev-libs/boost:=
-	dev-libs/zthread
 	>=media-gfx/enblend-4.0
 	media-gfx/exiv2:=
 	media-libs/freeglut
diff --git a/media-gfx/hugin/hugin-2023.0.0.ebuild b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
index 934bab607e9c..d5b856010292 100644
--- a/media-gfx/hugin/hugin-2023.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,6 @@ IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
 CDEPEND="
 	dev-db/sqlite:3
 	dev-libs/boost:=
-	dev-libs/zthread
 	>=media-gfx/enblend-4.0
 	media-gfx/exiv2:=
 	media-libs/freeglut
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 06c2a45cde7f..aec868af9672 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,6 @@ IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
 CDEPEND="
 	dev-db/sqlite:3
 	dev-libs/boost:=
-	dev-libs/zthread
 	>=media-gfx/enblend-4.0
 	media-gfx/exiv2:=
 	media-libs/freeglut
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index a1c2a610f921..b24b4764f1c7 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -4,6 +4,7 @@ AUX inkscape-1.3.2-poppler-24.03.patch 2982 BLAKE2B b8ed08ef09afbab15196ae6d0f19
 DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f
 DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343
 EBUILD inkscape-1.2.2-r4.ebuild 5450 BLAKE2B 1c2938f4b6be6e65dd80ceae1371e3b64b18a1aba5b0ff0e34fb00e0b460f7da2b0938b464b061a19414c811b16dbbcd006d4a0fd7d3b44106387a96f437d6ce SHA512 4e6bafcc3c647f78294ec10f5c8698cd2f61945e31a09e8ed7e9910c7a1764da86401b4e78c8a9aa73e25379c2e06a1a065849b3ebfe7699f573d941575d5265
+EBUILD inkscape-1.3.2-r1.ebuild 5697 BLAKE2B 557d3b79d50686272b2fb60d6a41c1889a1b5740f5bee193d7c0112629d68b916977f5caa8f7d20ff9d58e403d94212d552ce087d5ece7c9ddb52c7d06f27d59 SHA512 52dde9b6ef4e60fe1d79f3fd7467f2353220c41e4c4b6b555396b5fe78d63e76b6070fc510133a9980ccce7b04701294226d73a2da26bf35f0f27df03bcdc45b
 EBUILD inkscape-1.3.2.ebuild 5591 BLAKE2B 40a220a0bcb48020ba03a022994c548ff08e18e69dde2f7ba89ed838a44467e71fbaed29affbcf4c7370b76acbf9c1103ed4f499650302446c36711582970941 SHA512 2467361c532953141997c36ac11f27400f2362de96a3ea0c6f1b9d216946c4e96561f381327805e81c0b5fa4066675c850b08366e6d6651e5d91b736169dde08
-EBUILD inkscape-9999.ebuild 5471 BLAKE2B bbc2fcd95623653b6b5b2bccca420a4172b0453c8e4e295897f977681678f0152faa04a2851dd9f74f14df15ddce492595a0d915c6566505e8b4db4fb35892e7 SHA512 403c1db94726ed25e5ee93a4afac23d3efd9ce1f476bd9dcea9cd5f675e4f46bf1af76206af1e2675262fefe9bb8cf4024963b6ef94ef1f364aceaea619820a8
+EBUILD inkscape-9999.ebuild 5577 BLAKE2B d76a595f673ec272f956e6a2e4af81703752c03c7d98bacb14249185ccc04aaf78c89d5219398ecff292a6dcb7a4c8be6282ba4a5e84cdec9b865f93ebb252b2 SHA512 6ea17f46c9918db7b6943e6145bfaee607f911ecfaa624d89aa31bb8bd4702365a959e2adac748349e609b3a71653de1afb2860de948009e1d7203b3e5f46d71
 MISC metadata.xml 982 BLAKE2B f44f534865614c8dd7bf71e92ce69cff708fc08e3eb701765bf93144b433ec52df52a506b69cc98969909c695015881b60592cccdf27613c6fe82812fc50727b SHA512 2963a9b473f139d06cefd1c3231ef148045c005adb4688850522c183f39ba15a36331b7eae7752e9bf15a26e6370f2af14ec02e59735f1753246c45821c0cdbc
diff --git a/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..28800fc56156
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+MY_P="${P/_/}"
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
+else
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg openmp postscript readline sourceview spell svg2 test visio wpg X"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# Lots of test failures which need investigating, bug #871621
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	test? ( virtual/imagemagick-tools )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40:1.4
+	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/boost:=[stacktrace(-)]
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8:2
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/libepoxy
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	net-libs/libsoup:2.4
+	sci-libs/gsl:=
+	>=x11-libs/pango-1.44
+	x11-libs/gtk+:3[X?]
+	X? ( x11-libs/libX11 )
+	$(python_gen_cond_dep '
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/cachecontrol[${PYTHON_USEDEP}]
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg,tiff,webp,${PYTHON_USEDEP}]
+		media-gfx/scour[${PYTHON_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	readline? ( sys-libs/readline:= )
+	sourceview? ( x11-libs/gtksourceview:4 )
+	spell? ( app-text/gspell )
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libxml2-2.12.patch
+	"${FILESDIR}"/${P}-poppler-24.03.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# ODR violation (https://gitlab.com/inkscape/lib2geom/-/issues/71, bug #859628)
+	filter-lto
+	# Aliasing unsafe (bug #310393)
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DWITH_NLS=ON
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_CAIRO=OFF
+		-DWITH_INTERNAL_2GEOM=ON
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_GNU_READLINE=$(usex readline)
+		-DWITH_GSPELL=$(usex spell)
+		-DWITH_JEMALLOC=OFF
+		-DENABLE_LCMS=ON
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+		-DWITH_GSOURCEVIEW=$(usex sourceview)
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+		-DWITH_X11=$(usex X)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	CMAKE_SKIP_TESTS=(
+		# render_text*: needs patched Cairo / maybe upstream changes
+		# not yet in a release.
+		# test_lpe/test_lpe64: precision differences b/c of new GCC?
+		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
+		render_test-use
+		render_test-glyph-y-pos
+		render_text-glyphs-combining
+		render_text-glyphs-vertical
+		render_test-rtl-vertical
+		test_lpe
+		test_lpe64
+		cli_export-png-color-mode-gray-8_png_check_output
+	)
+
+	# bug #871621
+	cmake_src_compile tests
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
+
+	local extdir="${ED}"/usr/share/${PN}/extensions
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_fix_shebang "${ED}"/usr/share/${PN}/extensions
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
+}
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index e15278a2cad5..ae2fa0eac0ff 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -65,6 +65,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-python/cssselect[${PYTHON_USEDEP}]
 		dev-python/lockfile[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg,tiff,webp,${PYTHON_USEDEP}]
 		media-gfx/scour[${PYTHON_USEDEP}]
 	')
 	cdr? (
@@ -187,14 +188,12 @@ src_install() {
 	cmake_src_install
 
 	find "${ED}" -type f -name "*.la" -delete || die
-
 	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
 	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
 
 	local extdir="${ED}"/usr/share/${PN}/extensions
-
 	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_fix_shebang "${ED}"/usr/share/${PN}/extensions
 		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
 
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index 862b3404222b..da904b3c98ae 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -1,3 +1,5 @@
+AUX potrace-1.16-lto.patch 919 BLAKE2B e109311b319197deb0a5b6dc133c9a42f001823cfa3b387beae96289de107f54e34b2b6448bd144cba930bfe00569d4a66e9009ec5521a19c62cb5356664ef9d SHA512 3987506225bbb31badb36aa8b7cff399103e762583eb066709f5083dacfb1a48190115ba12aaec91775c4a3ab401e33ee7bf1285b4ce2d8ffb462f57910988a4
 DIST potrace-1.16.tar.gz 657314 BLAKE2B ee6b04f355d593dd1ebcc4833b244e25eaaa69c91f90987d530a4e5a454668dff6ecfb7a5d8270ebbd9e7c177fd447d1b3fe2a343fc4b9413dd3f507c0c6e417 SHA512 10d85ed3fada80951223c65e923b5e6ee3e76e071575971d5b09b996b477ec5ff2403e0337c44963c6b441cc3ba6c4f7009541124a25c16b7721fdebd1f774b9
+EBUILD potrace-1.16-r1.ebuild 960 BLAKE2B 7ebaaf4ba4f9ca56bc95f6aef36686eac65d996070178f71375d0e80ea817477c1d1075bb8e8299c286913bf925fe8e042224bb89ebd959f4d6d39ece6bb5514 SHA512 7cda6cc87e80c2e739a45ca0eb15fd569700fd7a7f8bf21a89702a309efa682d49068cade04ba8c15e7656aa3c4d0e26e7357225ea95ec71006f6821d501f7ec
 EBUILD potrace-1.16.ebuild 867 BLAKE2B 1698f083578aa2c2a3556241268694f847d0edbf828efacc8871fe429fbbb017285e2d843b47c4e681dc3768f3bdb34e86ea9683a2196d75d5dfcc92cfcb08fa SHA512 2e2b14f7777f40589c178e1240f93cfac6f93868197eb97244ffcf2854fbc1b505175e378facedec3b2d9f55a149a29ac37a422fb48c47e30565c99fb4a98cca
 MISC metadata.xml 410 BLAKE2B 600ab550a0c7fed79d5b6dff4cb1857e410f7e350ca6717cbccc826486dcba7040a9b84b04695af64b7cff426598a58c2935cacdf958b36c78224c23d0ac6ae1 SHA512 fcb52aa25ca9d56d93412db81d6826b71c35102d1643c3576e4938111292106cabfde73143b552c2799e6f337f94e84d3318d1240bfabcdbfbd4dd48e37eb476
diff --git a/media-gfx/potrace/files/potrace-1.16-lto.patch b/media-gfx/potrace/files/potrace-1.16-lto.patch
new file mode 100644
index 000000000000..a1704783f83e
--- /dev/null
+++ b/media-gfx/potrace/files/potrace-1.16-lto.patch
@@ -0,0 +1,18 @@
+https://git.altlinux.org/srpms/p/potrace.git?p=potrace.git;a=commitdiff;h=385f40d2d9827049f5f43f73d05e9fc7472e0da4
+https://bugs.gentoo.org/868465
+--- a/configure.ac
++++ b/configure.ac
+@@ -251,9 +251,10 @@ AC_CHECK_FUNC(strncasecmp, ,
+ dnl ----------------------------------------------------------------------
+ dnl Check whether we have i386 features
+ AC_MSG_CHECKING([for Intel 386])
+-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int x;
+-  asm("bsf %1,%0\njnz 0f\nmovl $32,%0\n0:":"=r"(x):"r"(x));
+-  return x; /* need this so that -O2 does not optimize the asm away */
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int x = 1;
++  volatile asm("bsf %1,%0\njnz 0f\nmovl $32,%0\n0:":"=r"(x):"r"(x):"memory");
++  /* volatile and "memory" clobber ensures '-O2 -flto' does not optimize the asm away */
++  return x;
+ ]])],[AC_MSG_RESULT(yes) 
+  AC_DEFINE(HAVE_I386,, Can we use Intel 386 optimizations?)
+ ],[AC_MSG_RESULT(no)])	
diff --git a/media-gfx/potrace/potrace-1.16-r1.ebuild b/media-gfx/potrace/potrace-1.16-r1.ebuild
new file mode 100644
index 000000000000..ac9fe7c8ddb2
--- /dev/null
+++ b/media-gfx/potrace/potrace-1.16-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Transforming bitmaps into vector graphics"
+HOMEPAGE="https://potrace.sourceforge.net/"
+SRC_URI="https://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="metric"
+
+RDEPEND="sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.16-lto.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for lto patch
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC # bug 610098
+	local myeconfargs=(
+		--disable-static
+		--enable-zlib
+		--with-libpotrace
+		$(use_enable metric a4)
+		$(use_enable metric)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}