gentoo auto-resync : 28:11:2024 - 02:00:16

9 files changed, 118 insertions, 154 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9df36513cd55..69a58cd8a9f5 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/curtail/Manifest b/media-gfx/curtail/Manifest
index 93ef657bc7e0..664c9ffb50bc 100644
--- a/media-gfx/curtail/Manifest
+++ b/media-gfx/curtail/Manifest
@@ -1,7 +1,3 @@
-DIST curtail-1.10.0.tar.gz 205428 BLAKE2B 7a9d1c56542648cd1c4c6fe1355276896bea96a8f054d03c2e4a174e392867db05c3a6548897d31f078b2416eac8b3695cafd3977236f0b66fd10f3020e35d3a SHA512 6bd76b4cefd693199e25db112e90acaa990d2a8dbc2016bd9d55e8d1857bd9c6e94f9164691855231afeff65ae3b070c646a8dc8b446591a08509683dd4a9fb7
-DIST curtail-1.11.0.tar.gz 208900 BLAKE2B b1f9fdff8d974ba20345100b24b783c72f241e8612c28468eec424dbe8781affd88523953299a7f5d90575db7c6727e6fa7a4a1e7439dcb94c47806fb77412cf SHA512 eb5bf7400fa97d14d67a0eecaeee2c3cc6b3407b882a5ae42bb517df98429997fe4448a7852c55a39177f035764e4e544f13fb89d7a55e5b6a01a549acc71ecb
 DIST curtail-1.11.1.tar.gz 208910 BLAKE2B 6a8ed78ba5e09242d0ae497541d41e310b18c6a26cdc5292503d15c003b1e265ee79e6ca057964aac0782041efcbf2beeb16912802aff534465ea0e96c0a750d SHA512 d59bcad4e774a9aa1d195f6b18964d05e41b47e81cd6fcdd86638488c0a63702c0c2ee97e20712eed4e81a0de562b7218df5519573707ace53191c14ac875b86
-EBUILD curtail-1.10.0.ebuild 1318 BLAKE2B 273f62277284e309bdc4faab09b34ff2a9caa2ee39dfbf8c2283bdb9aa255527421878ef87a506757aac118e15b882aac740366ca0b9ae18d19f22d3e1576b36 SHA512 20418b1be77b65f02639e21c4dc773d9da885688bc77593a0082276e60e575d72c772a69afa803890077a21b427dcda4b62ac7f76bb166ae081c51ecba4f29fa
-EBUILD curtail-1.11.0.ebuild 1319 BLAKE2B 132a30b13ac64d23700d239815535dc6c46a9f77b9ef12f447610ba0ea079bbc4077eeef67b21d70b3f9f1a9a4d7f44dfc8981c7bb5e9e6110b2a37b0d93ca30 SHA512 952bc4042afc4eb286a9c688e2984f2bd682f17d561150def81dbf19fa4c6c54f0cac31a71a69049c1974fc4c2783d3f2f0493fe3bff57041a0dd6db4999533f
 EBUILD curtail-1.11.1.ebuild 1318 BLAKE2B 273f62277284e309bdc4faab09b34ff2a9caa2ee39dfbf8c2283bdb9aa255527421878ef87a506757aac118e15b882aac740366ca0b9ae18d19f22d3e1576b36 SHA512 20418b1be77b65f02639e21c4dc773d9da885688bc77593a0082276e60e575d72c772a69afa803890077a21b427dcda4b62ac7f76bb166ae081c51ecba4f29fa
 MISC metadata.xml 817 BLAKE2B ea01ae4c58024699aae770d6e7f21a03adfc8da5f5f658a0b1708824bfda730a2fce4557de4fbccbc079c66a11ab08d6faef020bf897d47870f6581b5e0d68e6 SHA512 3d573feda8c750a08903203c1d2f2e1385e17242356c6f319e29944e530b2199a27e4e432a806dfe1f2c8c783dd67c4fe347d5160d4df99911f67623a3168eee
