gentoo auto-resync : 18:06:2023 - 19:48:47

8 files changed, 77 insertions, 67 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ea772f54dd84..f620c4fc0ec8 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 5d1892780930..1f2b918033dc 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,9 +1,9 @@
 AUX hydrus-client 105 BLAKE2B cb1c55f0831eda122eebb9363eab50180b8746038405ba514a6821c8e4e892e59f18b9b29b5f3117d62d758ad6e5d06fdacde7fe0d8ad59a8e674134c945c77d SHA512 56dc21cd54d0fbf95d1a127ac387d29ae99583210c97a1e77233e1bfc08fb631caf1ac3be1034c43e0485e4238ecc96009533d4079560807ff1126d37b75fe6f
 AUX hydrus-server 69 BLAKE2B 245851a0bfd7ed4e947d229cae980daaaf213e2ff4238b5bc6c75b12832f3fbf7c95d34d72f4fc7b6194ed06df8652e5042bc69ab40367d09c55796e9013392b SHA512 70fa7877b7d5efc7786926af6a02a468a0c8ebbb553a61bc7e049622ddf00b5ca67876af74e17d0d9408e5f950acf8aa0fc007baaf1a656d3fb5368fa15fcd22
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-526.tar.gz 41182831 BLAKE2B cf41641625d6c8d64aeea78f56f643a39a6bf8030c919e0a83e5b7183ee7f5a03edef5574f67fb023c79e9e4d757e79f536d91d57ca8a097cc7c380075036c0b SHA512 ed8fff59563bbe8f8c3b235a188575be9d56aa5cf7e70cf340215a7af910247ba711061020f257dbdf1032b5d0ebd5e8995411f60ffe6b6ba9061d189b6274cd
 DIST hydrus-528.tar.gz 41492703 BLAKE2B 3e97e64a2bbdd513441c5ae34640779934057ec4bcea9ef806a3bbc053d5849af69eed79edca35b9b9f276bdc53c379c10a613b1efb7bb3e2e69dbcc4b210038 SHA512 b9c9069a92fd82c6c6137aeaf205c5cac2c34d31dce2174308c796e9289fc64b346eabb8ef55e2fef78ac0af73c1b8c14aa507f9d4508759e435ac7eb01400bb
-EBUILD hydrus-526.ebuild 4504 BLAKE2B 96d203c08c189d520f891332bce49ecd1aba1296e3ff073528fa1d322d6ab51ccdc9b83eacde3290e14247366b2668c7fd6ec1cc1da401c4f241c03412753ceb SHA512 58929367bdfd224ce1b68336afde1a4d7c7eab494a553c9126c502d090f90a21cab7b1be939735bcceae59c2ce4df2227fe0abbf45eb1655c20df79f2f83086d
+DIST hydrus-531.tar.gz 41507932 BLAKE2B 388bc87bedf46ce2e8b4a26bfe744a80382d2c87985950db4458834e4bb8acaa50d04c50d8321db6c35400079d88c6f8c62f68084f5b1d8503fa4c93e280b9bb SHA512 8083b37d7b99c9f5e2679d64e40bc90a2144878746454aea01d9548705c767889b3f895abde5d172a72e4edcaca1feca450ba2ed99389eecfc8467491dafac1c
 EBUILD hydrus-528.ebuild 4662 BLAKE2B e8ea3f9971318f96a1ea3ba789d12dbec7e882723c4afdf2e8d40aa0636ea885c0e4fb912e852567098db8a39aaa71d5a7bdbe8ab470552c638497482050ac20 SHA512 4d1f850cb07dbc045ed40941a57d930bacd0591e00c6ab228190436a99d892887409b0fa98ded6ca16ee1d0aa2581043b5e108ee628db294fe2c6b1c520b1e5f
