gentoo auto-resync : 11:06:2023 - 14:17:09

5 files changed, 21 insertions, 83 deletions

diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index f49c2338452a..7ccc3b3d0e3c 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,7 +1,5 @@
 AUX scrot-1.7.bash-completion 2622 BLAKE2B febdade3f2b5cb094d9162e66d3b0d0b8ad72659e33ca9b6c55c4888ef3122c8f16430cc5f74d32367ea7a74905e3c8c49e9570d996c1324ffd9b72f42e9f534 SHA512 c0a6ac7347164e007eef219b567a554b5aac91c4afdc585d2ed299f46880a46343e3aef83ad8fe50e090ed8521ca241b7e3661a59511064a43164fbe366e1ebb
-DIST scrot-1.8.1.tar.gz 178856 BLAKE2B c7c6a5169112d38f1b919c651f5b5d99abd3adcf7bdbffd971c358b3c691297ff3bca6e7d82a0fa4e63323ee50651b477f7daab2ea383eb161446b41cd75516d SHA512 a93b3ce0fc690687b50d9b06d93b30528c26f3ee0b63d16895280d0df092fea022105a6d1aa60cf58c125a5b63eda841e089123d589354901b3ed6e063b76d86
 DIST scrot-1.9.tar.bz2 158710 BLAKE2B d823c0875a260ee9741e1c9038fe743e69d0afa83220448857d109dd3ebad9977f07871b25c6a4a979efdf2abd246a2facec91c5b0af01c47307dc6266c801d3 SHA512 ace3bcb26ecebc5bb139a6e011a562287be8f676f21211b540dd937ab2d4487047d3565d0aec84e099bd2c5c9b037d9044924b031f930dc45a3040df399a3312
-EBUILD scrot-1.8.1-r2.ebuild 1310 BLAKE2B d18f2944a66b00c47647ed9abe0b4e82a18bd5e5eab1c12818acbf048219b4b16ee00d60c07d2e10db3598c21228b009f0060a9e7463f5216743814608fb6932 SHA512 a356fda7f7b1890970cbe5ba53294ae43dbe183c85442f12578ee8e2252e04921af9aa9569ba41c8301eaa6a377905d6b127f0051f803c6f8431bcbc9707dbeb
-EBUILD scrot-1.9.ebuild 1311 BLAKE2B 9005f13c7a8cbcb32f28af799d9cd91c9fb43d0d9cbb50d4ff41414d53b6f7e2ff0724e63e459a4293e43c671966a83544bd96d93220754e5b589995d1b211e4 SHA512 65547f6f9340cf919f1be21546b34d0dcce50975d943d6bddc2621e46a2edbcfaf700b41a4c9d95fcc08681d904cb2b1ab2cc816a44106c1795c79fbf41b261b
-EBUILD scrot-9999.ebuild 1317 BLAKE2B 39028729772a033fa604c8a01c500f0e276e4ddb64ed08c65b05750a97cda57fcc2050532e715e4e3b13f962d2ea36c8353f6bc51265ab88f15431ba114a8179 SHA512 ae975f118430becc4888b88357334fa943ac99e2e6d80901ded2aede01f8d1c0f7ffb6aaa0474599c70e41d91e568bee1992bc65aa0a5f0e7de82eee2fa711ab
-MISC metadata.xml 272 BLAKE2B 57b20f968b45b46bc686a75c4c121c11f67ea4628207fecbc093b2774e6f5bca3a1f5fb09af03aa8c8446dcd12f76e186d03de77dc2dd3ee544ed7995b82f0a6 SHA512 dc5f6095066e15f76bea7061eb33937cb8178abc6fbaeb13ce288aa5a65c1c73be970a8a5bb957a58fbb105d82dfb0919e4553c9aa563ce3dc374a26a18a2cca
+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/metadata.xml b/media-gfx/scrot/metadata.xml
index b6bd99f24f29..2dc73194a117 100644
--- a/media-gfx/scrot/metadata.xml
+++ b/media-gfx/scrot/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>nrk@disroot.org</email>
+		<name>NRK</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">resurrecting-open-source-projects/scrot</remote-id>
 	</upstream>
diff --git a/media-gfx/scrot/scrot-1.8.1-r2.ebuild b/media-gfx/scrot/scrot-1.8.1-r2.ebuild
deleted file mode 100644
index ce4af8815873..000000000000
--- a/media-gfx/scrot/scrot-1.8.1-r2.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,filters(+),text(+)]
-	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.9.ebuild b/media-gfx/scrot/scrot-1.9.ebuild
index 6be000c3bcad..85fb69e81443 100644
--- a/media-gfx/scrot/scrot-1.9.ebuild
+++ b/media-gfx/scrot/scrot-1.9.ebuild
@@ -15,24 +15,21 @@ else
 	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 fi
 
-LICENSE="feh LGPL-2+"
+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="
-	dev-libs/libbsd
 	media-libs/imlib2[X,filters(+),text(+)]
 	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]
-	)
+	media-libs/imlib2[png]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index 4cde5c2086b1..f03c9dc8cd96 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -15,24 +15,21 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-LICENSE="feh LGPL-2+"
+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="
-	dev-libs/libbsd
 	media-libs/imlib2[X,filters(+),text(+)]
 	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]
-	)
+	media-libs/imlib2[png]
 "
 DEPEND="
 	${RDEPEND}