gentoo auto-resync : 18:07:2024 - 12:29:01

8 files changed, 129 insertions, 16 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 334b8365a9bd..6cf8859ad22d 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 56de8953e997..0c511318e1db 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,7 +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
+DIST scrot-1.11.1.tar.bz2 158007 BLAKE2B e0c8f166444bfdfbed41a5588036b861973c90d057e302f7bd35cf9630a9f0311735977632ba068c1b3542baed251a3d682da7d8f56c114880a425b3056a0692 SHA512 6a6435c6e0562a367d895f2d1c7a03b050f6588a5843376c5e33a5b8ef1b0b684390530f8c61c340b3f0928caeefb95d9df1f8fe0b145768c336685b1c8d8deb
 EBUILD scrot-1.10.ebuild 1388 BLAKE2B e99af4ac52022803494f6ae62b004b8a3bb0c40c72300905908e759829ec222a3ce4c24213d3707e3e52664736df01ec120b0813363cd93ac7a25bd6db382042 SHA512 bef2cc2eba090e3a3b9549c7bd464784a1dc0c1ca7fd0b1b9b38de2a15407be66e6953859014ee15b292dec8b91ea37ce0e9c21b33c8a14256e5c32c2d23fa7b
-EBUILD scrot-1.9.ebuild 1388 BLAKE2B e99af4ac52022803494f6ae62b004b8a3bb0c40c72300905908e759829ec222a3ce4c24213d3707e3e52664736df01ec120b0813363cd93ac7a25bd6db382042 SHA512 bef2cc2eba090e3a3b9549c7bd464784a1dc0c1ca7fd0b1b9b38de2a15407be66e6953859014ee15b292dec8b91ea37ce0e9c21b33c8a14256e5c32c2d23fa7b
-EBUILD scrot-9999.ebuild 1395 BLAKE2B 7b42b90681e7bdb83ad6a5f649a4ebdd5abbf9a0c2375ca2a3ebca58f17b9c3be315401a0ed97db0b39796b8de15db60b8f82f835f2c42bc604f013588a53677 SHA512 4f14e20b0a6d94a2fcd4d1bdbc7be578e3a8860f5442facf8225abd43f1bc420b23ed600a22a34cc982ef9084ba14b94eb0c27598e2f70c6259df3502b6e8be3
+EBUILD scrot-1.11.1.ebuild 1406 BLAKE2B 0e905c915114d19fb62db734ecd30c0e98c442bd2e11535b7ba7f210d18d439cc6b108666ceb3c895cccd24960ec9ad50d2ac17585ce3596a1af2e8ce6a581ce SHA512 cea86dab25f83a013a209be9bb16bbadcfb0b5d50bd67d9eedd13a22ec40d824ef0462a0738464a35d164d684aba8a8d7a2b72edfa091db25632eaaa94df2381
+EBUILD scrot-9999.ebuild 1406 BLAKE2B 0e905c915114d19fb62db734ecd30c0e98c442bd2e11535b7ba7f210d18d439cc6b108666ceb3c895cccd24960ec9ad50d2ac17585ce3596a1af2e8ce6a581ce SHA512 cea86dab25f83a013a209be9bb16bbadcfb0b5d50bd67d9eedd13a22ec40d824ef0462a0738464a35d164d684aba8a8d7a2b72edfa091db25632eaaa94df2381
 MISC metadata.xml 486 BLAKE2B 49d843df52a3129520dc7f99058e4632bd2bef1239ae14f4ff49e315bb5d11536a2f384845c87ad69e9dcd1ccd363009f4d9b4b5d862aca69d59e5f6490573c9 SHA512 56297474babfd15627050a5d5e4ac885dcd6a9f9d861e708877c280b23251680700e006d58edf384d412df56b97ffaa5dc8d55ab1dedd34a9e4d3af1ed63980f
