gentoo auto-resync : 09:12:2023 - 05:13:51

4 files changed, 122 insertions, 10 deletions

diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 5212c7e76cd4..a7db6fee123d 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -1,6 +1,8 @@
 AUX simage-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch 1175 BLAKE2B 6533dde5a029fef8bf3804855f11e703beb3e02c36f193343c3337590659e5562539fbe853914ad7287ca6cd840b432d0c71d2847da7c6884b714b5512af49c0 SHA512 1dc17b023ba8a9e07a9ae971d99d9200ce14374b106e648b4a6b62e06e0ebb34e01a635c9cacd6579b3606cf62448953e459c5b1ca45a21ede9e5c0c19b8812f
 AUX simage-1.8.1-fail-on-missing-quicktime.patch 453 BLAKE2B 23592fb30537aabd5c351e789d7c02acad784ab53fc0ce1f9f6ee4b3a020a95efff364717fe1bea0f843a88b9fe0577d7f9c46dbb4e64d3804a42adfcab19de8 SHA512 f4737b5cdf3ce136aa1a8539a2a6069dc8d7ff2f92278e220c096b8340cb70375331d919b46e1a477bc58ed5f9d2378a6f26ab0a8c38cb1a0092b6b2f4472c61
 DIST simage-1.8.1.tar.gz 829490 BLAKE2B 05d3a3f7ff7c195b55d454a2bc6e086cd4439fd6e9fb694c1926a4c0be5142661bf2c7d6593f6b7ae0681234f28c7b92e325ed0928a0fb4df5e846b30fbf9156 SHA512 e6f211f453f67f601d157e36c6c4845af1e0601dd3d8d97fbb993c50dc54c8908c2e1e345ea1dd578b8fa2dca823d8e1bab7f29a0a0d73732ca597cc5c673cbe
-EBUILD simage-1.8.1-r3.ebuild 2231 BLAKE2B 3b7ce33d708ac8a6ee891d3fe453aa34e8b470a178b6c5381d16df163a927c0b826dedb57906bf60d8e6a783ff23505c7469afc3b9e6adea46779eba502a782d SHA512 46c2e89b536b52ef8c31bbfce9adaa0a17770f767637ff4416a805af55a2c8ecba732fbc0d5462c3c9987d845dcd7713a244661ec0650a524f2301e45dcf75b4
-EBUILD simage-9999.ebuild 2176 BLAKE2B fe901b146db9e227161a3e62b06bcaf0d7a3cedaa4a1905440313e5950c6a4ad4c8e7a44ddfc6e70ddd317360dcd97fe66740c082236a5cb486919a61b8981b9 SHA512 0e2f9fff14cdaf3f68702ce5e79789df310ac57f399227cb9cee17d3c92c87237bf256d35c32152354d30b009c85dd458150539a02ffda2f2e48ccb681b100a4
+DIST simage-1.8.3.tar.gz 829994 BLAKE2B 794ee3a1c71727af7e92839542470a4732584715b01cbfd5be7b34d8ea8295ca65f5634e10027e0e7e4eb36a024d31704ad31d9aa0a6ad6b66c08612879a1603 SHA512 193137bd00a322fe6c170d3ff318ac81e4cc685bdfa40a0415c5bb95802b6290174fea630eb79956f362b4e79fa0b60916976c63ef26d6a65a6a51d5d9f7de03
+EBUILD simage-1.8.1-r3.ebuild 2218 BLAKE2B b81679b5c90cd0bb24235b53a37b787b05e97c362a378a47f89e77f826c54079e63b06b7e9c6c9273e25db11c11956e8148de10ab78f0ce12b8de70035f4b934 SHA512 5f67c93403d10ae6933f41601c718af567ac3cacc25405ea4c1b342b23a0a051b639faba6bd12cfed3ff0ea9fbfaabda28284edd7203179655c54f68e9bcc5bb
+EBUILD simage-1.8.3.ebuild 2345 BLAKE2B efa357c7dff3ca40e0e33d6bd982db07d0046ca2fe122276b3ea8b9296a910b4c3900b1a686e800b3b64b43fb874daaee048a2ac5eb2b8b7361123ccd4209a68 SHA512 53a23e990163423e010982cc684ab73054bf19bf41ea4c15f4d225e10c0b10b0a305be79850ee1d9a888961e55a8ed44af0481d2a1eb7a809ad1db8694c9d4a6
+EBUILD simage-9999.ebuild 2345 BLAKE2B efa357c7dff3ca40e0e33d6bd982db07d0046ca2fe122276b3ea8b9296a910b4c3900b1a686e800b3b64b43fb874daaee048a2ac5eb2b8b7361123ccd4209a68 SHA512 53a23e990163423e010982cc684ab73054bf19bf41ea4c15f4d225e10c0b10b0a305be79850ee1d9a888961e55a8ed44af0481d2a1eb7a809ad1db8694c9d4a6
 MISC metadata.xml 298 BLAKE2B bbb65357f89a126895f808f22a14211302edac1ef368ceea547a0cb8b0a4d62e50e61572a47a2d9a123d22f33f384cd7fe6b0604d78ce83701608db0725a076d SHA512 70fe0d52216ae4902962671d07b6667c1aad035e9d6a737700a44d3f0ef08670e965cf692dcb3fe106a0dd62125b9fd433bd980cc46a3be4d34cfef7d79da06e
diff --git a/media-libs/simage/simage-1.8.1-r3.ebuild b/media-libs/simage/simage-1.8.1-r3.ebuild
index bc61f6c45c3a..0c2755db7da4 100644
--- a/media-libs/simage/simage-1.8.1-r3.ebuild
+++ b/media-libs/simage/simage-1.8.1-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake flag-o-matic
+inherit cmake
 
 DESCRIPTION="Image and video texturing library"
 HOMEPAGE="https://github.com/coin3d/simage/"
