From 40a480a83a10d1718e26a6f4fc54d271c1f13a95 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 20 Oct 2022 14:00:29 +0100 Subject: gentoo auto-resync : 20:10:2022 - 14:00:29 --- media-gfx/geeqie/Manifest | 14 +--- .../geeqie/files/geeqie-1.5.1-no_common.patch | 75 ----------------- media-gfx/geeqie/files/geeqie-1.6-yelp.patch | 25 ------ media-gfx/geeqie/geeqie-1.5.1-r1.ebuild | 96 --------------------- media-gfx/geeqie/geeqie-1.6-r1.ebuild | 91 -------------------- media-gfx/geeqie/geeqie-1.6_p20211016.ebuild | 97 ---------------------- media-gfx/geeqie/geeqie-1.7.2.ebuild | 95 --------------------- media-gfx/geeqie/geeqie-1.7.3.ebuild | 2 +- media-gfx/geeqie/metadata.xml | 1 - 9 files changed, 3 insertions(+), 493 deletions(-) delete mode 100644 media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch delete mode 100644 media-gfx/geeqie/files/geeqie-1.6-yelp.patch delete mode 100644 media-gfx/geeqie/geeqie-1.5.1-r1.ebuild delete mode 100644 media-gfx/geeqie/geeqie-1.6-r1.ebuild delete mode 100644 media-gfx/geeqie/geeqie-1.6_p20211016.ebuild delete mode 100644 media-gfx/geeqie/geeqie-1.7.2.ebuild (limited to 'media-gfx/geeqie') diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 4b16f41cab34..0e5045fb6652 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,19 +1,9 @@ -AUX geeqie-1.5.1-no_common.patch 2168 BLAKE2B 3949807b4bdd99a9283ca1ff1108fbfcc6cc034d56339875bf1d65513461ccd2da447c4923e5c1c0c14af8f204503c8b2fa72bce4faa4e270a8309cae2fd75e1 SHA512 3198780bc3840691cf2239fdf8d963bb9ead90b38fdf32d4276bd55c70fbb69d0e88f55ed901990c50907dde5b242e0f1af96ca6733ccb767b9e5e2d82ffeda9 -AUX geeqie-1.6-yelp.patch 1044 BLAKE2B be5523c05bf0bc9a416b843a3fea8f5722272e138540ac7e1f4cdbafcf585c1357d07877c14a3dea2209f0206114b45aa4c45410e471bf5604df1be4b8553570 SHA512 fd5d11655ff788d7fb138db8f9cdce3dc9111888e0c2e37b31f9e07c956ab21f9952fd31deccb514a258426382c8c0a0de716e4cde254f4f0f4349793c119445 AUX geeqie-2.0.1-allow_xxdi.patch 774 BLAKE2B 4bba0667ea4030bba821787d22725e0db177ab5034a77124c85467f4c4b34b3148f4b3001f9466ee472425958d6d97fd868539a7c7d04740872255aad6ed6543 SHA512 83788dc0e4e99e9a2ad6e4da20c9c8d61e8bea9678d86b40c82cfc9d925abde2bfbdc5cfa0fbf421056b3625049fdf037dcc18402049dfba8c1c4443106464d8 AUX geeqie-2.0.1-doc_option.patch 4141 BLAKE2B 59ea49f13d8bd666a01c0905ae95845eb1ecc6acbe71b7ef8553902c0ffca172984ca7dabe39e840d0ca779e13418a8a8043cacc0e3992d691a363f547fa0d58 SHA512 4edb088606d5a4b6f1d83390b40c47c8d2e06a2da2a2ea21dd9049961c63253a9aaa32d0270ef3969b0a273f5f9d2114a740328d9d4d7bbf73b766ecd2aaa8a8 -DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac -DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef -DIST geeqie-1.6_p20211016.tar.xz 36433388 BLAKE2B e8932398ce7354c08ad4199834870e2844555ee1a8ae2beebd9a512100784a5cb62e00993b3ef1854a7ab1bd37eb0742ebcfc17605429f99b61e1af2fbaf859e SHA512 9e536beac39028fdcbe04d014460de2b02039b2c027f9603a71554339b2d14116f8dff11bb09c6e73d51550188daf40031535f978fbbc2d355d30593f4f29e9d -DIST geeqie-1.7.2.tar.xz 1949240 BLAKE2B 4dde2c902151da677470dca359b321978afe861cafddb7baf76e68acc8a9cf7943ce8ebd8e46aa007a773cce62444d16908d1b8b1339de58587c98d911775ec7 SHA512 07b06ef51cb520b91b9097bbe06d170af39d3d513d9853c912e1b60bd5b47e0ae3571f6ac449c9f9c6cee4d227fc4c906ee5f90f7498cd0b2119d12ff4673c4d 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.5.1-r1.ebuild 2280 BLAKE2B 9653c0f0ac69e5a18812a86534e5ff6025e754545f2d53e3f06e538f59a600c98b27fff34f425e1d342a3c0ac8ef229f58ef8da99b9cd4c5f1f54e91246eead9 SHA512 26a4d709e1c8c6f3a6db159d4e912def9ce7ed7cb7a7d1a261d2428b46440aad882d450b1f8d54f513fd02a1f637bd0328403c9c143281b889dc3f34dfca7a31 -EBUILD geeqie-1.6-r1.ebuild 2087 BLAKE2B b72278d1f36cbaed2cd0eccf1f2d8c8126ffd798c476b7432e7695221f1524f14b07d0ff98fbe281bb911cb94f80a5c8142bf2f8ad667e3aa3192bdeca8950de SHA512 d8280d69c8638a192c2875f10e807e0286d09f8820dfc91a47b62f495a508770a394bd33dd1fdfc077a6f4581d8069a7bc33edae239ad754d6f6427253d7fa19 -EBUILD geeqie-1.6_p20211016.ebuild 2412 BLAKE2B ec74ea03a4f7d9431b2fa1fa8eb474ac4c8a1e8a46b1887d7f7a67bc4af1b389c4581299aff6a301e490958412bf91561294bc8dd015220b7ad6e5e470d7e213 SHA512 23a6a0c2d60d4498b99195a87e158683a312276c1d0b29d0dbd3ca334eb0ac96e19e3985a9be1c88fce9d528ca0a74c41a739dd90bde3d3b04728321d5f94fa4 -EBUILD geeqie-1.7.2.ebuild 2324 BLAKE2B 973682fbaacbf054ad6033b45e4ec4f79f2e0ccfa2a4e7e88dd73f2dc61adaba8f0010c6190f3ea9bc16b3939974216bf19b0127c59810dc41a5d05dd6a4e3c8 SHA512 f136a470d8ffa269f47af621cf13c5f9c2a87b0dc3a0a75fb1a325ad94ccf0a7cd6d1cc789241210e18e9ab8ffc326f9c1d6d66539f86592922cc02ad0938d5a -EBUILD geeqie-1.7.3.ebuild 2324 BLAKE2B 973682fbaacbf054ad6033b45e4ec4f79f2e0ccfa2a4e7e88dd73f2dc61adaba8f0010c6190f3ea9bc16b3939974216bf19b0127c59810dc41a5d05dd6a4e3c8 SHA512 f136a470d8ffa269f47af621cf13c5f9c2a87b0dc3a0a75fb1a325ad94ccf0a7cd6d1cc789241210e18e9ab8ffc326f9c1d6d66539f86592922cc02ad0938d5a +EBUILD geeqie-1.7.3.ebuild 2322 BLAKE2B 57e6a0b443abe37232d6d241a017da5d2f3f33173bfd3e801ebac526bcfca240415fcf99d38fac0aabec01678a693cef716c94fb15a011c7734e4c956bd7a5ca SHA512 a11a4e45a52482e189fcca579c45bb9be07e1a8b56ca5f68430472b186ccfb2b3d80670b9ab70294832de8c90f7125b9849d1ba6ae0dbb98754d289c2588383c EBUILD geeqie-2.0.1-r1.ebuild 3206 BLAKE2B 6c3f999812883d72561c7a3404fb56ec9e26831293661629df71dc60093d76f82214436724d6f6d7e96e7f54606519f2b86202dc5641e436d2bb6c0363e8d5ee SHA512 8adbe3711c9dc40e039757a03c259da700bf9306399da8ff5d4fe505f465b1aad7ceb415a8b10aeb21b6a448b544069216f29e6481cf3a093fad041ccf1d7eec EBUILD geeqie-9999.ebuild 3034 BLAKE2B 0c3f49fa2ec5d21210f405c9892620702e99846b92262c93c5371630c241337fad3a2d89048f69ddd188c3374e29b9030124b6e9ac31d77c4d0167901abc5ea2 SHA512 c4284b1db9733672337618fcc471ebbadca43ff54cfea121111be24f8d4a2ef42829b71beea3b9744ed18b09c09462160124163415b17f600791d7e71b937e65 -MISC metadata.xml 1109 BLAKE2B bf1ec34f87dbc856e9f69d87d6903034689bdfa3d19e50a8f1dbbf23f08e101e49068454f296aab15579b45f77785beff26453393bd3b88682f7e6cc3f5bfdc5 SHA512 7f755e0c4e2085bb543990d1b395a6cf072663a13437aa843145d89e0224ed3d4b51cc16f2f7d8daed10879712c00d5965d70daa52ef69def4f3fcd0d5b8546b +MISC metadata.xml 1004 BLAKE2B 8f631bfdc45713df491faf9f78479c2c675c815547e52e848e55d6b87aad94ddb656d1ec9a3159b2bf22b039f5c25840e9a86da78de80bee97478e0c07c3fd4e SHA512 b721895c5afc72f4e09fd7ce512113495364fffdf0aa8e01e92cf0a4f441e72683e7319023baca99f575b2514d815810b7e04eab12482f20798235246c2a06bd diff --git a/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch b/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch deleted file mode 100644 index 058e22686250..000000000000 --- a/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 543ea6d903a50c353d9e129d380240f277a670aa Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Thu, 23 Jan 2020 08:24:52 +0000 -Subject: [PATCH] src/options: fix build failure against gcc-10 - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` - CXXLD geeqie -ld: ui_fileops.o:(.bss+0x0): - multiple definition of `options'; ui_bookmark.o:(.bss+0x0): first defined here -ld: ui_fileops.o:(.bss+0x8): - multiple definition of `command_line'; ui_bookmark.o:(.bss+0x8): first defined here -``` - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Reported-by: Anthony Parsons -Bug: https://bugs.gentoo.org/706132 -Signed-off-by: Sergei Trofimovich ---- - src/bar_exif.h | 3 --- - src/options.c | 3 +++ - src/options.h | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/bar_exif.h b/src/bar_exif.h -index 63c30d4b..1395e842 100644 ---- a/src/bar_exif.h -+++ b/src/bar_exif.h -@@ -28,9 +28,6 @@ void bar_pane_exif_update_from_config(GtkWidget *pane, const gchar **attribute_n - void bar_pane_exif_entry_add_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values); - - /* these are exposed for when duplication of the exif bar's text is needed */ -- --const gchar **bar_exif_key_list; --const gint bar_exif_key_count; - GList *bar_pane_exif_list(); - - #endif -diff --git a/src/options.c b/src/options.c -index 99459381..bab26acb 100644 ---- a/src/options.c -+++ b/src/options.c -@@ -32,6 +32,9 @@ - #include "ui_fileops.h" - #include "window.h" - -+ConfOptions *options; -+CommandLine *command_line; -+ - ConfOptions *init_options(ConfOptions *options) - { - gint i; -diff --git a/src/options.h b/src/options.h -index fcfe961a..02ff8fac 100644 ---- a/src/options.h -+++ b/src/options.h -@@ -329,8 +329,8 @@ struct _ConfOptions - GList *disabled_plugins; - }; - --ConfOptions *options; --CommandLine *command_line; -+extern ConfOptions *options; -+extern CommandLine *command_line; - - ConfOptions *init_options(ConfOptions *options); - void setup_default_options(ConfOptions *options); --- -2.25.0 - diff --git a/media-gfx/geeqie/files/geeqie-1.6-yelp.patch b/media-gfx/geeqie/files/geeqie-1.6-yelp.patch deleted file mode 100644 index e1d7797d1d50..000000000000 --- a/media-gfx/geeqie/files/geeqie-1.6-yelp.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a33d8c40e9e56597f68e83be3336036992996738 Mon Sep 17 00:00:00 2001 -From: Matthew Miller -Date: Thu, 8 Apr 2021 20:21:39 -0400 -Subject: [PATCH] Fix doc building with newer yelp - -This adds `-i`, because otherwise it will complain about missing files (which -we copy into place later), and adds a trailing slash to the output directory, -because `yelp-build` now puts the files into the wrong place otherwise. ---- - doc/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 3d044bd8..78b96233 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -7,7 +7,7 @@ EXTRA_DIST = docbook2html.sh docbook icons - html/GuideIndex.html: docbook/GuideIndex.xml - rm -rf html; mkdir html; cp $(srcdir)/icons/* html/ - if [ -x "$(GNOME_DOC_TOOL)" ]; then \ -- "$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \ -+ "$(GNOME_DOC_TOOL)" html -i -o html/ $(srcdir)/docbook/GuideIndex.xml ; \ - else \ - echo "yelp-tools not found, html is not built" ; \ - fi diff --git a/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild b/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild deleted file mode 100644 index ad5ba6872166..000000000000 --- a/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -LUA_COMPAT=( lua5-{1..3} ) - -inherit autotools lua-single xdg - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org" -SRC_URI="http://www.geeqie.org/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp" - -RDEPEND=" - virtual/libintl - doc? ( app-text/gnome-doc-utils ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - gpu-accel? ( media-libs/clutter-gtk ) - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - lirc? ( app-misc/lirc ) - lua? ( ${LUA_DEPS} ) - map? ( media-libs/libchamplain:0.12 ) - pdf? ( >=app-text/poppler-0.62[cairo] ) - tiff? ( media-libs/tiff:0 ) - xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - gpu-accel? ( gtk3 ) - map? ( gpu-accel )" - -PATCHES=( "${FILESDIR}"/${P}-no_common.patch ) - -src_prepare() { - default - - # Remove -Werror (gcc changes may add new warnings) - sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable debug debug-log) - $(use_enable ffmpegthumbnailer) - $(use_enable gpu-accel) - $(use_enable gtk3) - $(use_enable jpeg) - $(use_enable lcms) - $(use_enable lua) - $(use_enable lirc) - $(use_enable map) - $(use_enable nls) - $(use_enable pdf) - $(use_enable tiff) - ) - - if use exif || use xmp; then - myeconfargs+=( --enable-exiv2 ) - else - myeconfargs+=( --disable-exiv2) - fi - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - rm -f "${D}/usr/share/doc/${PF}/COPYING" - # Application needs access to the uncompressed file - docompress -x /usr/share/doc/${PF}/README.md -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "Some plugins may require additional packages" - elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" - elog "- RAW images plugin: media-gfx/ufraw" -} diff --git a/media-gfx/geeqie/geeqie-1.6-r1.ebuild b/media-gfx/geeqie/geeqie-1.6-r1.ebuild deleted file mode 100644 index 39c6dc86cac5..000000000000 --- a/media-gfx/geeqie/geeqie-1.6-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -LUA_COMPAT=( lua5-{1..3} ) - -inherit autotools lua-single xdg - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org" -SRC_URI="http://www.geeqie.org/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="debug doc exif ffmpegthumbnailer jpeg lcms lirc lua nls pdf tiff xmp" - -RDEPEND=" - virtual/libintl - x11-libs/gtk+:2 - doc? ( app-text/gnome-doc-utils ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - lirc? ( app-misc/lirc ) - lua? ( ${LUA_DEPS} ) - pdf? ( >=app-text/poppler-0.62[cairo] ) - tiff? ( media-libs/tiff:0 ) - xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -PATCHES=( "${FILESDIR}"/${P}-yelp.patch ) - -src_prepare() { - default - - # Remove -Werror (gcc changes may add new warnings) - sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable debug debug-log) - $(use_enable ffmpegthumbnailer) - --disable-gpu-accel - --disable-gtk3 - $(use_enable jpeg) - $(use_enable lcms) - $(use_enable lua) - $(use_enable lirc) - --disable-map - $(use_enable nls) - $(use_enable pdf) - $(use_enable tiff) - ) - - if use exif || use xmp; then - myeconfargs+=( --enable-exiv2 ) - else - myeconfargs+=( --disable-exiv2) - fi - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - rm -f "${D}/usr/share/doc/${PF}/COPYING" - # Application needs access to the uncompressed file - docompress -x /usr/share/doc/${PF}/README.md -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "Some plugins may require additional packages" - elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" - elog "- RAW images plugin: media-gfx/ufraw" -} diff --git a/media-gfx/geeqie/geeqie-1.6_p20211016.ebuild b/media-gfx/geeqie/geeqie-1.6_p20211016.ebuild deleted file mode 100644 index 116b8a480772..000000000000 --- a/media-gfx/geeqie/geeqie-1.6_p20211016.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -LUA_COMPAT=( lua5-{1..3} ) - -inherit autotools lua-single xdg - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org" -MY_PV="0edb0f1265b193ec08ffbde7a1a7871526d29d92" -# Needs full git checkout to generate ChangeLog, this tarball has it -SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.xz" - -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" - -RDEPEND=" - virtual/libintl - x11-libs/gtk+:3 - doc? ( app-text/gnome-doc-utils ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - gpu-accel? ( media-libs/clutter-gtk ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - lirc? ( app-misc/lirc ) - lua? ( ${LUA_DEPS} ) - map? ( media-libs/libchamplain:0.12 ) - pdf? ( >=app-text/poppler-0.62[cairo] ) - tiff? ( media-libs/tiff:0 ) - xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - map? ( gpu-accel )" - -src_prepare() { - default - - # Remove -Werror (gcc changes may add new warnings) - sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die - - # Remove force rebuild of Lua API ref - sed -e 's#./create-doxygen-lua-api.sh##' -i doc/Makefile.am || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} - --enable-gtk3 - $(use_enable debug debug-log) - $(use_enable ffmpegthumbnailer) - $(use_enable gpu-accel) - $(use_enable jpeg) - $(use_enable lcms) - $(use_enable lua) - $(use_enable lirc) - $(use_enable map) - $(use_enable nls) - $(use_enable pdf) - $(use_enable tiff) - ) - - if use exif || use xmp; then - myeconfargs+=( --enable-exiv2 ) - else - myeconfargs+=( --disable-exiv2) - fi - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - rm -f "${D}/usr/share/doc/${PF}/COPYING" - # Application needs access to the uncompressed file - docompress -x /usr/share/doc/${PF}/README.md -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "Some plugins may require additional packages" - elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" - elog "- RAW images plugin: media-gfx/ufraw" -} diff --git a/media-gfx/geeqie/geeqie-1.7.2.ebuild b/media-gfx/geeqie/geeqie-1.7.2.ebuild deleted file mode 100644 index 60becabb68fa..000000000000 --- a/media-gfx/geeqie/geeqie-1.7.2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -LUA_COMPAT=( lua5-{1..3} ) - -inherit autotools lua-single 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" - -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" - -RDEPEND=" - virtual/libintl - x11-libs/gtk+:3 - doc? ( app-text/gnome-doc-utils ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - gpu-accel? ( media-libs/clutter-gtk ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - lirc? ( app-misc/lirc ) - lua? ( ${LUA_DEPS} ) - map? ( media-libs/libchamplain:0.12 ) - pdf? ( >=app-text/poppler-0.62[cairo] ) - tiff? ( media-libs/tiff:0 ) - xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - map? ( gpu-accel )" - -src_prepare() { - default - - # Remove -Werror (gcc changes may add new warnings) - sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die - - # Remove force rebuild of Lua API ref - sed -e 's#./create-doxygen-lua-api.sh##' -i doc/Makefile.am || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} - --enable-gtk3 - $(use_enable debug debug-log) - $(use_enable ffmpegthumbnailer) - $(use_enable gpu-accel) - $(use_enable jpeg) - $(use_enable lcms) - $(use_enable lua) - $(use_enable lirc) - $(use_enable map) - $(use_enable nls) - $(use_enable pdf) - $(use_enable tiff) - ) - - if use exif || use xmp; then - myeconfargs+=( --enable-exiv2 ) - else - myeconfargs+=( --disable-exiv2) - fi - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - rm -f "${D}/usr/share/doc/${PF}/COPYING" || die - # Application needs access to the uncompressed file - docompress -x /usr/share/doc/${PF}/README.md -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "Some plugins may require additional packages" - elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" - elog "- RAW images plugin: media-gfx/ufraw" -} diff --git a/media-gfx/geeqie/geeqie-1.7.3.ebuild b/media-gfx/geeqie/geeqie-1.7.3.ebuild index 60becabb68fa..fe7f727326ff 100644 --- a/media-gfx/geeqie/geeqie-1.7.3.ebuild +++ b/media-gfx/geeqie/geeqie-1.7.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp" RDEPEND=" diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml index 3ee5d0faec97..459105e7b023 100644 --- a/media-gfx/geeqie/metadata.xml +++ b/media-gfx/geeqie/metadata.xml @@ -9,7 +9,6 @@ Enable video thumbnail support with media-video/ffmpegthumbnailer Enable GPU acceleration support - experimental - Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2 Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using media-libs/libheif Enable support for JPEG XL image format Enable items GPS map display -- cgit v1.2.3