diff --git a/media-gfx/scrot/scrot-1.9.ebuild b/media-gfx/scrot/scrot-1.11.1.ebuild
index 81c77df2463a..d383d2bfa6bc 100644
--- a/media-gfx/scrot/scrot-1.9.ebuild
+++ b/media-gfx/scrot/scrot-1.11.1.ebuild
@@ -3,16 +3,17 @@
 
 EAPI=8
 
-inherit bash-completion-r1
+inherit shell-completion
 
 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
+	LIVE_BDEPEND="dev-build/autoconf-archive"
 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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="feh"
@@ -34,15 +35,14 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
-	elibc_musl? ( sys-libs/queue-standalone )
 "
 BDEPEND="
-	dev-build/autoconf-archive
+	${LIVE_BDEPEND}
 	virtual/pkgconfig
 "
 
 DOCS=(
-	AUTHORS ChangeLog README.md
+	AUTHORS ChangeLog README.md FAQ.md
 )
 
 src_prepare() {
@@ -54,5 +54,6 @@ src_prepare() {
 src_install() {
 	default
 
-	newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN}
+	dozshcomp  etc/zsh-completion/_scrot
+	dobashcomp etc/bash-completion/scrot
 }
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index 092a65896df9..d383d2bfa6bc 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=8
 
-inherit bash-completion-r1
+inherit shell-completion
 
 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
+	LIVE_BDEPEND="dev-build/autoconf-archive"
 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"
@@ -34,15 +35,14 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
-	elibc_musl? ( sys-libs/queue-standalone )
 "
 BDEPEND="
-	dev-build/autoconf-archive
+	${LIVE_BDEPEND}
 	virtual/pkgconfig
 "
 
 DOCS=(
-	AUTHORS ChangeLog README.md
+	AUTHORS ChangeLog README.md FAQ.md
 )
 
 src_prepare() {
@@ -54,5 +54,6 @@ src_prepare() {
 src_install() {
 	default
 
-	newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN}
+	dozshcomp  etc/zsh-completion/_scrot
+	dobashcomp etc/bash-completion/scrot
 }
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index a60c09120518..10e0bbb1e7a5 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -5,8 +5,11 @@ AUX xv-3.10a-libpng15-r1.patch 16530 BLAKE2B 6233c9e49f021ba3e62f9a5e9da4e360126
 AUX xv-3.10a-osx-bsd-20070520.patch 1497 BLAKE2B 1dcd54c8de29b9552a50069e627fd9dbbd327a22a8e18a12f260c1aaec2978b536cbdc571d47f17cca3f477dd574730dca7748532e6ed41f4697fa76774d5384 SHA512 a6f1160c0658ae4f3394cf2bb0b324392593010539ac2dd52176a587c41844cd5bca61823af31633d765f3399a9cb52e0296f894a2f08060ef4c2b4d687d8b51
 AUX xv-3.10a-vdcomp-osx-20070520.patch 455 BLAKE2B fa6cfa3657f74da7254cce5e73140c2a82614df2398a66e98c57d3056b1f574fbe80b9bce925f2f0988133596fdc4ea5c580371613a23a0283e9b09343a700a9 SHA512 8e389040ae3ac52dd086fbc1858699ea4bef417053952766a5569aab4ec70dbbd674a4e26adbc9434c0b411754d9643064d4254e72fbc79f99d3aefaf35f997b
 AUX xv-3.10a-wformat-security.patch 519 BLAKE2B 7b0ba8ee6dc33af787040e72fdfd4cf1d638dd556ff30c60c5983f6e8158fa63b49a66c97c919bdac5084c766df2b9587597c4f103fff3e2718cff8a006c1c05 SHA512 7e1150fdda9359e7b105729c92b8059bf5c762d468bcdaeadbb91ed75c2517b0ad627784a7a6f2bb8f7857884dc47f2d41c7c7247824fa4af8533dc023ceea52
+AUX xv-5.2.0-osx-bsd.patch 2103 BLAKE2B f12287becac8bfa5227523677c6118816f9dd43fd8b41c400dd6695ea4b6c610bc713f6ffdd9d2d75f8bd2b4de1f228c5349f71d3b8f7c77f10c01ac30b77301 SHA512 e2b6673d202b20a9d88dfd7711e63f702a67de7ca56de049ab27803a76b8833745ba1057ffbc53b246d077e870bce44746d28b1ced0eca31d4d9746c2a3fe57f
 DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa861d9b2b6898d6e378b4a61a57c746a8822793a8e11e54165faf859e073ef99c9fbea5aa0c4c8caa4608ef03f553003b779a4bf59c3ab6 SHA512 e2ac5a3b4d743bf142c162b00815dd9d8dcaf345d0649016b2c6441fe2329879471b19453808e677c1a0b8eeb3468295dba160b1f30eacb2a7a9d8524ce03e75
 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b
 DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f
+DIST xv-5.2.0.tar.gz 4785784 BLAKE2B 46dc637cbbeabfe1c034c34e73040de6efebbf5f423fe429028ebfeefd2fce5af0fdaff1c52db4807b8eb88de89dae6b7f0e2c8a3522a3d9b103d5777783a52d SHA512 0af7ff6db152be849c27be9fba116513595deeca9e3eb42ec6fd74a4756d0c525b55a40de49aa37dd5d2ea4a29e6d644c8c4c709f0e1ec0a98cbc0ae7221b110
 EBUILD xv-3.10a-r22.ebuild 2555 BLAKE2B 92911c150ebbbafeb7001347c864bd6579c96e92de3bff55349b10da50261fc57a48bac74ae8d3023e2c3a6318c1c774203575f784442eb8657841f18b189c20 SHA512 c8db57ebd0e1ad53ad0013e57874975176356d8d6bc1f3ce6e701a715d1703f85e9472e51716a75e76687e41bbbaa60be82958c7b0f742e061af632e70f4e406
-MISC metadata.xml 250 BLAKE2B 699d6b9629cb9e0fac6509f4eec3bd2a175002f57ddadb07c2041b583ac4fd57e8cf78506850997f3a140201cbe4bbbab49a768634a50aba337e0e72630eb4b2 SHA512 efce6490cf2258fec1a8f6c77dc22583376cc0adb5aa1f862b88beccc82a7492d12addd2276a58c0a14810a3b02d9750f8ad3f28ffa74d858a86f204e8c9ab01
+EBUILD xv-5.2.0.ebuild 1219 BLAKE2B c7940a9a3e31bb4d378fa4c6c10146f78f680369b52accfb5c9e11c8cc1677a051fa3304ed1f45f0d91e65631a3d3b63d3897ffdfbc8acd3dc3cbb3a456eaa7b SHA512 6ce89b469662565b4956c5696402c99a2202cdda3ed1da33b1359663973b27ef381a4b7f92ea9915e89b75a945b6019264ea8f4c7eab8bd8bfad9beaad157f4d
+MISC metadata.xml 392 BLAKE2B e1e306f8f6bd480912d6e45b5af362d54900117ae05a21995023e6611c1410af6682af867150179ecebd9d319a9f9810723dffec59a26e3f9f9ecc0a56061127 SHA512 e8aad6d1b24943fc3aeb6533fb0dc048ea0d3edc04abe2efa9a27930698ff3ddb0185dc3a2da69e08c050c4545d907c8580add6732fd8e3258ed496784902364
diff --git a/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch b/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch
new file mode 100644
index 000000000000..27059386446d
--- /dev/null
+++ b/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch
@@ -0,0 +1,51 @@
+diff '--color=auto' -ur a/src/vdcomp.c b/src/vdcomp.c
+--- a/src/vdcomp.c	2024-07-17 09:37:04.957769272 -0500
++++ b/src/vdcomp.c	2024-07-17 09:44:30.582594953 -0500
+@@ -130,6 +130,8 @@
+ 
+ #    if defined(hp300) || defined(hp800) || defined(NeXT)
+ #      include <sys/malloc.h>    /* it's in "sys" on HPs and NeXT */
++#    elif defined(__APPLE__)
++#      include <malloc/malloc.h>
+ #    else
+ #      include <malloc.h>        /* FIXME: should explicitly list systems that NEED this, not everyone that doesn't */
+ #    endif
+diff '--color=auto' -ur a/src/xv.h b/src/xv.h
+--- a/src/xv.h	2024-07-17 09:37:04.957769272 -0500
++++ b/src/xv.h	2024-07-17 09:41:42.912041683 -0500
+@@ -183,7 +183,7 @@
+ 
+ #ifndef VMS
+ #  include <errno.h>
+-#  ifndef __NetBSD__
++#  if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__)
+ #    if !(defined(__GLIBC__) && __GLIBC__ >= 2) && !defined(__OpenBSD__)
+        extern int   errno;         /* SHOULD be in errno.h, but often isn't */
+ #      ifndef XV_HAVE_SYSERRLISTDECL
+@@ -199,7 +199,7 @@
+ #  ifdef VMS
+ #    define ERRSTR(x) strerror(x, vaxc$errno)
+ #  else
+-#    if defined(__BEOS__) || defined(__linux__) /* or all modern/glibc systems? */
++#    if defined(__BEOS__) || defined(__linux__) || defined(__APPLE__) /* or all modern/glibc systems? */
+ #      define ERRSTR(x) strerror(x)
+ #    else
+ #      define ERRSTR(x) sys_errlist[x]
+@@ -236,6 +236,8 @@
+ #ifdef NEED_MALLOC_H
+ #  if defined(hp300) || defined(hp800) || defined(NeXT)
+ #    include <sys/malloc.h>    /* it's in "sys" on HPs and NeXT */
++#  elif defined(__APPLE__)
++#   include <malloc/malloc.h>
+ #  else
+ #    include <malloc.h>
+ #  endif
+@@ -399,7 +401,7 @@
+  *                them later. */
+ #ifndef VMS       /* VMS hates multi-line definitions */
+ #  if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
+-      defined(__bsdi__)
++      defined(__FreeBSD__) || defined(__bsdi__) || defined(__APPLE__)
+ #    ifndef USE_MKSTEMP
+ #      define USE_MKSTEMP       /* use 'mkstemp()' instead of 'mktemp()' */
+ #    endif                      /* >> SECURITY ISSUE << */
diff --git a/media-gfx/xv/metadata.xml b/media-gfx/xv/metadata.xml
index 03458a5affcb..6f2f9f849997 100644
--- a/media-gfx/xv/metadata.xml
+++ b/media-gfx/xv/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>bkohler@gentoo.org</email>
+    <name>Ben Kohler</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">png-mng</remote-id>
+    <remote-id type="github">jasper-software/xv</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-gfx/xv/xv-5.2.0.ebuild b/media-gfx/xv/xv-5.2.0.ebuild
new file mode 100644
index 000000000000..49af68754450
--- /dev/null
+++ b/media-gfx/xv/xv-5.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop
+
+JUMBOV=20070520
+DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats"
+HOMEPAGE="https://github.com/jasper-software/xv/"
+SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://gentoo/xv-3.10a.png.bz2"
+
+LICENSE="xv"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="jpeg tiff png webp"
+
+DEPEND="
+	x11-libs/libXt
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	tiff? ( media-libs/tiff:= )
+	png? (
+		>=media-libs/libpng-1.2:=
+		sys-libs/zlib
+	)
+	webp? ( media-libs/libwebp:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/xv-5.2.0-osx-bsd.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DXV_ENABLE_JPEG=$(usex jpeg)
+		-DXV_ENABLE_JP2K=OFF
+		-DXV_ENABLE_PNG=$(usex png)
+		-DXV_ENABLE_TIFF=$(usex tiff)
+		-DXV_ENABLE_WEBP=$(usex webp)
+		)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newicon "${WORKDIR}"/xv-3.10a.png ${PN}.png
+	make_desktop_entry xv "" "" "Graphics;Viewer"
+}