gentoo auto-resync : 28:09:2022 - 03:11:19

5 files changed, 97 insertions, 3 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 5e01ecf99425..f47a304250d0 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index cbb8e631121e..5eceb14a2a40 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-photos-42.0.tar.xz 2855624 BLAKE2B a980cc2f581f1f6834925426ba3e0e7e6c341d939b2fbe2aa40c737669fb09fcdd8bb64fd0dfbee640d8dd73061281b6b92f97cfb5737cbeca9788c9e01d7fbe SHA512 cddaa84596a180fb2a4d70db65c6e625e3d94bccbdc7bcc83ed577b9306210a2879e3d40f8823a9e097f78caa6fccc53404194e7dce0629db3ebda1aa428b714
-EBUILD gnome-photos-42.0.ebuild 2441 BLAKE2B cbc42c5c0874e2af6880e01266f2e8a7dc4a4ae7f2cffcd60e35c22e1244dd9836e9f762e2faea89de9556e0ccf207a554c7e087256e645bff243266d4c5285c SHA512 e586a55bf2988b9767d7cf68d6364b4f730a36d90cbf02864796a5012bd8038fb5e5446a9951c752a208e3976b19b5aa31668b8df09e377ee639827313fec491
+EBUILD gnome-photos-42.0-r1.ebuild 2456 BLAKE2B 3746d2de022510440c68e39efd70f72a11ae85a5e31b91b21ae3caf79fe9622cf31ec1b40de9b44261e948d2f88dc74a91d14fee444429d24fcc3ba0d50668b4 SHA512 8b41e4af554dc532ce44dea98fab43d0a9f7eb285347948ad6e3caf68ac44c5eab85e3dbc63c2f2547a09c3f685ea51b424e26e4f11ac047da1c91e776d7c2f2
 MISC metadata.xml 993 BLAKE2B 19e15d88f2176fa80739650a2d3ae57e34a662e5a4424a00a33bc785e4e4a35d57fc28d678885e4e18564318e93957b689ff36ea96bea69038a377400c6217f2 SHA512 19300545f23b83e06df0db74a605b48a62f5dd462db1ef69de903123209b50331ceffec783bd9564a15ee10dd1f0a6fc9e396f1384e56f7bb0cc83af08d1fda4
diff --git a/media-gfx/gnome-photos/gnome-photos-42.0.ebuild b/media-gfx/gnome-photos/gnome-photos-42.0-r1.ebuild
index 69c57dce0b5a..5eba4af8032c 100644
--- a/media-gfx/gnome-photos/gnome-photos-42.0.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-42.0-r1.ebuild
@@ -20,7 +20,7 @@ DEPEND="
 	>=x11-libs/cairo-1.14.0
 	>=x11-libs/gdk-pixbuf-2.36.8:2
 	>=media-libs/gegl-0.4.0:0.4[cairo,raw]
-	sci-geosciences/geocode-glib
+	sci-geosciences/geocode-glib:0
 	>=media-libs/gexiv2-0.10.8
 	>=dev-libs/glib-2.62.0:2
 	>=net-libs/gnome-online-accounts-3.8.0:=
@@ -31,7 +31,7 @@ DEPEND="
 	>=dev-libs/libgdata-0.17.13:0=[gnome-online-accounts]
 	>=net-libs/libgfbgraph-0.2.1:0.2
 	>=gui-libs/libhandy-1.1.90:1=
-	virtual/jpeg:0
+	media-libs/libjpeg-turbo:0=
 	>=media-libs/libpng-1.6:0=
 	app-misc/tracker:3=
 	sys-apps/dbus
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 497dca5b6776..431d6eaaddbc 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -9,4 +9,5 @@ DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa86
 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b
 DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f
 EBUILD xv-3.10a-r19.ebuild 2453 BLAKE2B 121f3393b4b12c6cd1376eccd78a7acc8cda6c8860258c1b62a869878e4b743df06353cd93a4378f532ff6377e269072de805ebfe69758b7f7dc2b34531f44a3 SHA512 ded1eca8c5fc2774819331db81d605bde931befd79ecf484e3f6acbc838fdd88502356b90fb5ffaf4f707d7c7150c97225b3ffca5a4a797a36c4355715fcec0f
