gentoo auto-resync : 05:04:2023 - 17:25:42

4 files changed, 5 insertions, 168 deletions

diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index f2b3b6b775c2..2cc452ad371c 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,10 +1,6 @@
 AUX fotoxx-22.18-documentation.patch 1074 BLAKE2B ecc735e158614bdbe2d44ec7463314a3f2f1151aaa95938a9415c7041ba0677acb4393d7f4d6c8817c0335e46dd365cc6f441102e0b6eb6f5ab233e70bf11ee1 SHA512 047ec5fa957ed3a9ad4e9667998045ec1c2d4cd6676f57275c40ea7d8797a0f95c7cfa2cd747e72f0f913c376bccdc708d73f675929302ce828c9d346d20885f
-DIST fotoxx-22.35.tar.gz 8675173 BLAKE2B 0d0c709da603a59f432b184b0477cc3a65166c39209c5ccd440cbb317d1c835cf9b2a64870b10bff07debc4617585ed976f8a2157ee1a600861c2edab9ad023f SHA512 aceec8172da1c2c40c422ac194ab870a39cc33d6e1f484fc5fd7292145636ef546fa400023bbcc403d7e2ad108eef6d1c696cce7983c39088fede3a8538801c4
-DIST fotoxx-23.0.tar.gz 9258345 BLAKE2B 96510f43c2b8a289191a1194adf13b255d29ebd8aae4e286f2fcc180bb1ecefe5df7ab9251a55e83010a527d455117ddd99dea7df189a38bc82e5b233806307e SHA512 b40025f90561c10ebb107edf26863be154c0b699c811275f2de71f9da417921704fb2215266d725a7f84b19327da54b3f9be2d00db6dfb9738739a2e9ffc1903
-DIST fotoxx-23.1.tar.gz 9198469 BLAKE2B a14064c1b240badcfe5c24970528956e2f7acfbcb6720c7f376447bb65b26db7f50ceedbe3ad8c36d7439e56dae074d4e6feee315a746e911a1d2fb9b77dabcd SHA512 5adf8501bb5ce232668b8dd551ccfac591f23dbb33dec4c303b37b1f4f7fd6c43dab67f3dc38a8647260b32e51f9778cb6dcaba5aaa91a2565d1f810afca7353
 DIST fotoxx-23.2-source.tar.gz 9233622 BLAKE2B 425c6f20210c62d08ee14f53436f3256e829a6fa3453047fe07ee0357fa277cdfe37340a6c19d0c39c2885b5ab6478d4791eb00631447f0b8d6ee53436750d5b SHA512 6193c99f11034609fdc052cf29184835644c76fd37270d8a8e9a76524d7bec7ea6ddc8e0c0ad7874d6997eba5c8c81f0f1a355a06a1220600380931aab10759b