diff --git a/media-libs/simage/simage-1.8.3.ebuild b/media-libs/simage/simage-1.8.3.ebuild
new file mode 100644
index 000000000000..fcec6add0f0c
--- /dev/null
+++ b/media-libs/simage/simage-1.8.3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Image and video texturing library"
+HOMEPAGE="https://github.com/coin3d/simage/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/coin3d/simage.git"
+else
+	SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${PN}"
+fi
+
+LICENSE="BSD-1"
+SLOT="0"
+IUSE="gif jpeg png qt5 qt6 sndfile test tiff vorbis zlib"
+REQUIRED_USE="qt5? ( !qt6 )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gif? ( media-libs/giflib:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui]
+	)
+	sndfile? (
+		media-libs/libsndfile
+		media-libs/flac:=
+	)
+	tiff? (
+		media-libs/tiff:=[lzma,zstd]
+		app-arch/xz-utils
+		app-arch/zstd:=
+	)
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/opus
+	)
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( media-libs/libsndfile )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch
+)
+
+DOCS=(AUTHORS ChangeLog NEWS README)
+
+src_configure() {
+	local use_qt
+	if use qt5 || use qt6 ; then
+		use_qt=ON
+	else
+		use_qt=OFF
+	fi
+	local mycmakeargs=(
+		-DSIMAGE_BUILD_SHARED_LIBS=ON
+		-DSIMAGE_BUILD_EXAMPLES=OFF
+		-DSIMAGE_BUILD_TESTS=$(usex test)
+		-DSIMAGE_BUILD_DOCUMENTATION=OFF
+		-DSIMAGE_USE_AVIENC=OFF # Windows only
+		-DSIMAGE_USE_GDIPLUS=OFF # Windows
+		-DSIMAGE_USE_CGIMAGE=OFF # OS X only
+		-DSIMAGE_USE_QUICKTIME=OFF # OS X only
+		-DSIMAGE_USE_QIMAGE=${use_qt}
+		-DSIMAGE_USE_QT5=$(usex qt5)
+		-DSIMAGE_USE_QT6=$(usex qt6)
+		-DSIMAGE_USE_CPACK=OFF
+		-DSIMAGE_USE_STATIC_LIBS=OFF
+		-DSIMAGE_LIBJASPER_SUPPORT=OFF
+		-DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile)
+		-DSIMAGE_OGGVORBIS_SUPPORT=$(usex vorbis)
+		-DSIMAGE_EPS_SUPPORT=ON
+		-DSIMAGE_MPEG2ENC_SUPPORT=ON
+		-DSIMAGE_PIC_SUPPORT=ON
+		-DSIMAGE_RGB_SUPPORT=ON
+		-DSIMAGE_TGA_SUPPORT=ON
+		-DSIMAGE_XWD_SUPPORT=ON
+		-DSIMAGE_ZLIB_SUPPORT=$(usex zlib)
+		-DSIMAGE_GIF_SUPPORT=$(usex gif)
+		-DSIMAGE_JPEG_SUPPORT=$(usex jpeg)
+		-DSIMAGE_PNG_SUPPORT=$(usex png)
+		-DSIMAGE_TIFF_SUPPORT=$(usex tiff)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/simage/simage-9999.ebuild b/media-libs/simage/simage-9999.ebuild
index ae5ce0a704a3..fcec6add0f0c 100644
--- a/media-libs/simage/simage-9999.ebuild
+++ b/media-libs/simage/simage-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake
 
 DESCRIPTION="Image and video texturing library"
 HOMEPAGE="https://github.com/coin3d/simage/"
@@ -13,13 +13,14 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/coin3d/simage.git"
 else
 	SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${PN}"
 fi
 
 LICENSE="BSD-1"
 SLOT="0"
-IUSE="gif jpeg png qt5 sndfile test tiff vorbis zlib"
+IUSE="gif jpeg png qt5 qt6 sndfile test tiff vorbis zlib"
+REQUIRED_USE="qt5? ( !qt6 )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -30,6 +31,9 @@ RDEPEND="
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 	)
+	qt6? (
+		dev-qt/qtbase:6[gui]
+	)
 	sndfile? (
 		media-libs/libsndfile
 		media-libs/flac:=
@@ -56,6 +60,12 @@ PATCHES=(
 DOCS=(AUTHORS ChangeLog NEWS README)
 
 src_configure() {
+	local use_qt
+	if use qt5 || use qt6 ; then
+		use_qt=ON
+	else
+		use_qt=OFF
+	fi
 	local mycmakeargs=(
 		-DSIMAGE_BUILD_SHARED_LIBS=ON
 		-DSIMAGE_BUILD_EXAMPLES=OFF
@@ -65,8 +75,9 @@ src_configure() {
 		-DSIMAGE_USE_GDIPLUS=OFF # Windows
 		-DSIMAGE_USE_CGIMAGE=OFF # OS X only
 		-DSIMAGE_USE_QUICKTIME=OFF # OS X only
-		-DSIMAGE_USE_QIMAGE=$(usex qt5)
+		-DSIMAGE_USE_QIMAGE=${use_qt}
 		-DSIMAGE_USE_QT5=$(usex qt5)
+		-DSIMAGE_USE_QT6=$(usex qt6)
 		-DSIMAGE_USE_CPACK=OFF
 		-DSIMAGE_USE_STATIC_LIBS=OFF
 		-DSIMAGE_LIBJASPER_SUPPORT=OFF