gentoo auto-resync : 27:01:2024 - 12:56:47

5 files changed, 136 insertions, 9 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 17d45e40b090..1167b48cbcd5 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index d896f8f9cebc..37e1995401bc 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -3,6 +3,9 @@ AUX geeqie-2.1-locale.patch 522 BLAKE2B f676a4b2b0acb6184c66657314974f61413172be
 AUX geeqie-2.1-lua_hpp.patch 344 BLAKE2B 8206ef3ec5faf9b94efe57413905dedef5046b0d90056864e33b2adb876ca4bb3867417a24e4f6956d14923b3ee119ee5e8379f314cffe8ade2c1102bcb3c1de SHA512 599f9b63fad24bd292a393ead338894c6330b82fc3e02e71e16f7a85b49fa0ed564677444b5d78d68b4ac91ad04e8a6c237e3119031e1307ab089ae37e6eb838
 DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d
 DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f
+DIST geeqie-2.2-docs.tar.xz 356976 BLAKE2B 3bca2815a6f177a2f38b9a66ff6fa95dba510aa2afb36d5d6c9f6841c0c1b25c4f9aad7d45ef57d911f0caa2a8499a06aba2ccaf7e279382bf4304c88f11ea13 SHA512 0f89995573b02e82c715dcdf4d71a309691885ad785f1297d2fee01aff00f2aed43c9cff6900bddfa1a727598934ba7bb0ced32b0c86c6f1a115271a8a81592a
+DIST geeqie-2.2.tar.xz 2169096 BLAKE2B fe7f21f5842ac7824ec37f0775d31e8dcd05934809f7bdd84d7dcb749d25976055050f42a8cea3cd414fb3c7e60055c9fa32b93cfef2af62de68f4d44af425c8 SHA512 7d03493b463a1949cbc5e377927abc4bc6fa62914e8cdddb30a832cb9c6caad579f5ba5bd2b8b0913b77063300c9c5ac1f7e671ddfb2ce18d8a8d0efcfb51dbe
 EBUILD geeqie-2.1-r1.ebuild 3145 BLAKE2B 6f109e412114bf0e714858bfda4e48e4d0ff66bf2f69db55cfd400a9bf63c0f3a62cf33ee291c4b42f4ad0ab8cce53079a03d25fcb6391f54046b8245dded573 SHA512 7c166f155c7a3381baab970e957ce05aac4d73a98f228828e7c9b99df8cee44b390dc30a74c653c37cf5a6e1557c6cc7901a791b4591ebb7a97acf174f4b7845
+EBUILD geeqie-2.2.ebuild 3152 BLAKE2B 6b726510c2612f2ce6a1ee47a0e3c1fb9a676d09b79852756f6d0c81eefc59bde3e23c2b499cac2358e56ec98344c7a8cf9e98e0a49484b11ee0825bc6997753 SHA512 367519c74dafd8a5b8e1d6fc7a3cdd2e7b6adbba729dacbd385fcd3691cc75a6b89ece7f3ae0949e046402b029c9604c8fdb32f1d5d33b479f1993e0ba2766d9
 EBUILD geeqie-9999.ebuild 2946 BLAKE2B d9deaa6cfed97e34e0969e2aa4f64ff7881b342c4c095bae6a8ac1ef5f99f5120fdc4ee64c554a97c3715e402d6c5bc2c5e915531891c0f2b9b8a79f902694b0 SHA512 a5e6b76d4c3b2c024f2f98d87335e679553315b88b9d809fcfc5603157576b5abb6d3848c9feb0bf18107c126eaf9530540489ee1080a7d787ec428c0e944c52
 MISC metadata.xml 816 BLAKE2B ed50c576f068626d95d99899b17508b7c48567707ff020988dc611be9b482893f008f904ce460565ed0f263c76f2e274640f6e662f827d0879de5a59a93e8c3b SHA512 45458e31201d1baee61f48fe452c3577bcb74fea6569d1afdd8787aff6714d3400f501d1dc6b3de31ea1d5151326d48593f5bb219ec5cfed603cfe8835690dcd