-EBUILD hydrus-9999.ebuild 4504 BLAKE2B 96d203c08c189d520f891332bce49ecd1aba1296e3ff073528fa1d322d6ab51ccdc9b83eacde3290e14247366b2668c7fd6ec1cc1da401c4f241c03412753ceb SHA512 58929367bdfd224ce1b68336afde1a4d7c7eab494a553c9126c502d090f90a21cab7b1be939735bcceae59c2ce4df2227fe0abbf45eb1655c20df79f2f83086d
+EBUILD hydrus-531.ebuild 4662 BLAKE2B e8ea3f9971318f96a1ea3ba789d12dbec7e882723c4afdf2e8d40aa0636ea885c0e4fb912e852567098db8a39aaa71d5a7bdbe8ab470552c638497482050ac20 SHA512 4d1f850cb07dbc045ed40941a57d930bacd0591e00c6ab228190436a99d892887409b0fa98ded6ca16ee1d0aa2581043b5e108ee628db294fe2c6b1c520b1e5f
+EBUILD hydrus-9999.ebuild 4662 BLAKE2B e8ea3f9971318f96a1ea3ba789d12dbec7e882723c4afdf2e8d40aa0636ea885c0e4fb912e852567098db8a39aaa71d5a7bdbe8ab470552c638497482050ac20 SHA512 4d1f850cb07dbc045ed40941a57d930bacd0591e00c6ab228190436a99d892887409b0fa98ded6ca16ee1d0aa2581043b5e108ee628db294fe2c6b1c520b1e5f
 MISC metadata.xml 836 BLAKE2B 049faa70763ba176b6e4930abcdb5f4b4b87bd243759aba42dec32b9f2a199b3f2c33f0415ffdd1a392af3b461d939e633ec1f9333b0ff538f74d24306790fbe SHA512 0404c79e85e51eaba13fef930e695f168074e69734d3d8a604515f77196706bae9d36a2df9b3db0530c9f17b32881602509c7e22e7383c957a67e13c2a46e7bb
