commit: 7dbebf592df2cfac7e1e4ec51108a48074db132e
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 11:57:09 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 11:57:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dbebf59
media-gfx/geeqie: drop 2.0.1-r4, 2.1
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
media-gfx/geeqie/Manifest | 2 -
.../geeqie/files/geeqie-2.0.1-allow_xxdi.patch | 17 ---
.../geeqie/files/geeqie-2.0.1-doc_option.patch | 81 ---------------
media-gfx/geeqie/geeqie-2.0.1-r4.ebuild | 115 ---------------------
media-gfx/geeqie/geeqie-2.1.ebuild | 110 --------------------
5 files changed, 325 deletions(-)
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 633043002b47..2b1c26d88543 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,4 +1,2 @@
-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
DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B
2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339
SHA512
f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d
DIST geeqie-2.1.tar.xz 1800612 BLAKE2B
60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc
SHA512
1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f
diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
deleted file mode 100644
index bf6a7d77975f..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh
geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh
---- geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh 2022-08-12
11:32:26.000000000 +0200
-+++ geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh 2022-10-17
23:04:08.203219782 +0200
-@@ -12,9 +12,12 @@
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
-
-+# Allow standalone replacement for xxd
-+command -v xxdi.pl >/dev/null 2>&1 && XXD="xxdi.pl" || XXD="xxd -i"
-+
- # To generate the required code, xxd has to run in the same folder as the
source
- build_dir="$PWD"
-
- cd "$(dirname "$1")" || return 1
-
--xxd -i "$(basename "$1")" "$build_dir/$2"
-+${XXD} "$(basename "$1")" > "$build_dir/$2"
diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch
b/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch
deleted file mode 100644
index e12ab036b4c9..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Naur geeqie-2.0.1.orig/doc/meson.build geeqie-2.0.1/doc/meson.build
---- geeqie-2.0.1.orig/doc/meson.build 2022-08-12 11:32:25.000000000 +0200
-+++ geeqie-2.0.1/doc/meson.build 2022-10-18 16:26:33.776338232 +0200
-@@ -20,21 +20,16 @@
- guideindex_ln = join_paths(destdir, 'index.html')
-
- # Not-found notification already handled by ../meson.build
--if gnome_doc_tool.found()
-+if not get_option('doc').disabled() and gnome_doc_tool.found()
- run_command(gnome_doc_tool, 'html', '-o', destdir, '-p', iconsdir,
guideindex_xml, check : false)
- run_command(find_program('ln'), '-s', '-f', guideindex_html,
guideindex_ln, check : false)
- endif
-
- install_subdir(destdir, install_dir : helpdir, exclude_directories :
'lua-api/latex')
-
--doxygen = find_program('doxygen', required : false)
--if doxygen.found()
-+if not get_option('doc').disabled() and doxygen.found()
- srcdir = join_paths(meson.source_root())
- destdir = join_paths(meson.build_root(), 'doc', 'html', 'lua-api')
-
- run_command(find_program('create-doxygen-lua-api.sh'), srcdir, destdir,
check : false)
--
-- summary({'lua-api' : ['lua-api help file created:', true]}, section :
'Documentation', bool_yn : true)
--else
-- summary({'lua-api' : ['doxygen not found - lua-api help file created:',
false]}, section : 'Documentation', bool_yn : true)
- endif
-diff -Naur geeqie-2.0.1.orig/meson.build geeqie-2.0.1/meson.build
---- geeqie-2.0.1.orig/meson.build 2022-08-12 11:32:25.000000000 +0200
-+++ geeqie-2.0.1/meson.build 2022-10-18 16:25:38.063273607 +0200
-@@ -62,12 +62,6 @@
- # External programs
- gdk_pixbuf_csource = find_program('gdk-pixbuf-csource', required : true)
- glib_genmarshal = find_program('glib-genmarshal', required : true)
--gnome_doc_tool = find_program('yelp-build', required : false)
--if gnome_doc_tool.found()
-- summary({'help' : ['Help files created:', true]}, section :
'Documentation', bool_yn : true)
--else
-- summary({'help' : ['yelp-build not found - Help files created:', false]},
section : 'Documentation', bool_yn : true)
--endif
-
- debug = get_option('debug')
-
-@@ -138,6 +132,26 @@
- gtk_dep = dependency('gtk+-3.0', version : '>=3.22', required: true)
- glib_dep = dependency('glib-2.0', version : '>=2.52', required: true)
-
-+#option = get_option('doc')
-+if not get_option('doc').disabled()
-+ gnome_doc_tool = find_program('yelp-build', required : false)
-+ if gnome_doc_tool.found()
-+ summary({'help' : ['Help files created:', true]}, section :
'Documentation', bool_yn : true)
-+ else
-+ summary({'help' : ['yelp-build not found - Help files created:',
false]}, section : 'Documentation', bool_yn : true)
-+ endif
-+
-+ doxygen = find_program('doxygen', required : false)
-+ if doxygen.found()
-+ summary({'lua-api' : ['lua-api help file created:', true]}, section :
'Documentation', bool_yn : true)
-+ else
-+ summary({'lua-api' : ['doxygen not found - lua-api help file
created:', false]}, section : 'Documentation', bool_yn : true)
-+ endif
-+else
-+ summary({'help' : ['disabled - Help files created:', false]}, section :
'Documentation', bool_yn : true)
-+ summary({'lua-api' : ['disabled - lua-api help file created:', false]},
section : 'Documentation', bool_yn : true)
-+endif
-+
- libarchive_dep = []
- req_version = '>=3.4.0'
- option = get_option('archive')
-diff -Naur geeqie-2.0.1.orig/meson_options.txt geeqie-2.0.1/meson_options.txt
---- geeqie-2.0.1.orig/meson_options.txt 2022-08-12 11:32:25.000000000
+0200
-+++ geeqie-2.0.1/meson_options.txt 2022-10-18 16:25:38.063273607 +0200
-@@ -26,6 +26,7 @@
- option('archive', type : 'feature', value : 'auto', description : 'archive
files e.g. zip, gz')
- option('cms', type : 'feature', value : 'auto', description : 'color
management system')
- option('djvu', type : 'feature', value : 'auto', description : 'djvu')
-+option('doc', type : 'feature', value : 'auto', description : 'doc')
- option('exiv2', type : 'feature', value : 'auto', description : 'exiv2')
- option('videothumbnailer', type : 'feature', value : 'auto', description :
'video thumbnailer')
- option('gps-map', type : 'feature', value : 'auto', description : 'gps map')
diff --git a/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild
b/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild
deleted file mode 100644
index ed4f98a13ba5..000000000000
--- a/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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}-ChangeLog.tar.gz";
-
-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? ( >=media-libs/libwebp-0.6.1:= )
- 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} )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-allow_xxdi.patch
- "${FILESDIR}"/${P}-doc_option.patch
-)
-
-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 webp)
- $(meson_feature zip archive)
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # Manually generated ChangeLog
- dodoc "${WORKDIR}"/${P}-ChangeLog/*
-
- # 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/geeqie/geeqie-2.1.ebuild
b/media-gfx/geeqie/geeqie-2.1.ebuild
deleted file mode 100644
index 51a0ef4fdf25..000000000000
--- a/media-gfx/geeqie/geeqie-2.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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 ~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} )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-lua_hpp.patch
-)
-
-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
-}