diff --git a/media-gfx/geeqie/geeqie-2.2.ebuild b/media-gfx/geeqie/geeqie-2.2.ebuild
new file mode 100644
index 000000000000..c1bf5433b1fb
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-2.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit lua-single meson optfeature xdg
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"
+# Doc build:
+# clone git at matching tag
+# mkdir build; ./gen_changelog.sh . build;
+# pandoc README.md -o build/README.html
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
+
+RDEPEND="gnome-extra/zenity
+	virtual/libintl
+	x11-libs/gtk+:3
+	djvu? ( app-text/djvu )
+	exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	heif? ( >=media-libs/libheif-1.3.2 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpegxl? ( >=media-libs/libjxl-0.3.7:= )
+	lcms? ( media-libs/lcms:2 )
+	lua? ( ${LUA_DEPS} )
+	map? ( media-libs/clutter-gtk
+		media-libs/libchamplain:0.12[gtk] )
+	pdf? ( >=app-text/poppler-0.62[cairo] )
+	raw? ( >=media-libs/libraw-0.20:= )
+	spell? ( app-text/gspell )
+	tiff? ( media-libs/tiff:= )
+	webp? ( gui-libs/gdk-pixbuf-loader-webp:= )
+	zip? ( >=app-arch/libarchive-3.4.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	|| ( dev-util/xxdi app-editors/vim-core )
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+pkg_setup() {
+	# Do not require setting LUA_SINGLE_TARGET if lua is not used
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Disable doc build - not useful most of the time per upstream
+	sed -e "/subdir('doc')/d" -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgq_helpdir="share/doc/${PF}"
+		-Dgq_htmldir="share/doc/${PF}/html"
+		$(meson_use debug)
+		$(meson_feature djvu)
+		$(meson_feature exif exiv2)
+		$(meson_feature ffmpegthumbnailer videothumbnailer)
+		$(meson_feature heif)
+		$(meson_feature jpeg)
+		$(meson_feature jpeg2k j2k)
+		$(meson_feature jpegxl)
+		$(meson_feature lcms cms)
+		$(meson_feature lua)
+		$(meson_feature map gps-map)
+		$(meson_feature pdf)
+		$(meson_feature raw libraw)
+		$(meson_feature spell)
+		$(meson_feature tiff)
+		$(meson_feature zip archive)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Manually generated ChangeLog
+	dodoc "${WORKDIR}"/${P}-docs/*
+
+	# The application needs access to some uncompressed doc files.
+	docompress -x /usr/share/doc/${PF}/AUTHORS
+	docompress -x /usr/share/doc/${PF}/ChangeLog
+	docompress -x /usr/share/doc/${PF}/README.md
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2
+	optfeature "Lens ID plugin" media-libs/exiftool
+	optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick"
+	optfeature "Image rotate plugin (JPEG)" media-gfx/fbida
+	optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick
+	optfeature "Print preview functionality" app-text/evince
+}
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index d29853d924f4..5d6e0a03ba0b 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,11 +1,11 @@
 AUX mcomix-2.1.1-pillow_version.patch 697 BLAKE2B 4ddc0c824bedb8e53032a39d7fc770ec1e607532935db58ad9e53b98a6caa39bf250635e5dc5288ca262a12901b23dfaa2ffbfc19a02578c7c6042b37813916a SHA512 b76ec954f5d935c15a23abc547e38c0141fb644a066ae97c5b2738393d8cb4b2f58d321d998740032f8dae7e1e69e418725f031845c79c1d823dc95191403317
-DIST mcomix-2.1.0.tar.gz 517070 BLAKE2B 71aa67b48ac4cc09f12516312a07c1688e3d9ba086e0af8fab0f22549814fc82841b30965b7ac4e90192086338414c50d253af2d37b158fea8fc2358cee3d3db SHA512 385654c48192c20e285a053a8a90f1e792d58f7adbb0960745f31703d2ff5906f5e5bfd868ebaa08dd27314543a761a255503e5d586edd1baa064ffcea0205ca
 DIST mcomix-2.1.1.tar.gz 517628 BLAKE2B fb4d6cb4a10966795156672e8710e264f6e22abeebc3bd9471f378169417a6aab39c705d916624b9c1cd547516ae042d94cf00cf4596242f4655045c305bc630 SHA512 699fc1fe2348491ca5f94c9142e8a7432a3afc932aff42187ec57b5026d84ad189700283082fb60f920088747f13cc8f74297feaaab8ce2a5a9bd42d74b7f5e2
 DIST mcomix-2.2.1.tar.gz 531734 BLAKE2B 4dfff8f12b3e719dcb9c32535b8d53fe5443a743fb2a7287e2b00ebb7325124c04fca5fbc853462f7e55a5ca361ba6bebd9abe5f07bad67abd5278facd9e6303 SHA512 9f9e2f0f2b0b7d1c7f5d027e852bf081c63789676ed4dabd7bce3f442b51954f3950926086ba8d279a4c88fd8f8918690bdca07d4681671ac11e97e79a73829b
 DIST mcomix-3.0.0.tar.gz 666676 BLAKE2B 48c4566cc09c99e4cea76e487753c43fc36ed9e06c26dd1cbcf0e16b1ded4cf438cbcd2d423bdff393468a368d226a499b70967b9fc094d526bb4637c5d3b24b SHA512 e6661c72e132cef04a16b795b17262da706fd27c169d791a576be4fe812c2fc5e5c1f83fb6c4ed094eb9a305ba836524d0717fc6dfa77d8543493bda71d9d815
-EBUILD mcomix-2.1.0.ebuild 1109 BLAKE2B 0041670c4f8cdb3eac50f5526305aca2c0448a3aec7123626a2eb3ebebbd792da721642505a392a059a7db7cef40bb048b6b1086a713c9bab18644bad9a04549 SHA512 0793f5c761a31b43e36b22cae11567ebd6d35cb38de608b051dc88f5a808ca31812ab47c324bfcc901e9b64c2435e34609f401b76e86f19fd2b9f319dc407575
+DIST mcomix-3.1.0.tar.gz 668651 BLAKE2B 9e5ca2a1735aaf77f4e46b926c36655e9e5fe19c37ce7583e88a71cc13978ee51ae7793ddef03d74829449f0960dcf42044a1ad41f59d1945d25c58d99b792fa SHA512 1331b0db1501f2e5e9e4b6a5250b6aaa70d4c0ab1198e49761fb27bc6c9114d37abfb1807272721e8bf6f822500eb71c8b8ef8af28dd10d979abf36bd399ef5f
 EBUILD mcomix-2.1.1-r1.ebuild 1161 BLAKE2B 24e939efddd157a1241d4410a80bb23d2c2e2adf045c20c9c842cd23cbb8fb15efeec0a57186a40a83729d3e310796ccbb601a960ded646fcd5af0b7089fb234 SHA512 3b09bccedb0e1fc4851dee292a4406191ce5d5dc75c6f0c3c41dc92dce283b892db05be305806f9d001f547d5f5ec51393f7a2c6a155940f57e8429c2fecfb8d
 EBUILD mcomix-2.2.1.ebuild 1111 BLAKE2B 56f9ccb5606133dd38bd572586226fd2b4ddf13cc589dc5becc7a52c1a2e65f7a17abd9b7770481b04b177b5bfce26a0e20d0b3bcd7993ddc2af4646ed9dcbf0 SHA512 ee58a7aeb7273e7191e6a95818bfe6a030865c47e0b2183495e1cd5acb1bef09b24a290cee4a2b03e4a8b83be030bb085a7874fd57f710395fff97ba505e3e71
 EBUILD mcomix-3.0.0-r1.ebuild 1487 BLAKE2B d72ba5d6f15786a7e2a252d310ffcb2fd1a4e0626c4b51891181730df5fa18e1bec906fa8c02b64a0a70fe010566541cac4ed97d8207d4f2bd9421079e4b512c SHA512 ba0cace9afaea65f59f9ef763ebd9160192a9d75e926c37dbc4517b589dd0cfe82f4014191be74d3ef4b3a65dedc8aa70e2c36b013b02ab06b7a5ce0cc73848b
+EBUILD mcomix-3.1.0.ebuild 1479 BLAKE2B d66b1f12051ce8a6e6447ea9781c86a411c5b83e6d57c8247f8e4bbf535410e3ca38d953edb5e70964d091c18269b3e0b7fde043a46f02b6bb928d3777c271e6 SHA512 6c89112fbd0a7895cd52712f22266b99363717758b01c0467b63a789b412e68b9723553905e7ef5e75f8d66ed59c3e8c2ef7390c060f2a4395b9059f6d6f7b8b
 EBUILD mcomix-9999.ebuild 1472 BLAKE2B 69ea2b35ff95b1fd3bbce595653de8bec083f25c15da976e50729434c2f30af25ebeb83655f87f7ef5707b501fa363f450f2bd864752b1ffbe621a20febb666f SHA512 84491e2172f193591b1a7650a49b4ffa9814aabfd976b28934af967ca9bf12b2c40bc177869e967b821570de0a05929648aa3269ffd6e81a8cc6245199f1d673
 MISC metadata.xml 339 BLAKE2B 16c122a9f4454ff61d2b777e14de1bf321ba4d98aadd3284f88a13419bac2cdb227bd1001ef6960aaaa183b3e2f86f2d7b5a555aa9a17a6ad1f9e46db2657609 SHA512 a66ff965443f30fe9c647a760359ee71b4ed9cbe5ff684979fb547823bf1ae5ffbf8cd4128afdfef13d07c03e953ed5495b9e80526ec01a0e53b66b1b0f2e6dc
diff --git a/media-gfx/mcomix/mcomix-2.1.0.ebuild b/media-gfx/mcomix/mcomix-3.1.0.ebuild
index aaff865a0be2..d6fa2ffcfe75 100644
--- a/media-gfx/mcomix/mcomix-2.1.0.ebuild
+++ b/media-gfx/mcomix/mcomix-3.1.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 optfeature xdg
+PYTHON_COMPAT=( python3_{9..12} )
+inherit desktop distutils-r1 optfeature xdg
 
 DESCRIPTION="GTK image viewer for comic book archives"
 HOMEPAGE="https://mcomix.sourceforge.net"
@@ -13,8 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
@@ -31,8 +30,23 @@ src_prepare() {
 	default
 
 	# Uncompress man page
-	gunzip mcomix.1.gz || die
-	sed -e "s/mcomix.1.gz/mcomix.1/" -i setup.py || die
+	gunzip share/man/man1/mcomix.1.gz || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Application meta files are not installed automatically anymore
+	domenu share/applications/*.desktop
+	local x
+	for x in 16 22 24 32 48 256 scalable; do
+		doicon -s ${x} share/icons/hicolor/${x}*/*
+	done
+	doman share/man/man1/mcomix.1
+	insinto /usr/share/metainfo
+	doins share/metainfo/*.xml
+	insinto /usr/share/mime/packages
+	doins share/mime/packages/*.xml
 }
 
 pkg_postinst() {