From bbb11689ce25f0c290c50905a0b5c40f82838bef Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Tue, 10 Dec 2019 22:23:49 +0100 Subject: media-gfx/geeqie: drop old Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli --- media-gfx/geeqie/Manifest | 2 - media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch | 80 ------------------ media-gfx/geeqie/geeqie-1.4-r1.ebuild | 97 ---------------------- media-gfx/geeqie/geeqie-1.5.ebuild | 95 --------------------- 4 files changed, 274 deletions(-) delete mode 100644 media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch delete mode 100644 media-gfx/geeqie/geeqie-1.4-r1.ebuild delete mode 100644 media-gfx/geeqie/geeqie-1.5.ebuild (limited to 'media-gfx/geeqie') diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 95c4f2f3591d..da65766b8577 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,3 +1 @@ -DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205 DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac -DIST geeqie-1.5.tar.xz 1585780 BLAKE2B 6dc0a30c26f25988cbd3fa81a916642504e9f6f280b03d78c820cbf5b453d8a392d3c8da8d482de24b3c39e7e9ba0663879d651c60a8061b8034d2c526007944 SHA512 2b87d543d8d77a4fec331fd1b73ca2038912362fc1f94c9b0f163dcc7c2dd58118e175c5540aecafb0581708ea5c2a5a321dde09f644e2322bd4ca5c0284b722 diff --git a/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch b/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch deleted file mode 100644 index b9a3bde0db2e..000000000000 --- a/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 13859e2ec3a1afc74f109cfffdf0de39030cde86 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen -Date: Wed, 2 Jan 2019 01:04:45 +0100 -Subject: [PATCH] fix build against exiv2-0.27.x - -fixes #654 ---- - src/exiv2.cc | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/exiv2.cc b/src/exiv2.cc -index b3c80657..f40b725e 100644 ---- a/src/exiv2.cc -+++ b/src/exiv2.cc -@@ -22,17 +22,27 @@ - - #ifdef HAVE_EXIV2 - -+// Don't include the file directly -+// Early Exiv2 versions didn't have version.hpp and the macros. -+#include - #include - #include - #include - #include - - // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer. -+#ifdef EXIV2_VERSION - #ifndef EXIV2_TEST_VERSION --# define EXIV2_TEST_VERSION(major,minor,patch) \ -+#define EXIV2_TEST_VERSION(major,minor,patch) \ - ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) - #endif -+#else -+#define EXIV2_TEST_VERSION(major,minor,patch) (false) -+#endif - -+#if EXIV2_TEST_VERSION(0,27,0) -+#define HAVE_EXIV2_ERROR_CODE -+#endif - - #include - #include -@@ -40,6 +50,10 @@ - #include - #include - -+#if EXIV2_TEST_VERSION(0,27,0) -+#define EXV_PACKAGE "exiv2" -+#endif -+ - #if !EXIV2_TEST_VERSION(0,17,90) - #include - #include -@@ -374,7 +388,11 @@ - #endif - Exiv2::Image *image = imageData_->image(); - -- if (!image) Exiv2::Error(21); -+#ifdef HAVE_EXIV2_ERROR_CODE -+ if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed); -+#else -+ if (!image) throw Exiv2::Error(21); -+#endif - image->setExifData(exifData_); - image->setIptcData(iptcData_); - #if EXIV2_TEST_VERSION(0,16,0) -@@ -394,8 +412,12 @@ - sidecar->setXmpData(xmpData_); - sidecar->writeMetadata(); - #else -+#ifdef HAVE_EXIV2_ERROR_CODE -+ throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp"); -+#else - throw Exiv2::Error(3, "xmp"); - #endif -+#endif - } - } - diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild deleted file mode 100644 index 5cf44c8bfe1d..000000000000 --- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools xdg-utils - -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 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? ( >=dev-lang/lua-5.1:= ) - map? ( media-libs/libchamplain:0.12 ) - tiff? ( media-libs/tiff:0 ) - xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" -DEPEND="${RDEPEND} - dev-util/glib-utils - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -REQUIRED_USE="gpu-accel? ( gtk3 ) - map? ( gpu-accel )" - -PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674044 - -src_prepare() { - default - - # Missing from release tarball, and requires git tree to generate - sed -e "/readme_DATA/s/ChangeLog\(.html\)\?//g" -i Makefile.am || die - - # Remove -Werror (gcc changes may add new warnings) - sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die - - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - local myconf="--disable-dependency-tracking - --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 tiff)" - - if use exif || use xmp; then - myconf="${myconf} --enable-exiv2" - else - myconf="${myconf} --disable-exiv2" - fi - - econf ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - - 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_desktop_database_update - - 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" -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/media-gfx/geeqie/geeqie-1.5.ebuild b/media-gfx/geeqie/geeqie-1.5.ebuild deleted file mode 100644 index 5323596a4a94..000000000000 --- a/media-gfx/geeqie/geeqie-1.5.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools xdg-utils - -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? ( >=dev-lang/lua-5.1:= ) - 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} - dev-util/glib-utils" -BDEPEND=" - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -REQUIRED_USE="gpu-accel? ( gtk3 ) - map? ( gpu-accel )" - -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 myconf="--disable-dependency-tracking - --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 - myconf="${myconf} --enable-exiv2" - else - myconf="${myconf} --disable-exiv2" - fi - - econf ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - - 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_desktop_database_update - - 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" -} - -pkg_postrm() { - xdg_desktop_database_update -} -- cgit v1.2.3-65-gdbad