-EBUILD fotoxx-22.35-r1.ebuild 2216 BLAKE2B e65f3bfecb82b5256a198ad9f2b5559738887d33d05ff159c7f9a5ec1977c2aa492c0e633dfa4b0427ae2a8ef7b18dc06e5ec7bdd0f40d2d694b758e50418a0a SHA512 6f6f97cfdae9709d8e0009b163e57c05b22dcf7c1c49aefa5c7c366d823d2db6fe78adc61df3a16b010d32052efbe5780b453f2279418b5f8b6327ee62ea347d
-EBUILD fotoxx-23.0.ebuild 2216 BLAKE2B 8c6904b379338f81700ddaea92da9f913c0d4c0d272b0e9832cc0c0a25bf149a37f86433c3c8d21e0734d8e25c3de1c4fbfe1f39de1b93e296e29fa1aea3ab40 SHA512 159339ef4311ddfd379164da2d9c5dd465a44b10090d4c3f17a8520691fd34c2772c5ca6189d84809b0448936b171f1defbe08451bfe507b9fb1940453aa51f3
-EBUILD fotoxx-23.1.ebuild 2218 BLAKE2B b376b01869bd4c9cc85bc0c2fea38d3d30b9fbf1cb75b9bedbc13264abc4b5057cc2b5e8767e926f6db516b308e2dc55548610b92381fbd0383693fa273951a1 SHA512 01b5fd2dd543530402e0072b7d2f8200316033756dc229bac315c605a02c2c0c11c447fff3dc75e309fe0b7cbf4ffc2cdd3710b1ea9653425b829c37d2b14ec5
+DIST fotoxx-23.31-source.tar.gz 9273695 BLAKE2B e300b24122c1b7b1cd48f2264cd3ee73602542ef119cf0e20f0618bd79e3ee5332331792f6c3f0b1d1b3ba78f12c2d2bd484d9b7af80850793a16a761c905426 SHA512 008a9c264546698ba765c09141f7d1c0cce80f36171aaf8136b9fa462920463134752c7dc3d58c38f2afde858707385410e9d72216a01b28ca0e70985df5ec31
 EBUILD fotoxx-23.2.ebuild 2277 BLAKE2B ae2639674583950bd2a4c5b1f01338d426afddc900326269a51ac2f0fee09c6976641cf61c0db5354a5766be395c22b4ea08d68544ff1944e1b51542c3370c12 SHA512 7c97016ad17c0a041604ba86c5ac7806db1d6661a6c49fcf52fccb574e9397a5fc3182bd4c54d87a7a4faeda5629f5534a8e78ce3ad69de326de30ddae86d62d
+EBUILD fotoxx-23.31.ebuild 2284 BLAKE2B 2612931ab0655bfcfa43514cad885b666a454a5ec7a3499f9fe184d6c97c5f3f5c63d0b718f543fc0ed6f06e524ad2865f9d7c4e8972da6bfeccc0f0a53e2590 SHA512 505990c00a1c630ef146eee15278fdaa36b73b0870b0cb91402a7d9529e9c3a5084e5eaa3a089385db7cbd9364872dbd7302a73e9dd37107e7530373c058ffca
 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9
diff --git a/media-gfx/fotoxx/fotoxx-22.35-r1.ebuild b/media-gfx/fotoxx/fotoxx-22.35-r1.ebuild
deleted file mode 100644
index 13462861777e..000000000000
--- a/media-gfx/fotoxx/fotoxx-22.35-r1.ebuild
+++ /dev/null
@@ -1,80 +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/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	media-libs/libchamplain[gtk]
-	x11-libs/gtk+:3"
-RDEPEND="
-	${DEPEND}
-	media-gfx/dcraw
-	media-libs/exiftool
-	x11-misc/xdg-utils
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-22.18-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 "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-23.1.ebuild b/media-gfx/fotoxx/fotoxx-23.1.ebuild
deleted file mode 100644
index cd7aa63620f7..000000000000
--- a/media-gfx/fotoxx/fotoxx-23.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 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/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	media-libs/libchamplain[gtk]
-	x11-libs/gtk+:3"
-RDEPEND="
-	${DEPEND}
-	media-gfx/dcraw
-	media-libs/exiftool
-	x11-misc/xdg-utils
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-22.18-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 "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-23.0.ebuild b/media-gfx/fotoxx/fotoxx-23.31.ebuild
index c7e883054f20..f3a0d0447279 100644
--- a/media-gfx/fotoxx/fotoxx-23.0.ebuild
+++ b/media-gfx/fotoxx/fotoxx-23.31.ebuild
@@ -7,7 +7,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"
+SRC_URI="https://kornelix.net/downloads/downloads/${P}-source.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -44,6 +44,7 @@ HTML_DOCS=()
 
 src_prepare() {
 	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
+	sed -i -e "/^Icon/ s/\.png$//" fotoxx.desktop || die
 	default
 }
 
@@ -56,7 +57,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "HEIC file support" media-libs/libheif
+	optfeature "HEIC & AVIF 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