[gentoo-commits] repo/gentoo:master commit in: profiles/, media-gfx/gimageview/files/, media-gfx/gimageview/

[Andreas Sturmlechner]

commit:     45adfa24b77e42b574398672d4cf988fead025b6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 07:53:37 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 08:25:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45adfa24

media-gfx/gimageview: Remove last-rited package

Bug: https://bugs.gentoo.org/769110
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/gimageview/Manifest                      |  1 -
 .../files/gimageview-0.2.27-gtk12_fix.diff         | 11 ----
 .../gimageview/files/gimageview-0.2.27-gtk2.patch  | 24 -------
 .../files/gimageview-0.2.27-libpng15.patch         | 24 -------
 .../files/gimageview-0.2.27-sort_fix.diff          | 30 ---------
 media-gfx/gimageview/gimageview-0.2.27-r4.ebuild   | 76 ----------------------
 media-gfx/gimageview/metadata.xml                  |  8 ---
 profiles/package.mask                              |  5 --
 8 files changed, 179 deletions(-)

diff --git a/media-gfx/gimageview/Manifest b/media-gfx/gimageview/Manifest
deleted file mode 100644
index 6ddbc6a3e1c..00000000000
--- a/media-gfx/gimageview/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gimageview-0.2.27.tar.gz 1348286 BLAKE2B 51538af8bdc85243e825e58b6bbefa285bdefad95b05228e08a8500a5fc9f7036a53f931689543a30841f9cbd54ad4576fbf5a29dd79d7b1f05f07cdaa8c9aa7 SHA512 36ac16f4fffcde34b608da35aa089d40225129a2f9dcd70cb024713738842600c7231522093b3d0bf5a7c4c4dcb7ba4b14d550e417e8b52030d43d4b51145220

diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff b/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff
deleted file mode 100644
index 9b82d2f6479..00000000000
--- a/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gimv_thumb_win.c
-+++ src/gimv_thumb_win.c
-@@ -2542,7 +2542,7 @@
- {
-    if (tw && tw->priv)
-       tw->priv->slideshow_selected_only
--         = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
-+         = GTK_CHECK_MENU_ITEM (widget)->active;
- }
- 
- 

diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch b/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch
deleted file mode 100644
index 7ab7ebb0321..00000000000
--- a/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/gimv_cell_pixmap.c
-+++ src/gimv_cell_pixmap.c
-@@ -25,10 +25,6 @@
-  *  Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@××××××.com>
-  */
- 
--#ifndef GTK_DISABLE_DEPRECATED
--#  define GTK_DISABLE_DEPRECATED
--#endif /* GTK_DISABLE_DEPRECATED */
--
- #include "gimv_cell_pixmap.h"
- 
- #if (GTK_MAJOR_VERSION >= 2)
---- src/gimv_image.c
-+++ src/gimv_image.c
-@@ -35,7 +35,7 @@
- #include "gimv_io.h"
- #include "gimv_image_saver.h"
- 
--#if defined (HAVE_GDK_PIXBUF)
-+#if defined (HAVE_GDK_PIXBUF) || defined (USE_GTK2)
- #  include <gdk-pixbuf/gdk-pixbuf.h>
- #  include "pixbuf_utils.h"
- typedef GdkPixbuf GimvRawImage;

diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-libpng15.patch b/media-gfx/gimageview/files/gimageview-0.2.27-libpng15.patch
deleted file mode 100644
index 2df9712869e..00000000000
--- a/media-gfx/gimageview/files/gimageview-0.2.27-libpng15.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://bugs.gentoo.org/361941
-
---- plugins/image_loader/png_loader.c
-+++ plugins/image_loader/png_loader.c
-@@ -255,7 +255,7 @@
-       return NULL;
-    }
- 
--   if (setjmp (png_ptr->jmpbuf)) goto ERROR;
-+   if (setjmp (png_jmpbuf(png_ptr))) goto ERROR;
- 
-    context.gio = gio;
-    context.bytes_read = 0;
---- plugins/image_saver/png_saver.c
-+++ plugins/image_saver/png_saver.c
-@@ -130,7 +130,7 @@
-       return FALSE;
-    }
- 
--   if (setjmp (png_ptr->jmpbuf)) {
-+   if (setjmp (png_jmpbuf(png_ptr))) {
-       png_destroy_write_struct (&png_ptr, &info_ptr);
-       fclose (handle);
-       return FALSE;

diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff b/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff
deleted file mode 100644
index d65b3a07ad5..00000000000
--- a/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/gimv_thumb_view.c
-+++ src/gimv_thumb_view.c
-@@ -1533,9 +1533,13 @@
- 
-    gimv_thumb_view_sort_data (tv);
- 
-+#if 0
-    for (node = new_thumb_list; node; node = g_list_next (node))
-       tv->vfuncs->insert_thumb (tv, node->data, tv->summary_mode);
-    g_list_free(new_thumb_list);
-+#endif
-+
-+   gimv_thumb_view_set_widget (tv, tv->tw, tv->container, tv->summary_mode);
- }
- 
- 
-@@ -1577,9 +1581,13 @@
- 
-    gimv_thumb_view_sort_data (tv);
- 
-+#if 0
-    for (node = new_thumb_list; node; node = g_list_next (node))
-       tv->vfuncs->insert_thumb (tv, node->data, tv->summary_mode);
-    g_list_free(new_thumb_list);
-+#endif
-+
-+   gimv_thumb_view_set_widget (tv, tv->tw, tv->container, tv->summary_mode);
- }
- 
- 

diff --git a/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild
deleted file mode 100644
index e44c2b09390..00000000000
--- a/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: USE xine could be restored if support for xine-lib-1.2.x
-# is patched in wrt #397639
-
-EAPI=6
-
-inherit epatch libtool
-
-DESCRIPTION="Powerful GTK+ based image & movie viewer"
-HOMEPAGE="http://gtkmmviewer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gtkmmviewer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="mng nls mplayer svg wmf" #xine
-
-RDEPEND="app-arch/bzip2
-	x11-libs/gtk+:2
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libXinerama
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	mng? ( media-libs/libmng:= )
-	svg? ( gnome-base/librsvg )
-	mplayer? ( media-video/mplayer )"
-#xine? ( media-libs/xine-lib )
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-src_prepare() {
-	# link gimv executable against -lm for floor() and pow()
-	sed -i -e 's/$(gimv_LDADD)/& -lm/' src/Makefile.in || die #417995
-
-	epatch \
-		"${FILESDIR}"/${P}-sort_fix.diff \
-		"${FILESDIR}"/${P}-gtk12_fix.diff \
-		"${FILESDIR}"/${P}-gtk2.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-
-	# desktop-file-validate
-	sed -i \
-		-e '/^Term/s:0:false:' \
-		-e '/^Icon/s:.png::' \
-		etc/${PN}.desktop.in || die
-
-	eapply_user
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-imlib \
-		$(use_enable nls) \
-		--enable-splash \
-		$(use_enable mplayer) \
-		--with-gtk2 \
-		$(use_with mng libmng) \
-		$(use_with svg librsvg) \
-		$(use_with wmf libwmf) \
-		--without-xine
-}
-
-src_install() {
-	emake \
-		bindir="${ED}usr/bin" \
-		datadir="${ED}usr/share" \
-		desktopdir="${ED}usr/share/applications" \
-		gimv_docdir="${ED}usr/share/doc/${PF}" \
-		libdir="${ED}usr/$(get_libdir)" \
-		install
-
-	find "${ED}" -name '*.la' -delete || die
-}

diff --git a/media-gfx/gimageview/metadata.xml b/media-gfx/gimageview/metadata.xml
deleted file mode 100644
index 119745c2ebb..00000000000
--- a/media-gfx/gimageview/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">gtkmmviewer</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 887edf1fddd..a229ced1934 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -358,11 +358,6 @@ media-gfx/gtkam
 # Removal on 2021-06-14.  Bug #507760
 media-libs/libexif-gtk
 
-# Andreas Sturmlechner <asturm@g.o> (2021-05-15)
-# Unmaintained, dead upstream since 2004, no hope to port away from GTK+2.
-# Removal on 2021-06-14.  Bug #769110
-media-gfx/gimageview
-
 # Michał Górny <mgorny@g.o> (2021-05-15)
 # Relies on dev-python/astunparse that is broken with Python 3.8+
 # and abandoned upstream.  The current version is also broken