gentoo resync : 12.05.2022

3 files changed, 3 insertions, 87 deletions

diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index bf50faf48ceb..c57d3c2a62a8 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,8 +1,6 @@
 AUX fotoxx-21.40-documentation.patch 1511 BLAKE2B da0443a6b1ff8684e43005239f0184c742cd59727e3c55460713680b14b5d39ba528b7a17a87b893a9585824f1e402b5f46bbe45451dd8888b62d1752524db44 SHA512 d0f79f986b605c3f981de99c533f57a60aac47844d1434482e507a7e7e4d2be2b581419e211f034213c7c23db0e56f4fe5d789f39624a33aee283c8b8a489509
 DIST fotoxx-21.60.tar.gz 8679841 BLAKE2B ec3dcbd0b937d730692e225fec7530ac46390328ae960e8960df7d252bc0cd8630de84bf47dfaf74c1e07855b4b0959e596e5e515ea00a6c430872359b2b4576 SHA512 ac999fcc70acd92c54e85ad276112aaa7f1b7606ea70381d6f833d829fd92c14aacad7a967838e5d28fce80cfa6da8ef05e0ee49b463210cb66a3f8ffc3d22e7
-DIST fotoxx-22.14.tar.gz 8815290 BLAKE2B fa6399454edebbbff6504fc9e7f8b27fbfecea0083a309cfeefd8d0f4834693a1c7eab8a689cb1a2135293e1290650cb44412375d20fe808014c5a5213c979d5 SHA512 7a0e412131a286ebc0ce8f5d7589ec135909a9d74e5a0f4a5367e58484462c23948c2b0ccc10c5197ba1014013f2d31999dd63d460daa4c4d4aa194313ee3c7b
-DIST fotoxx-22.15.tar.gz 8948263 BLAKE2B 99b4e6891751de62b880de6c51ee3ce2720f773ae03fad5d3b4c433e20cfb288efab9c5074841ba9c535374d3a9b860131c303f6539e889d7f747380d1c9f1db SHA512 4f317a34a72db2e6289e17c9d2d036150e0e633ac84a0bcd0dd8b00367a3c31ea6172b7cceab0f358c0db46057d9e0331e0f0a304ebe86b9a1b717f6fa4f54fd
+DIST fotoxx-22.16.tar.gz 8984376 BLAKE2B 4a5665313133405b4a53d7e40986e37601b5c9552f20c07d5f0889f3dacbabce1b4a712fcb216fe3358e7ad1de12da608961a996b081e4b3d644c5581ebcc6ee SHA512 ff78b0d7bbde0de5d98ac42d63c36f4bdcd425ae210dfcda6f64f4307be02dfca2966475df3f962751f73afc8e9442d2eb975725db31745109e174fe1665f804
 EBUILD fotoxx-21.60.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
-EBUILD fotoxx-22.14.ebuild 2262 BLAKE2B f3f8a52c2487101ba3b99ff6ba234550f39df389198d43683cba6c573bf01786116b72ac6c642813061343db86f9bd16785524e08a01511c7e433c46d3657e65 SHA512 7c73f159b3931c4edd5ef61dea1f773f4d50f3f5f7aa22c412223ea591ff3f519c92827bcc20561465af532b50824fda75a58b49d4282dc65c760af1e5a5fdcb
-EBUILD fotoxx-22.15.ebuild 2262 BLAKE2B f3f8a52c2487101ba3b99ff6ba234550f39df389198d43683cba6c573bf01786116b72ac6c642813061343db86f9bd16785524e08a01511c7e433c46d3657e65 SHA512 7c73f159b3931c4edd5ef61dea1f773f4d50f3f5f7aa22c412223ea591ff3f519c92827bcc20561465af532b50824fda75a58b49d4282dc65c760af1e5a5fdcb
+EBUILD fotoxx-22.16.ebuild 2218 BLAKE2B 20d1c3ff49d1789dc4e1fd18851d8b2757a7ffe762e9b0d51ac9f76b0270bbb5454bcde816f079487b3ea8038a497da7256be4f11665d07696773b354c2c9e50 SHA512 7209da52ecff7f029b4e71a5c4a19d91baa918f44c15de91d86c1963d7ff0da76525c00438886e03c05f18bea9cab77cc9956892cdf17c7c02afc2816af9f642
 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9
diff --git a/media-gfx/fotoxx/fotoxx-22.15.ebuild b/media-gfx/fotoxx/fotoxx-22.15.ebuild
deleted file mode 100644
index 852e25423552..000000000000
--- a/media-gfx/fotoxx/fotoxx-22.15.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature xdg-utils
-
-DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
-SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# For required dependencies read doc/README, for required tools read
-# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
-# alternative to firefox and chromium-browser. `grep '"which ' * -R`
-# is helpful to report some required tools run via the shell.
-
-DEPEND="
-	media-libs/clutter
-	media-libs/clutter-gtk
-	media-libs/lcms:2
-	media-libs/libpng:0
-	media-libs/tiff:0
-	media-libs/libchamplain[gtk]
-	virtual/jpeg
-	x11-libs/gtk+:3"
-RDEPEND="
-	${DEPEND}
-	media-gfx/dcraw
-	media-libs/exiftool
-	x11-misc/xdg-utils
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-21.40-documentation.patch" )
-
-DOCS=()
-HTML_DOCS=()
-
-src_prepare() {
-	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
-	default
-}
-
-src_install() {
-	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
-	# and README, changelog, copyright, license, etc. must not be compressed.
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
-	docompress -x /usr/share/doc
-}
-
-pkg_postinst() {
-	optfeature "HEIC file support" media-libs/libheif
-	optfeature "additional RAW file support" media-gfx/rawtherapee
-	optfeature "additional RAW file support" media-gfx/darktable
-	optfeature "video thumbnails & playback" media-video/ffmpeg
-	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
-	optfeature "additional panorama support" media-gfx/hugin
-	optfeature "WEBP file support" media-libs/libwebp
-
-	elog
-	elog "Please read the Help > User Guide for details. The source location is"
-	elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
-	elog "be placed at /home/<user>/.fotoxx/userguide."
-	elog
-	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
-	elog
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/fotoxx/fotoxx-22.14.ebuild b/media-gfx/fotoxx/fotoxx-22.16.ebuild
index 852e25423552..6444b3fb63f4 100644
--- a/media-gfx/fotoxx/fotoxx-22.14.ebuild
+++ b/media-gfx/fotoxx/fotoxx-22.16.ebuild
@@ -23,10 +23,10 @@ DEPEND="
 	media-libs/clutter
 	media-libs/clutter-gtk
 	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0
 	media-libs/tiff:0
 	media-libs/libchamplain[gtk]
-	virtual/jpeg
 	x11-libs/gtk+:3"
 RDEPEND="
 	${DEPEND}
@@ -61,7 +61,6 @@ pkg_postinst() {
 	optfeature "additional RAW file support" media-gfx/darktable
 	optfeature "video thumbnails & playback" media-video/ffmpeg
 	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
-	optfeature "additional panorama support" media-gfx/hugin
 	optfeature "WEBP file support" media-libs/libwebp
 
 	elog