diff --git a/media-gfx/hydrus/hydrus-526.ebuild b/media-gfx/hydrus/hydrus-531.ebuild
index c78c948645a3..851d373d97a8 100644
--- a/media-gfx/hydrus/hydrus-526.ebuild
+++ b/media-gfx/hydrus/hydrus-531.ebuild
@@ -69,6 +69,8 @@ BDEPEND="
 		test? (
 			dev-python/httmock[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
+
+			dev-python/pyside2[widgets,gui,multimedia,${PYTHON_USEDEP}]
 		)
 	')
 "
@@ -82,8 +84,6 @@ src_prepare() {
 
 	# Contains pre-built binaries for other systems and a broken swf renderer for linux
 	rm -r bin/ || die
-	# Build files used for CI and development, not actually needed
-	rm -r static/build_files static/requirements || die
 	# Python requirements file, not needed
 	rm requirements.txt || die
 	# Remove unneeded additional scripts
@@ -99,7 +99,7 @@ src_test() {
 	# The tests use unittest, but are run with a custom runner script.
 	# QT_QPA_PLATFORM is required to make them run without X
 	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
 }
 
 src_install() {
@@ -114,8 +114,11 @@ src_install() {
 	einstalldocs
 
 	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
+	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
 	rm -r hydrus/test/ static/testing/ || die
+	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
+	# because it contains documentation
+	rm -r static/build_files static/requirements || die
 
 	# ${DOCS[@]} files are copied into doc
 	# ${S}/docs/ is the markdown source code for documentation
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index c78c948645a3..851d373d97a8 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -69,6 +69,8 @@ BDEPEND="
 		test? (
 			dev-python/httmock[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
+
+			dev-python/pyside2[widgets,gui,multimedia,${PYTHON_USEDEP}]
 		)
 	')
 "
@@ -82,8 +84,6 @@ src_prepare() {
 
 	# Contains pre-built binaries for other systems and a broken swf renderer for linux
 	rm -r bin/ || die
-	# Build files used for CI and development, not actually needed
-	rm -r static/build_files static/requirements || die
 	# Python requirements file, not needed
 	rm requirements.txt || die
 	# Remove unneeded additional scripts
@@ -99,7 +99,7 @@ src_test() {
 	# The tests use unittest, but are run with a custom runner script.
 	# QT_QPA_PLATFORM is required to make them run without X
 	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+	"${EPYTHON}" "${S}/hydrus_test.py" || die "Tests failed"
 }
 
 src_install() {
@@ -114,8 +114,11 @@ src_install() {
 	einstalldocs
 
 	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
+	rm hydrus_test.py hydrus/hydrus_test_boot.py || die
 	rm -r hydrus/test/ static/testing/ || die
+	# Build files used for CI and development, not actually needed. Has to be deleted after src_compile.
+	# because it contains documentation
+	rm -r static/build_files static/requirements || die
 
 	# ${DOCS[@]} files are copied into doc
 	# ${S}/docs/ is the markdown source code for documentation
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index d45993690402..e1733007d214 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,3 @@
-DIST lximage-qt-1.2.0.tar.xz 837692 BLAKE2B a51ad797882d2725e488226954672df1d6a175237ba5d0f21930af135c92afb46648ba3965f5e65c026eceb324a1e109a08b8f9921dff27d3f6685d35e898da7 SHA512 aa7cbc9f9e2e0ea1ea0cda446887002e285a17b54adb0bd87def1fabc9ad9dd5d25c5c1db56785e67f4767c2da8d8db9b4e73a440c676f80d7094434357b86e1
 DIST lximage-qt-1.3.0.tar.xz 838632 BLAKE2B eceee2fcdd6eae2360c8c7d27417d4e165520155050dae6c0fadfa22184634372582ac52c6233924b54b9d94e814967eb0abdd8ee3e7c719cdfde85840b51400 SHA512 c3fc8e24f78a9cd65736ba1af07b7fd5ba241eab233a595f7b05982d64a0a7a88d81c60eafea632779faa44f76cdb3bb501d2dc3b3758e3f6256fe2da10c37ac
-EBUILD lximage-qt-1.2.0.ebuild 1087 BLAKE2B f8201d38252614c3f909584680dac82eb3a3e66a5e0a276fbf26e05267e0b7d93ddd6d4529ffe1c7a6c883848acc5f44968d145150a41a1c98514753f32a14fc SHA512 592a518a0d6087529c04a21b160c4cbe86fcf36500f75ce368df18c11211796857129344dcc5f705c203f39ab16f34fa8a9dd73882defbdb4f795289c7d391f7
 EBUILD lximage-qt-1.3.0.ebuild 1087 BLAKE2B 5d859b3314f3a2bafeaedf3df98ccd2a8e1881b7fd1f0a6b91bc2c2de52ca1dc2bcfbad37aba6649edb8d8d453c7b3eac71b063fb0bf84c58ec18e86ce3159ee SHA512 39cce57b8effce86a55452a4b6e133316c901dfa21e5c1fcb6dacbb4abb03976bbfb631955ab4da6af18ffee1cec4e929282aaa70bf54fd9b20073cebd5b18b5
 MISC metadata.xml 317 BLAKE2B f63e3e91e5dc9fcc6113bf1ae9c9bb5680d2b7cf40359eaa058dcbc247f3b2f43f540ffa6525935220d52c3e8b94ee3629ce237c788c8e4f0946dddbf610680e SHA512 74c882b00f38c28d8546d31c59636252b2627053143a1bea3551c4bc507a63361c88bc555ea15760395f995c6d20dd6fe6adf65f11d42cc90ffd8378aae03f1f
diff --git a/media-gfx/lximage-qt/lximage-qt-1.2.0.ebuild b/media-gfx/lximage-qt/lximage-qt-1.2.0.ebuild
deleted file mode 100644
index 9e7a14624a84..000000000000
--- a/media-gfx/lximage-qt/lximage-qt-1.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="$(ver_cut 1-2)"
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt Image Viewer"
-HOMEPAGE="https://lxqt-project.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-5.15:5
-	>=dev-util/lxqt-build-tools-0.12.0
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtdbus-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtnetwork-5.15:5
-	>=dev-qt/qtprintsupport-5.15:5
-	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtx11extras-5.15:5
-	media-libs/libexif
-	=x11-libs/libfm-qt-${MY_PV}*:=
-	x11-libs/libX11
-	x11-libs/libXfixes
-"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 7ccc3b3d0e3c..4883d1d7a1e6 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,5 +1,7 @@
 AUX scrot-1.7.bash-completion 2622 BLAKE2B febdade3f2b5cb094d9162e66d3b0d0b8ad72659e33ca9b6c55c4888ef3122c8f16430cc5f74d32367ea7a74905e3c8c49e9570d996c1324ffd9b72f42e9f534 SHA512 c0a6ac7347164e007eef219b567a554b5aac91c4afdc585d2ed299f46880a46343e3aef83ad8fe50e090ed8521ca241b7e3661a59511064a43164fbe366e1ebb
+DIST scrot-1.10.tar.bz2 156519 BLAKE2B ca1441823521d14559afe49ed36853bb5448cc5c2ee345ddb617324b63e8f599678cbdc94b862938017a62d2f5ceea3cae03f80e473e86cafc76dd34144d41bb SHA512 7a72b6d7ae350b0ec27b949934ff67cb8800f731f3dfc783bfdf66c4316b318118b8b46d98aca05543144b757c659791f4a9aeae43364277501238a405eda57d
 DIST scrot-1.9.tar.bz2 158710 BLAKE2B d823c0875a260ee9741e1c9038fe743e69d0afa83220448857d109dd3ebad9977f07871b25c6a4a979efdf2abd246a2facec91c5b0af01c47307dc6266c801d3 SHA512 ace3bcb26ecebc5bb139a6e011a562287be8f676f21211b540dd937ab2d4487047d3565d0aec84e099bd2c5c9b037d9044924b031f930dc45a3040df399a3312
+EBUILD scrot-1.10.ebuild 1395 BLAKE2B 10e729ec694b0fd17a9f6709243d747d5ac5b4df76da76b5073b0b2c7e5ca701c79a0f42da909c0018f89c8e2a3dc69d48936d497ded2864b8a0e1df298bda10 SHA512 601b367332aee94412925aafe6bbbbeb841f5478135895b12f5c889ce32b150ba064f266360260366d8c7452581d5722e5668f11fd6ed3d68dcf37d8e4d59416
 EBUILD scrot-1.9.ebuild 1389 BLAKE2B b6fb1f321ef975da407f848e14ba356d562a99d0fa7a0006f54bc10ebd2748cbbe541a42326e3e722807042488fbfdbeb7a59424d53c78753c4c8c44fb7252b7 SHA512 c7be26565efa783d7772ed566ff9ca2bb15fc28f4bbc2851776b3be22aabb4e6e8ce05a1924802bb6ce8fddec1250370d51b23409a9ff7d1f5d07cfe1d709495
 EBUILD scrot-9999.ebuild 1395 BLAKE2B 10e729ec694b0fd17a9f6709243d747d5ac5b4df76da76b5073b0b2c7e5ca701c79a0f42da909c0018f89c8e2a3dc69d48936d497ded2864b8a0e1df298bda10 SHA512 601b367332aee94412925aafe6bbbbeb841f5478135895b12f5c889ce32b150ba064f266360260366d8c7452581d5722e5668f11fd6ed3d68dcf37d8e4d59416
 MISC metadata.xml 486 BLAKE2B 49d843df52a3129520dc7f99058e4632bd2bef1239ae14f4ff49e315bb5d11536a2f384845c87ad69e9dcd1ccd363009f4d9b4b5d862aca69d59e5f6490573c9 SHA512 56297474babfd15627050a5d5e4ac885dcd6a9f9d861e708877c280b23251680700e006d58edf384d412df56b97ffaa5dc8d55ab1dedd34a9e4d3af1ed63980f
diff --git a/media-gfx/scrot/scrot-1.10.ebuild b/media-gfx/scrot/scrot-1.10.ebuild
new file mode 100644
index 000000000000..f03c9dc8cd96
--- /dev/null
+++ b/media-gfx/scrot/scrot-1.10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="Screen capture utility using imlib2 library"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="feh"
+SLOT="0"
+
+# imlib2[X] needed for imlib_create_image_from_drawable, bug #835582
+# imlib2[png] not technically requried, but it's the default format used by
+# scrot, so unconditionally depend on it to avoid breaking basic commands which
+# don't specify an output format.
+RDEPEND="
+	media-libs/imlib2[X,filters(+),text(+)]
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	media-libs/imlib2[png]
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+"
+
+DOCS=(
+	AUTHORS ChangeLog README.md
+)
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_install() {
+	default
+
+	newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN}
+}