diff --git a/media-gfx/curtail/curtail-1.10.0.ebuild b/media-gfx/curtail/curtail-1.10.0.ebuild
deleted file mode 100644
index c698273b9338..000000000000
--- a/media-gfx/curtail/curtail-1.10.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..13} )
-
-inherit gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Image compressor, supporting PNG, JPEG and WebP"
-HOMEPAGE="https://github.com/Huluti/Curtail/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/Huluti/${PN^}.git"
-else
-	SRC_URI="https://github.com/Huluti/${PN^}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}/${P^}"
-
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"    # Just desktop / schema / appstream file validation (fails).
-
-RDEPEND="
-	${PYTHON_DEPS}
-	gui-libs/gtk:4[introspection]
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-"
-RDEPEND+="
-	>=gui-libs/libadwaita-1.3.1
-	media-gfx/jpegoptim
-	media-gfx/oxipng
-	media-gfx/pngquant
-	media-libs/libwebp
-"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
-	sed -i "s|@PYTHON@|${PYTHON}|" "${S}/src/${PN}.in" || die
-
-	default
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/curtail/curtail-1.11.0.ebuild b/media-gfx/curtail/curtail-1.11.0.ebuild
deleted file mode 100644
index 8db3728be1ae..000000000000
--- a/media-gfx/curtail/curtail-1.11.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..13} )
-
-inherit gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Image compressor, supporting PNG, JPEG and WebP"
-HOMEPAGE="https://github.com/Huluti/Curtail/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/Huluti/${PN^}.git"
-else
-	SRC_URI="https://github.com/Huluti/${PN^}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}/${P^}"
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"    # Just desktop / schema / appstream file validation (fails).
-
-RDEPEND="
-	${PYTHON_DEPS}
-	gui-libs/gtk:4[introspection]
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-"
-RDEPEND+="
-	>=gui-libs/libadwaita-1.3.1
-	media-gfx/jpegoptim
-	media-gfx/oxipng
-	media-gfx/pngquant
-	media-libs/libwebp
-"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
-	sed -i "s|@PYTHON@|${PYTHON}|" "${S}/src/${PN}.in" || die
-
-	default
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index dfb34bc51767..974d2c9a0751 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -6,5 +6,5 @@ AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 469 BLAKE2B
 DIST freecad-1.0.0.tar.gz 91599325 BLAKE2B 65540eb42e7d508456c9edbf2122e0f288708c33e6d00d3c8c45550e7a614f658f91ba25978a66819bc094b7138aab72a89c0172d0841be1ff798ade5a8bdc64 SHA512 afc1079ea04fd5bb8135f8ad1012d9e4e05c8839dd0a4e00253eada58fe018f445c1200d1ca7ac9f268644c946cbf55b7b313dc3d6bd010f9da3a3334103b7db
 EBUILD freecad-1.0.0-r1.ebuild 8777 BLAKE2B 8dfb0994510ea0a7ba3ef5b943ce5f61ba659a8776d3da90099dc2b15aa767434b1954872fbe3534570d1860786f2daefefa7ac75d9668f1e7141422b146bcfc SHA512 f467f0d82480f5210d9a25e49160903cafd6b6a68792e6be51abb03e4fbabc9cab35b682209e415458e604bfee673cb4f816ce7d29538eb2335b0707ee32e012
 EBUILD freecad-1.0.0.ebuild 12031 BLAKE2B 7aab12b69ed67210a4d5815860c47ec832f9538d5ff2bedd30e837399cde1608798cf6b87ea7d079bb29d058f3f7d048f698dbb8717c21e3dd2f97f97d8ff0d3 SHA512 cdaa165c05a3cb2b680397f8a5518ff0bf47baf6ce731e56f8579b2494ed5b59d7852d59e2a251c178629e30513d1c39c8472cc3b7a2845ae8b15c3c16e2bc24
-EBUILD freecad-9999.ebuild 8773 BLAKE2B 9c047cc1c43d53acfd95ea2cfb8c6de2d0b730ad45559fbbc328dd2a5539f1d8106df910cdd343edb4461b65fe79a720f434a4858aac63cb604d6a33e4268402 SHA512 04c60bfdb083f964b1fa98c90c64cef59bb12cfd0db80958ecba1d022226cd9d9404b696b9bc35bf9905cf04650993561455136189630271a372b4ec2953eec0
+EBUILD freecad-9999.ebuild 8689 BLAKE2B e796cbc17a48eccf792ccd336f1ac650dbb46d43dfb5f2bd431db87802120cbdb3752c99d89b01d4bf289e13d37c5392ed942e3c3bad46626eae9322a9a47e88 SHA512 41514c4c7e4cb4601f1eccb52658db6bc2ac7f24601c97f677c7f1ca8ba18901fe195d32a0864d8f276b90f6e20589ca09b85951110fe0ccee8cb4a867310f0f
 MISC metadata.xml 3656 BLAKE2B 81367f486e966237e6424cca386644bbef79fb7014de4d24234ee090b9d3e4947f95541f823330137aec57916c757f07996e568eded062eadeb44a3c47417761 SHA512 0e162aec1f90c333961670e5090e8bcb8cdbeaddbae49f7d91fb3cd811857939d53035b54b5f9554e80fd29bc653b4fe5df726187204c9f0e0c5c89b671008d8
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 247dc135f22e..8bb35b34546c 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -26,18 +26,17 @@ fi
 # examples are licensed CC-BY-SA (without note of specific version)
 LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
-IUSE="debug designer +gui netgen pcl +smesh spacenav test X"
+IUSE="debug designer +gui netgen pcl smesh spacenav test X"
 # Modules are found in src/Mod/ and their options defined in:
 # cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
 # To get their dependencies:
 # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
