gentoo auto-resync : 27:06:2023 - 13:35:02

4 files changed, 119 insertions, 5 deletions

diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index ec206a2fb44d..511f9ad4ca1b 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -3,7 +3,10 @@ AUX geeqie-2.0.1-doc_option.patch 4141 BLAKE2B 59ea49f13d8bd666a01c0905ae95845eb
 DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9 SHA512 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9
 DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9 SHA512 a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288
 DIST geeqie-2.0.1.tar.xz 1666600 BLAKE2B e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958 SHA512 cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5
-EBUILD geeqie-1.7.3-r1.ebuild 2289 BLAKE2B 23866b8308713d9367014828564591070f1d0fc82fa4b92c45d70b19fe9a1be6946336bd453f06bbb0b8a5f9659c31b2049d56ef7d9b57318615a5145ca20307 SHA512 8a07e8657041421954a23276db5b0d0f8c57cbd78ab7735c2748178875d16e38f609cb322595916f43a8b125b37c1da89b0d1b06cc4c16c3daa360f44590846a
-EBUILD geeqie-2.0.1-r4.ebuild 3221 BLAKE2B 49a3be6a511e8e973f1e8a03f8a1ad1835a4fa475cd81e3c9a3824c480b949ef18a9cf83df83cc4c6881570a77d7223c7c5387343aaa313186ffad9accbd313d SHA512 5802f24b9bccbf90b11fcf3f1dc34a2169c1e02b50e830ab354fdbcd2465772f9ff4f20d7101b8c104f4de04dc773b7dbd9dbc6d37695f030a22d947d3eb8652
+DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d
+DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f
+EBUILD geeqie-1.7.3-r1.ebuild 2360 BLAKE2B 7df2eb50e6ccc116893305927b308a28825f4a3fc931e1067f6c4d2d79e0a2b89206df35cdf808cf5ec55e052fa7d574b242fea3a926d0b3654bb4665e01ea26 SHA512 4a9c6f461480e8a758cc9d6614548ad0ff5410165b4b1b9c4c6fd1f0d42eb7f300468bc4a50a1b8a8285a6e23743677dc825c868bed9367052b6c1a7c2d75af7
+EBUILD geeqie-2.0.1-r4.ebuild 3223 BLAKE2B a7c6cec69992bece30e632b729262f667dd87be5c9d95492e7664fee04e2adb1395d021355da1acb9b73a95d8a0ac6892d3d3577a4444da6db9846ea48b28097 SHA512 5725d02c3ff3056dc89b4abdba32b3ee1dba45eaeac4c2c3b7bfb4635cb27d76303a4b49be8aa0b6e4996ae0aae0c90b09f296cf507cd0bf30fb59831f61e17e
+EBUILD geeqie-2.1.ebuild 3108 BLAKE2B 11d77386cc58a97c5903605c934661724048b7401dd9fdf74963b38b1612279585588f6438565e23aec4a94e48ebd88afecd8ffe131fe778f8eec0a40ecab24c SHA512 fe876aa92d4d66bd73c1acb6a4c23f262a9165f1b3b545d8246746100c4d74f237888df55d0f60e5f77027012bf61df2f4ad2e95cc87aff62e9f7ec2b22384ee
 EBUILD geeqie-9999.ebuild 3149 BLAKE2B 0c2f3e3b42223096a96297ef0fc17c3eef27db82d85c5f4624025c5bf3b3e3df6647b56ee514ee18fe765370c3444332f0ae174d129466743d59ce55b234b442 SHA512 fb84879ef022ee8df2cbd3491751f6a210725534fca83f6f120b3972fe9a0932b9f6a2d4e920b3f5bb7782bbab39b8865960f00b295910815b2878eed68bf1e0
 MISC metadata.xml 964 BLAKE2B 68899bc0e99e06b4121753cbe15beea5a5edecff0673b1265dd09e43f06fcf76f9769949d2d08470711eafa4fc65a07a926a66465cab47aa0aa0393cab7969d4 SHA512 83ede5f6bb9ad78cddf27cb98f2985d18e46112118a823f728f29f76a1804f62bdc4252faea39adfd3a64d8959e0a9be75c7349eee5e0be4e306a8ef21597e0b
diff --git a/media-gfx/geeqie/geeqie-1.7.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.7.3-r1.ebuild
index 497e93cb39b3..b4a9dedac418 100644
--- a/media-gfx/geeqie/geeqie-1.7.3-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp"
+IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg jpegxl lcms lirc lua map nls pdf tiff xmp"
 
 RDEPEND="
 	virtual/libintl
@@ -22,6 +22,7 @@ RDEPEND="
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
 	gpu-accel? ( media-libs/clutter-gtk )
 	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpegxl? ( >=media-libs/libjxl-0.3.7:= )
 	lcms? ( media-libs/lcms:2 )
 	lirc? ( app-misc/lirc )
 	lua? ( ${LUA_DEPS} )
@@ -60,6 +61,7 @@ src_configure() {
 		$(use_enable ffmpegthumbnailer)
 		$(use_enable gpu-accel)
 		$(use_enable jpeg)
+		$(use_enable jpegxl)
 		$(use_enable lcms)
 		$(use_enable lua)
 		$(use_enable lirc)
diff --git a/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild
index ec2256cdf1a9..d6b786d4c4c9 100644
--- a/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild
+++ b/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild
@@ -25,7 +25,7 @@ RDEPEND="gnome-extra/zenity
 	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 )
+	jpegxl? ( >=media-libs/libjxl-0.3.7:= )
 	lcms? ( media-libs/lcms:2 )
 	lua? ( ${LUA_DEPS} )
 	map? ( media-libs/clutter-gtk
diff --git a/media-gfx/geeqie/geeqie-2.1.ebuild b/media-gfx/geeqie/geeqie-2.1.ebuild
new file mode 100644
index 000000000000..9553979fc1d4
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-2.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2023 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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
+
+	# Lua version
+	sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -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
+}