gentoo auto-resync : 28:03:2023 - 15:50:57

6 files changed, 4 insertions, 203 deletions

diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 894a9f2f7904..8892224ef692 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,10 +1,5 @@
-AUX scrot-1.7-fix-docdir.patch 1794 BLAKE2B b55621bbf24cca877c9d50119bb0eeaf40e5372c9ff5b21c0de1620f37deb2c6d6a069b16355c01844387709f475e29a97f66bdc4b1aaea84cbeafc9ff46119b SHA512 4b28c1458bebb22b1d6dfdbfe2478e0e829a73f641b1b7b5b8140bee4d7384f84d3d7b538f0a7b9f89a824bd255af1158611fd7a3f8787797a111641e2dfeaff
 AUX scrot-1.7.bash-completion 2622 BLAKE2B febdade3f2b5cb094d9162e66d3b0d0b8ad72659e33ca9b6c55c4888ef3122c8f16430cc5f74d32367ea7a74905e3c8c49e9570d996c1324ffd9b72f42e9f534 SHA512 c0a6ac7347164e007eef219b567a554b5aac91c4afdc585d2ed299f46880a46343e3aef83ad8fe50e090ed8521ca241b7e3661a59511064a43164fbe366e1ebb
-DIST scrot-1.7.tar.gz 178463 BLAKE2B 021c68c5ebd19ec08c072cff73fe1ebb7ffd179dfcde6e13656779e2ee1357cf0fdbba1d4beb2fc5dc9c8c4cd28008acaa462068eec3192cea6687ac58cd653a SHA512 3ef2b547d561a85213ef0075af3034020f00168253d3b84ef94578f0b8534f9a7389c808f8fcd0c619358a14f41601fee407d08d63c397b9892ba9fc2db23f88
 DIST scrot-1.8.1.tar.gz 178856 BLAKE2B c7c6a5169112d38f1b919c651f5b5d99abd3adcf7bdbffd971c358b3c691297ff3bca6e7d82a0fa4e63323ee50651b477f7daab2ea383eb161446b41cd75516d SHA512 a93b3ce0fc690687b50d9b06d93b30528c26f3ee0b63d16895280d0df092fea022105a6d1aa60cf58c125a5b63eda841e089123d589354901b3ed6e063b76d86