-IUSE+=" addonmgr +bim cam cloud fem idf inspection +mesh openscad points reverse robot surface +techdraw"
+IUSE+=" addonmgr bim cam cloud fem idf inspection mesh openscad points reverse robot surface +techdraw"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	bim? ( mesh )
 	cam? ( mesh )
-	gui? ( bim )
 	designer? ( gui )
 	fem? ( smesh )
 	inspection? ( points )
@@ -46,7 +45,6 @@ REQUIRED_USE="
 	reverse? ( mesh points )
 	test? ( techdraw )
 "
-# Draft Workbench needs BIM
 
 RESTRICT="!test? ( test )"
 
@@ -153,7 +151,7 @@ src_configure() {
 		-DBUILD_CAM=$(usex cam)
 		-DBUILD_CLOUD=$(usex cloud)
 		-DBUILD_DRAFT=ON
-		# see below for DRAWING
+		-DBUILD_DRAWING=OFF						# Unmaintained and not ported to Qt 6
 		-DBUILD_FEM=$(usex fem)
 		-DBUILD_FEM_NETGEN=$(usex fem $(usex netgen))
 		-DBUILD_FLAT_MESH=$(usex mesh)			# a submodule of MeshPart
@@ -230,8 +228,6 @@ src_configure() {
 			-DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc"
 			-DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc"
 			-DBUILD_QT5=OFF
-			# Drawing module unmaintained and not ported to qt6
-			-DBUILD_DRAWING=OFF
 		)
 	fi
 
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index b0d3c922c49e..ae2c80c1fe81 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1,8 +1,10 @@
 AUX xpaint-3.1.3-gentoo-prefix.patch 3605 BLAKE2B c513a72991ec83b99fc12d90c112c743a0fec456ae09ad77ecee887e67d2891efd200d8d08bad594472060515b56b02b9097951c5ad285ddfebd3d46acc4265a SHA512 d231237fa1512637c5448b1c8c7a1dcffa1383a0dd24f6606215643ce51932ef58e994bfbc3f24d3376acdd9cc06d713d453c643d4d00e9d00af0e011e55762d
 AUX xpaint-3.1.3-gentoo-qa.patch 1480 BLAKE2B 43b80854e8d0bb68566f86116444507852bf61807846ec97238a90fefc8a86f9be3978858c12af3278b787b14f805edb628327ae411b8b6fbdcd7530ee72cbd5 SHA512 cfa7057625f3086b573f9109a89f29e1cf17c15d253a0c903bd0f315e4aac3d8111df899ef98d0a3416486d81305f0a041f061985d31d435ccbd24b0fc5a57b3
 AUX xpaint-3.1.3-libtool-clang.patch 1434 BLAKE2B d89978f8c925a64fa62ff2a0788ed81ca5faee6a71afda069930a7381e2bb095bbad3c1236c3594532afc5441ef789bf6ea0571b4bb25065e2cbef7fdc52ebe3 SHA512 f4027619c4eda686953fc33c62518a7ef12db09e6160f5e038179aa06f64629d2ad28b373ec332fe3266fd7e15af77577b6a60cfdffb165afe1358519201c399
+AUX xpaint-3.1.4-gentoo-gcc-15.patch 470 BLAKE2B 8fa23cc40d674ea969d2d8eb0dbe793f915910ad1512958eae9d1011de4014f69c4cdf88a0e696d9d62fa7d04fb5c191f9317bff64054ece17c2199b0dcb0f33 SHA512 8e43053f0177e66bc2b576854c9400e699824a8a363dd84ef4033955af1ed94666805b14891a557d02e6445ccd65eb7423af9087df81297180bdc095f295f976
 AUX xpaint-3.1.4-gentoo-lto.patch 670 BLAKE2B 851334824d813029f2a78fb2b3698c85eee3cc79bd63f3db222f6c32fa75bd3f7af85f00fc898ee71e3f5851c1c8181b2f3e798865d7516f2bebbba794783e38 SHA512 d2211c291fca46c102ecb820eeda7e4441326e856e91819c6e3adadfde9dd02e1bda8610b305bb2fe056bd6c5d4ad8e1e6b52015dafad86c76005ef5d166e7de
 AUX xpaint-3.1.4-gentoo-shared-lib.patch 503 BLAKE2B 12bae42eb3a119c8acb3c5a6436191bf65c9697f6d743531633f0d64f5cdb26270f659eb0725a26efcc780cc06f91cf7f4e4f5032cf72f21614f3f7e48615b25 SHA512 971fb77386f2a896605d05346c4cf65fd68bdcc7b2f82e1319059f1c4ac37b0d76585c8ff0ce6d5841639bd94b420ac29b2e5275fe9309b31549cc540f2a9833
 DIST xpaint-3.1.4.tar.bz2 1630009 BLAKE2B 6090156f0c27742487edfd24e803e814d7f2801c3847a5435a896e575ee3bf0b17f498e8ba8f4b7a87536780dd7c15ec7e0c0e0acb28b225d95ed0c835abfa97 SHA512 ea81f0f0eaad2072fe487efba933b6f0a4f2a4d8ae7548169b8e765cf1232c9944149a822173350af91309535d8f3625b8e58814811a5f4491fa3e2fcdf92e1d
 EBUILD xpaint-3.1.4-r4.ebuild 1748 BLAKE2B 67ad09b81cbc78e7d609dbd6c6404bce63cf21581cd69f09b0f34a7f0b49611288fef904d6770385a30f6bc2bfac0f22380d51a02e6f5dfd13732ef432671222 SHA512 a433ef65a618cfdeee5041a7a637ca1dfb73df332f6d4bcd901c2e5155a24272344f406dbf67c1159055782886284478844e6e91b5436023e9bee4257d587c5f
+EBUILD xpaint-3.1.4-r5.ebuild 1790 BLAKE2B 1a46c2fcdc98efad74a4c8e755bfecb5c8c4c40df7c582bd951008cb2fd7cba61404d8be303726c1cbf5294b1bfb258af378d4a45baf0810e03e2e7dffddaf1e SHA512 2ec89753cddfd97112c246d83f7249f471984085fb2ebc0fc11bad3ff450825a4b3e2806a88c96cde86bc78b756c325cf516506583896a2f27833e7b9fee3e1c
 MISC metadata.xml 1286 BLAKE2B 1a10d6e7ee2270c3b014e51d0f2deabef64f926dfcd54f46c898b0cea35d769eaaeafc061bfa95f0b1621cffae48732faf824590354883a86fb0f7e1ce0be5ba SHA512 3ef1cf69a09bfd7ab4963f3f4a76203b504d106307ce37a2bef7ac1623070d8c629b7e52a1e44f5d3380b21d6b660cdb1842e582b7fc26f052ed7d353ef7129d
diff --git a/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-gcc-15.patch b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-gcc-15.patch
new file mode 100644
index 000000000000..6724a8ac6a56
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-gcc-15.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/944996
+
+--- a/vxp2ps/vxp2ps.c
++++ b/vxp2ps/vxp2ps.c
+@@ -144,7 +144,7 @@
+ }
+ #endif
+ 
+-void ps_init()
++void ps_init(FILE* fo)
+ {
+   fprintf(fo, "%%!PS-Adobe-2.0\n");
+   fprintf(fo, "%%%%Creator: vxp2ps\n");
+--- a/vxp2ps/vxp2tex.c
++++ b/vxp2ps/vxp2tex.c
+@@ -29,7 +29,7 @@
+ #define DRAWOP 0x3000300
+ #define FILLOP 0x2492000
+ 
+-void ps_init()
++void ps_init(FILE* fo)
+ {
+   fprintf(fo, "%%!PS-Adobe-2.0\n");
+   fprintf(fo, "%%%%Creator: vxp2tex\n");
diff --git a/media-gfx/xpaint/xpaint-3.1.4-r5.ebuild b/media-gfx/xpaint/xpaint-3.1.4-r5.ebuild
new file mode 100644
index 000000000000..063cff5eb62b
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-3.1.4-r5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop toolchain-funcs xdg
+
+DESCRIPTION="Image editor with tiff, jpeg and png support"
+HOMEPAGE="https://sf-xpaint.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/sf-xpaint/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pgf tiff"
+# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/netpbm
+	x11-libs/libX11
+	>=x11-libs/libXaw3dXft-1.6.2h[unicode(+)]
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	pgf? ( media-libs/libpgf )
+	tiff? ( media-libs/tiff:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.3-libtool-clang.patch
+	"${FILESDIR}"/${PN}-3.1.3-gentoo-qa.patch
+	"${FILESDIR}"/${PN}-3.1.3-gentoo-prefix.patch
+	"${FILESDIR}"/${P}-gentoo-shared-lib.patch
+	"${FILESDIR}"/${P}-gentoo-lto.patch
+	"${FILESDIR}"/${P}-gentoo-gcc-15.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tiff) \
+		--disable-libdvipgm \
+		--disable-libopenjpeg
+}
+
+src_compile() {
+	# clean up
+	emake clean
+	emake -C util clean
+
+	# parallel make still fails sometimes
+	emake substads
+	emake xpaint.1
+
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		includedir="${EPREFIX}"/usr/include \
+		-C util
+}
+
+src_install() {
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		DESTDIR="${ED}" \
+		-C util install
+	doicon icons/xpaint.svg
+	make_desktop_entry "${PN}"
+	find "${ED}" -name '*.la' -delete || die
+}