Remove unnecessary GTK+-2 defines, and add a missing one for bug 247725, thanks to Flameeyes for reporting. Run elibtoolize.

Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.27.7 i686

4 files changed, 41 insertions, 7 deletions

diff --git a/media-gfx/gimageview/ChangeLog b/media-gfx/gimageview/ChangeLog
index 6a62ce73cb98..f3e4013e08f8 100644
--- a/media-gfx/gimageview/ChangeLog
+++ b/media-gfx/gimageview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gimageview
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.23 2008/01/16 20:32:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.24 2008/12/21 13:14:09 ssuominen Exp $
+
+  21 Dec 2008; <ssuominen@gentoo.org> +files/gimageview-0.2.27-gtk2.patch,
+  gimageview-0.2.27-r2.ebuild:
+  Remove unnecessary GTK+-2 defines, and add a missing one for bug 247725,
+  thanks to Flameeyes for reporting. Run elibtoolize.
 
   16 Jan 2008; Markus Meier <maekke@gentoo.org> gimageview-0.2.27-r2.ebuild:
   add quotes
diff --git a/media-gfx/gimageview/Manifest b/media-gfx/gimageview/Manifest
index fff32bbbc76c..879c180255ff 100644
--- a/media-gfx/gimageview/Manifest
+++ b/media-gfx/gimageview/Manifest
@@ -1,7 +1,8 @@
 AUX gimageview-0.2.27-gtk12_fix.diff 476 RMD160 fb81bcfd4d88206449a29ad53952291de9a32164 SHA1 557516b2aca148d6cd3a1234f62bfaf0d6d7b3d7 SHA256 45623481372e74e96363c3a1c0921758cd1eb34a5047dbb06ef79db1eecd71d6
+AUX gimageview-0.2.27-gtk2.patch 1030 RMD160 cbd839b6c21fbe8326461063df5deeaafe0f834a SHA1 c2b49e21174bdd4714c98121cf0dec1fd65da7d9 SHA256 0ab0d374e219526c406c42e6d10b5f24aa04f5a102c2b84d26e7c78d7506bb91
 AUX gimageview-0.2.27-sort_fix.diff 920 RMD160 c06ff47bcd3ea48c58975b4ef992e559085c0d7e SHA1 7e81fce94ab5ac89cb8cf71c0520556934922df9 SHA256 955aa19153dbfeda17404915ecad08e238b1f1f77aeadb6c0eecc7c376aeb5fe
 AUX gimv-gcc34.patch 851 RMD160 b553f5854e20bd32fc78af049ecfeb991bc5f54b SHA1 cc44d048344290496aa8fa2cec35662eb395b8ca SHA256 1a45e77459b74ed762c51ccbb330850e8739e5102562780f98c31817a7ff3d4d
 DIST gimageview-0.2.27.tar.gz 1348286 RMD160 1d35b3a1b453f87dc232b84407524c3011ec91eb SHA1 333f0682e4f8f8ead4abb24f6eddf86f776c2478 SHA256 4bc899d734e9833478c1ae8fc6d9db0971d812aeefe6f1295b5edbd4e4639060
-EBUILD gimageview-0.2.27-r2.ebuild 1550 RMD160 ae35f8e58263f8d396f7c2b05463509e1e80fa66 SHA1 b0e916c3f92f4a0c06b4f4a292c087b7afa41450 SHA256 4182910b9ae92df46f09be88b9569d2dba538d64daece87c43fa0876dbe6fd42
-MISC ChangeLog 3107 RMD160 0decfc9c33181b8da89d1852df51292ee4696ba2 SHA1 d0b19cce28ba06b9ccd72c1228095a274ef979ec SHA256 7621204a6b23f2d25692eb105299fef6e9b05ac9c325a6a36f11afafeadee185
+EBUILD gimageview-0.2.27-r2.ebuild 1604 RMD160 0fb7a6a8c5c644cb3000f4a90d14d8624a92f78a SHA1 e574f6c727d10c17fa3e2acd9b1116ed5b9d6fcd SHA256 47beb55d2ec06246aa9a842c68a7a92aec96487568411ea78ba04d6a98641395
+MISC ChangeLog 3346 RMD160 74bc89b9033ef901a7ffa4e73d1fbb87f8bd3013 SHA1 9af6fcdaa292aec0a7f03873bcfc61c80db862fd SHA256 2b54397c69131d3b5acee9da38363a8da52f813a5a38b7cacdf28db52ad4546d
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch b/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch
new file mode 100644
index 000000000000..52e62b19cb06
--- /dev/null
+++ b/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch
@@ -0,0 +1,26 @@
+diff -ur gimageview-0.2.27.orig/src/gimv_cell_pixmap.c gimageview-0.2.27/src/gimv_cell_pixmap.c
+--- gimageview-0.2.27.orig/src/gimv_cell_pixmap.c	2004-05-23 17:07:54.000000000 +0300
++++ gimageview-0.2.27/src/gimv_cell_pixmap.c	2008-12-21 15:01:34.000000000 +0200
+@@ -25,10 +25,6 @@
+  *  Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@redhat.com>
+  */
+ 
+-#ifndef GTK_DISABLE_DEPRECATED
+-#  define GTK_DISABLE_DEPRECATED
+-#endif /* GTK_DISABLE_DEPRECATED */
+-
+ #include "gimv_cell_pixmap.h"
+ 
+ #if (GTK_MAJOR_VERSION >= 2)
+diff -ur gimageview-0.2.27.orig/src/gimv_image.c gimageview-0.2.27/src/gimv_image.c
+--- gimageview-0.2.27.orig/src/gimv_image.c	2004-09-21 11:44:31.000000000 +0300
++++ gimageview-0.2.27/src/gimv_image.c	2008-12-21 15:01:59.000000000 +0200
+@@ -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/gimageview-0.2.27-r2.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
index e45219423e43..090bd6eb8cf4 100644
--- a/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
+++ b/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild,v 1.6 2008/01/16 20:32:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild,v 1.7 2008/12/21 13:14:09 ssuominen Exp $
 
-inherit eutils
+inherit eutils libtool
 
 DESCRIPTION="Powerful GTK+ based image & movie viewer"
 HOMEPAGE="http://gtkmmviewer.sourceforge.net/"
@@ -29,8 +29,10 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-sort_fix.diff
-	epatch "${FILESDIR}"/${P}-gtk12_fix.diff
+	epatch "${FILESDIR}"/${P}-sort_fix.diff \
+		"${FILESDIR}"/${P}-gtk12_fix.diff \
+		"${FILESDIR}"/${P}-gtk2.patch
+	elibtoolize
 }
 
 src_compile() {