-DIST scrot-1.8.tar.gz 175453 BLAKE2B 2c6cd9c6d8ea7b2dbdfa4827af52ead01327556565d957c3fc37d8511aed3247b02e61f97e1d4136fc047062fa7ff5c01f2a12b290620d2a8572b813c73413b2 SHA512 64d74da0afb4249687b757206baca704911cab34e15e56e7328d259bdb2daf984c0cd5bcd0764c7688c4340b3453cac9d6af1ce750fa65c8d7a31992dff1fcea
-EBUILD scrot-1.7-r3.ebuild 1420 BLAKE2B 7be9689b2c7da17bdca5d3947d16c64a8355dd501175c5cf56ce3015f1ba47d2c9e2233359ded22d58bb0523d2026c45096ea496ce764de39bb6c9a5fc18c9a8 SHA512 77bec0b350ed47c2e3ff178af374ed22074d45f2225647c6cebc3820a686fec101a9cd6958cefffd8576109cf646b880a66a4836924339d6bbf78fe137c42f3d
-EBUILD scrot-1.8-r1.ebuild 1297 BLAKE2B 28a93d07aa9b72f42d80046c98c66f4c0251169c616ed863618b3d260df26281e5fbce6b981134a0f060e5171c50e652dd43cbd9b0ba62f52adbc0003565cf47 SHA512 563d987b837fd8e7fe61a1b9e781ef2ba9cec78143f52115648b12cd69c985a230dadf04fd43fac2d99ba3916d3df04be595c706addb8c73dc0b434ef0d12a23
-EBUILD scrot-1.8.1.ebuild 1291 BLAKE2B 4112ce3964532fb9d0e90a3ede553ef7c5434f77dd96534bf1b75491750ffd12e2cba405395589ecef951f70bf73cd5bee3367da209d49aec461581d9be9ddb6 SHA512 f3a1fa1d9f86bfcb13edb3efb92c34f28f7b630c1361c3c2d507e5df8c6a387e3e6e7fa90dab51cf4164cf35bf082bad0e2b5fd33058f84340b255cd36f326da
-EBUILD scrot-9999.ebuild 1297 BLAKE2B 28a93d07aa9b72f42d80046c98c66f4c0251169c616ed863618b3d260df26281e5fbce6b981134a0f060e5171c50e652dd43cbd9b0ba62f52adbc0003565cf47 SHA512 563d987b837fd8e7fe61a1b9e781ef2ba9cec78143f52115648b12cd69c985a230dadf04fd43fac2d99ba3916d3df04be595c706addb8c73dc0b434ef0d12a23
+EBUILD scrot-1.8.1-r2.ebuild 1310 BLAKE2B d18f2944a66b00c47647ed9abe0b4e82a18bd5e5eab1c12818acbf048219b4b16ee00d60c07d2e10db3598c21228b009f0060a9e7463f5216743814608fb6932 SHA512 a356fda7f7b1890970cbe5ba53294ae43dbe183c85442f12578ee8e2252e04921af9aa9569ba41c8301eaa6a377905d6b127f0051f803c6f8431bcbc9707dbeb
+EBUILD scrot-9999.ebuild 1316 BLAKE2B 4d9a44def451105026f3b93c1affec02b1574cbf289210a63f1a70cc7aa21440febd7bffd47942ff2214829e2c0dd676971ff64ebf10826f24beda7d36d64117 SHA512 8b8ebd9e5ed432647ac1b9ee09c7f554fad1849f7782dcfe3c294dafa890ff72e4dd502f7aa980e0a506b7dad6e5f90976b7467d1f6fe8a1385a9ac18bfc2501
 MISC metadata.xml 272 BLAKE2B 57b20f968b45b46bc686a75c4c121c11f67ea4628207fecbc093b2774e6f5bca3a1f5fb09af03aa8c8446dcd12f76e186d03de77dc2dd3ee544ed7995b82f0a6 SHA512 dc5f6095066e15f76bea7061eb33937cb8178abc6fbaeb13ce288aa5a65c1c73be970a8a5bb957a58fbb105d82dfb0919e4553c9aa563ce3dc374a26a18a2cca