+EBUILD xv-3.10a-r20.ebuild 2545 BLAKE2B a6aa76ad29c412f7fbd071d7b4a7282c4cd6c7e49fe4b06794fce01a8133b38a6d7d68a16ae75dc58533f23531e4f65f08bb99d669c418edb6dc6197d60454dd SHA512 66fb795e7f8ef1b883e9f53bffb3d5aab558d8567f6c934714eb2b00d663d6ce6889f56060c43a8f14fd3484e3e277fac55520f29efd5a7914c22f0bcb074997
 MISC metadata.xml 250 BLAKE2B 699d6b9629cb9e0fac6509f4eec3bd2a175002f57ddadb07c2041b583ac4fd57e8cf78506850997f3a140201cbe4bbbab49a768634a50aba337e0e72630eb4b2 SHA512 efce6490cf2258fec1a8f6c77dc22583376cc0adb5aa1f862b88beccc82a7492d12addd2276a58c0a14810a3b02d9750f8ad3f28ffa74d858a86f204e8c9ab01
diff --git a/media-gfx/xv/xv-3.10a-r20.ebuild b/media-gfx/xv/xv-3.10a-r20.ebuild
new file mode 100644
index 000000000000..5bee0859905d
--- /dev/null
+++ b/media-gfx/xv/xv-3.10a-r20.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+JUMBOV=20070520
+DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats"
+HOMEPAGE="http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html"
+SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
+	ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
+	mirror://gentoo/${P}.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"
+
+DEPEND="
+	x11-libs/libXt
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	tiff? ( media-libs/tiff )
+	png? (
+		>=media-libs/libpng-1.2:=
+		sys-libs/zlib
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${WORKDIR}/${P}-jumbo-fix-enh-patch-${JUMBOV}.txt"
+	"${FILESDIR}/${P}-osx-bsd-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-vdcomp-osx-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-disable-jp2k-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-fix-wait-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-add-ldflags-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-libpng15-r1.patch"
+	"${FILESDIR}/${P}-wformat-security.patch"
+)
+
+src_prepare() {
+	default
+
+	append-cppflags -DUSE_GETCWD -DLINUX -DUSLEEP
+	use jpeg && append-cppflags -DDOJPEG
+	use png && append-cppflags -DDOPNG
+	use tiff && append-cppflags -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX
+
+	# Link with various image libraries depending on use flags
+	IMAGE_LIBS=""
+	use jpeg && IMAGE_LIBS="${IMAGE_LIBS} -ljpeg"
+	use png && IMAGE_LIBS="${IMAGE_LIBS} -lz -lpng"
+	use tiff && IMAGE_LIBS="${IMAGE_LIBS} -ltiff"
+
+	sed -i \
+		-e 's/\(^JPEG.*\)/#\1/g' \
+		-e 's/\(^PNG.*\)/#\1/g' \
+		-e 's/\(^TIFF.*\)/#\1/g' \
+		-e "s/\(^LIBS = .*\)/\1${IMAGE_LIBS}/g" Makefile || die
+
+	# 731022
+	sed -i -e "s#lib -lz#$(get_libdir) -lz#" Makefile || die
+
+	# /usr/bin/gzip => /bin/gzip
+	sed -i -e 's#/usr\(/bin/gzip\)#'"${EPREFIX}"'\1#g' config.h || die
+
+	# Fix installation of ps docs
+	sed -i -e 's#$(DESTDIR)$(LIBDIR)#$(LIBDIR)#g' Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" CCOPTS="${CPPFLAGS} ${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		PREFIX="${EPREFIX}"/usr \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		LIBDIR="${T}"
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}"/usr \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		LIBDIR="${T}" install
+
+	dodoc CHANGELOG BUGS IDEAS
+	newicon "${WORKDIR}"/${P}.png ${PN}.png
+	make_desktop_entry xv "" "" "Graphics;Viewer"
+}