diff --git a/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch b/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch
deleted file mode 100644
index 3e0fb09da85d..000000000000
--- a/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://github.com/resurrecting-open-source-projects/scrot/pull/175
-
-From: Sam James <sam@gentoo.org>
-Date: Sun, 19 Dec 2021 23:59:45 +0000
-Subject: [PATCH 1/2] build: respect docdir
-
-Before this patch with --docdir=/usr/share/doc/scrot-1.7-r1 (example downstream
-versioning for patches):
-```
->>> /usr/share/doc/scrot-1.7-r1/
->>> /usr/share/doc/scrot-1.7-r1/README.md.bz2
->>> /usr/share/doc/scrot-1.7-r1/ChangeLog.bz2
->>> /usr/share/doc/scrot-1.7-r1/AUTHORS.bz2
->>> /usr/share/doc/scrot/
->>> /usr/share/doc/scrot/scrot.png
->>> /usr/share/doc/scrot/README.md.bz2
->>> /usr/share/doc/scrot/ChangeLog.bz2
->>> /usr/share/doc/scrot/AUTHORS.bz2
-```
-
-After:
-```
->>> /usr/share/doc/scrot-1.7-r1/scrot.png
->>> /usr/share/doc/scrot-1.7-r1/README.md.bz2
->>> /usr/share/doc/scrot-1.7-r1/ChangeLog.bz2
->>> /usr/share/doc/scrot-1.7-r1/AUTHORS.bz2
-```
-
-This avoids installing duplicate files & installs them to the
-same location but it's overridable by --docdir in ./configure which
-helps downstreams.
-
-Bug: https://bugs.gentoo.org/828928
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -34,10 +34,9 @@ MAINTAINERCLEANFILES = Makefile.in
- 
- man_MANS = man/scrot.1
- 
--docs_DATA = README.md AUTHORS ChangeLog doc/scrot.png
--docsdir = $(prefix)/share/doc/scrot
-+doc_DATA = README.md AUTHORS ChangeLog doc/scrot.png
- 
--EXTRA_DIST = man/scrot.1 $(docs_DATA)
-+EXTRA_DIST = man/scrot.1
- 
- SUBDIRS = src
- 
-From: Sam James <sam@gentoo.org>
-Date: Mon, 20 Dec 2021 00:03:35 +0000
-Subject: [PATCH 2/2] build: simplify man page installation
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -36,7 +36,7 @@ man_MANS = man/scrot.1
- 
- doc_DATA = README.md AUTHORS ChangeLog doc/scrot.png
- 
--EXTRA_DIST = man/scrot.1
-+EXTRA_DIST = $(man_MANS)
- 
- SUBDIRS = src
- 
diff --git a/media-gfx/scrot/scrot-1.7-r3.ebuild b/media-gfx/scrot/scrot-1.7-r3.ebuild
deleted file mode 100644
index 89432c8217c9..000000000000
--- a/media-gfx/scrot/scrot-1.7-r3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Need autotools for docdir patch for now
-inherit autotools 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 git-r3
-else
-	SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-fi
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-
-# imlib2[X] needed for imlib_create_image_from_drawable, bug #835582
-RDEPEND="
-	dev-libs/libbsd
-	media-libs/imlib2[X]
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXfixes
-	|| (
-		media-libs/imlib2[gif]
-		media-libs/imlib2[jpeg]
-		media-libs/imlib2[png]
-		media-libs/imlib2[tiff]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-"
-
-DOCS=(
-	AUTHORS ChangeLog README.md
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7-fix-docdir.patch
-)
-
-src_prepare() {
-	default
-
-	# Needed for 1.7 for the docdir patch
-	eautoreconf
-	#[[ ${PV} == *9999* ]] && eautoreconf
-}
-
-src_install() {
-	default
-
-	newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN}
-}
diff --git a/media-gfx/scrot/scrot-1.8-r1.ebuild b/media-gfx/scrot/scrot-1.8-r1.ebuild
deleted file mode 100644
index 858ee4b9038c..000000000000
--- a/media-gfx/scrot/scrot-1.8-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-
-# imlib2[X] needed for imlib_create_image_from_drawable, bug #835582
-RDEPEND="
-	dev-libs/libbsd
-	media-libs/imlib2[X]
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	|| (
-		media-libs/imlib2[gif]
-		media-libs/imlib2[jpeg]
-		media-libs/imlib2[png]
-		media-libs/imlib2[tiff]
-	)
-"
-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}
-}
diff --git a/media-gfx/scrot/scrot-1.8.1.ebuild b/media-gfx/scrot/scrot-1.8.1-r2.ebuild
index 47b8cb413562..ce4af8815873 100644
--- a/media-gfx/scrot/scrot-1.8.1.ebuild
+++ b/media-gfx/scrot/scrot-1.8.1-r2.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 # imlib2[X] needed for imlib_create_image_from_drawable, bug #835582
 RDEPEND="
 	dev-libs/libbsd
-	media-libs/imlib2[X]
+	media-libs/imlib2[X,filters(+),text(+)]
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXcomposite
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index 858ee4b9038c..f8c2de9e5910 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 # imlib2[X] needed for imlib_create_image_from_drawable, bug #835582
 RDEPEND="
 	dev-libs/libbsd
-	media-libs/imlib2[X]
+	media-libs/imlib2[X,filters(+),text(+)]
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXcomposite