[media-libs/showimg] saved from main tree

Thanks to Brent Busby for rescue.

8 files changed, 478 insertions, 0 deletions

diff --git a/media-gfx/showimg/ChangeLog b/media-gfx/showimg/ChangeLog
new file mode 100644
index 00000000..0fa1773f
--- /dev/null
+++ b/media-gfx/showimg/ChangeLog
@@ -0,0 +1,172 @@
+# ChangeLog for media-gfx/showimg
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.50 2009/07/19 11:56:32 nixnut Exp $
+
+  19 Jul 2009; nixnut <nixnut@gentoo.org> showimg-0.9.5-r1.ebuild:
+  ppc stable #273889
+
+  06 Jul 2009; Raúl Porcel <armin76@gentoo.org> showimg-0.9.5-r1.ebuild:
+  sparc stable wrt #273889
+
+  02 Jul 2009; Markus Meier <maekke@gentoo.org> showimg-0.9.5-r1.ebuild:
+  amd64 stable, bug #273889
+
+  01 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+  showimg-0.9.5-r1.ebuild:
+  stable x86, bug 273889
+
+  18 Jun 2009; Thomas Anderson <gentoofan23@gentoo.org>
+  showimg-0.9.5-r1.ebuild:
+  Fix QA issues with showimg's .desktop file.
+
+  10 Feb 2009; Carsten Lohrke <carlo@gentoo.org> -showimg-0.9.4.1.ebuild,
+  showimg-0.9.5.ebuild:
+  Correct dependency.
+
+*showimg-0.9.5-r1 (09 Feb 2009)
+
+  09 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +files/showimg-0.9.5-gcc-4.3.patch,
+  +files/showimg-0.9.5-libpqxx-2.6.9.diff, +showimg-0.9.5-r1.ebuild:
+  Fix bug #229093 and #226421. Get rid of the invalid aRts dependency.
+
+  22 Aug 2008; Markus Meier <maekke@gentoo.org> metadata.xml:
+  add GLEP 56 USE flag desc from use.local.desc
+
+  19 May 2008; Tiziano Müller <dev-zero@gentoo.org> showimg-0.9.5.ebuild:
+  Changed dependency for postgresql to virtual/postgresql-base
+
+  11 May 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/showimg-0.9.5+gcc-4.3.patch, showimg-0.9.5.ebuild:
+  Add patch to build with GCC 4.3, thanks to Peter Alfredsen in bug #214364.
+
+  19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> showimg-0.9.4.1.ebuild,
+  showimg-0.9.5.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
+
+  21 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org> showimg-0.9.5.ebuild:
+  Corrected the USE flag handling. Fixes bug 185958.
+
+  23 Nov 2006; Francesco Riosa <vivo@gentoo.org> showimg-0.9.5.ebuild:
+  dev-db/mysql => virtual/mysql
+
+  20 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/showimg-0.9.5-as-needed.patch, showimg-0.9.5.ebuild:
+  as-needed patch thanks to Krzysztof Nowicki <krissn@op.pl> in bug 147731
+
+  05 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> showimg-0.9.5.ebuild:
+  Stable on sparc
+
+  04 Sep 2006; Joshua Jackson <tsunam@gentoo.org> showimg-0.9.5.ebuild:
+  Stable x86; bug #131937
+
+  02 Sep 2006; <blubb@gentoo.org> showimg-0.9.5.ebuild:
+  stable on amd64
+
+  27 Apr 2006; Marien Zwart <marienz@gentoo.org>
+  files/digest-showimg-0.9.4.1, files/digest-showimg-0.9.5, Manifest:
+  Fixing SHA256 digest, pass four
+
+  01 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> showimg-0.9.5.ebuild:
+  Add libexif as a hard dependency, see bug #125789.
+
+  13 Feb 2006; Mark Loeser <halcy0n@gentoo.org> showimg-0.9.5.ebuild:
+  Fix: DEPEND: ')' not separated by space
+
+*showimg-0.9.5 (12 Feb 2006)
+
+  12 Feb 2006; Carsten Lohrke <carlo@gentoo.org> +showimg-0.9.5.ebuild:
+  Version bump.
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> showimg-0.9.4.1.ebuild:
+  stable on amd64
+
+  20 Mar 2005; Carsten Lohrke <carlo@gentoo.org> showimg-0.9.4.1.ebuild:
+  refined dependencies
+
+  13 Mar 2005; Carsten Lohrke <carlo@gentoo.org> showimg-0.9.4.1.ebuild:
+  stable on x86
+
+*showimg-0.9.4.1 (18 Jan 2005)
+
+  18 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +showimg-0.9.4.1.ebuild:
+  version bump
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> showimg-0.9.3.ebuild,
+  showimg-0.9.4.ebuild:
+  Changed dep on kdebase to accept kdebase-meta, the split 'meta' package.
+  This dep will be narrowed down in the future to the precise split packages
+  required.
+
+  05 Jan 2005; Marcus Hanwell <cryos@gentoo.org> showimg-0.9.4.ebuild:
+  Marked ~amd64 as requested in bug 72943.
+
+  03 Jan 2005; Joseph Jezak <josejx@gentoo.org> showimg-0.9.4.ebuild:
+  Marked ~ppc for bug #72943.
+
+  31 Dec 2004; Jason Wever <weeve@gentoo.org> showimg-0.9.4.ebuild:
+  Added ~sparc keyword.
+
+  30 Nov 2004; Carsten Lohrke <carlo@gentoo.org> showimg-0.9.4.ebuild:
+  dependency correction
+
+*showimg-0.9.4 (30 Nov 2004)
+
+  30 Nov 2004; Carsten Lohrke <carlo@gentoo.org> -showimg-0.8.0.ebuild,
+  -showimg-0.8.1.ebuild, -showimg-0.9.1.ebuild, -showimg-0.9.2.ebuild,
+  +showimg-0.9.4.ebuild:
+  clean up, version bump
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> showimg-0.9.1.ebuild,
+  showimg-0.9.2.ebuild, showimg-0.9.3.ebuild:
+  Stable on amd64.
+
+  13 Sep 2004; Carsten Lohrke <carlo@gentoo.org> showimg-0.9.3.ebuild:
+  missing kdebase dependency, missing ~archs, stable on x86
+
+*showimg-0.9.3 (06 Jul 2004)
+
+  06 Jul 2004; Dominik Stadler <centic@gentoo.org> :
+  Add new Version 0.9.3
+
+  03 Jul 2004; Dominik Stadler <centic@gentoo.org> showimg-0.9.1.ebuild,
+  showimg-0.9.2.ebuild:
+  Mark stable on x86.
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> showimg-0.8.0.ebuild,
+  showimg-0.8.1.ebuild, showimg-0.9.1.ebuild, showimg-0.9.2.ebuild:
+  QA: kde-base -> kde
+
+  16 May 2004; Dominik Stadler <centic@gentoo.org> showimg-0.8.0.ebuild,
+  showimg-0.8.1.ebuild, showimg-0.9.1.ebuild:
+  Add IUSE
+
+  28 Apr 2004; Jon Portnoy <avenj@gentoo.org> showimg-0.8.1.ebuild :
+  Stable on AMD64.
+
+*showimg-0.9.2 (24 Apr 2004)
+
+  24 Apr 2004; Dominik Stadler <centic@gentoo.org> +showimg-0.9.2.ebuild:
+  Add new Version 0.9.2, see Bug 48199
+
+  20 Apr 2004; David Holm <dholm@gentoo.org> showimg-0.9.1.ebuild:
+  Added to ~ppc.
+
+*showimg-0.9.1 (19 Apr 2004)
+
+  19 Apr 2004; Jon Portnoy <avenj@gentoo.org> showimg-0.9.1.ebuild :
+  Version bump.
+
+  14 Mar 2004; Jon Portnoy <avenj@gentoo.org> showimg-0.8.1.ebuild :
+  AMD64 keywords.
+
+*showimg-0.8.1 (30 Nov 2003)
+
+  30 Nov 2003; Caleb Tennis <caleb@gentoo.org> showimg-0.8.1.ebuild:
+  Version bump
+
+*showimg-0.8.0 (23 Oct 2003)
+
+  23 Oct 2003; Caleb Tennis <caleb@gentoo.org> metadata.xml, showimg-0.8.0.ebuild:
+  Initial version - submitted by maintainer
+
diff --git a/media-gfx/showimg/Manifest b/media-gfx/showimg/Manifest
new file mode 100644
index 00000000..4f67016e
--- /dev/null
+++ b/media-gfx/showimg/Manifest
@@ -0,0 +1,8 @@
+AUX showimg-0.9.5+gcc-4.3.patch 1700 RMD160 69314a70e781db6193e640304194d1901f36c23d SHA1 d5e87de38c0956e8322fafca96eca1884e938839 SHA256 54012e4a4682a8d36c67bc84d8a4f880e2534d3a4cade64e7cdd9a45853484b4
+AUX showimg-0.9.5-as-needed.patch 1027 RMD160 06d412091020a7bb391c3df6f2356c525d1a54f5 SHA1 1585f168f6ddc7a7dece90ade5a11ed25d5dc26f SHA256 96a0caf6086ee675c87db6e22dc4e8a0c9cad9c41f5552573ac44c1a53abd341
+AUX showimg-0.9.5-gcc-4.3.patch 2023 RMD160 8d7dd8a8ccd67096e315ce71a0e92e81dc061cb6 SHA1 1552d3e99204539d32447c62a8845a5b3621dffa SHA256 2abeaba58543cf37d1398de8f448ec3403f66b374805fbcca5367b8102f113c6
+AUX showimg-0.9.5-libpqxx-2.6.9.diff 4656 RMD160 b463c4aadfbd1cef74be1a63e5172ac4f7a5ddbd SHA1 ab381f7c121d87809f85a067df01a6b9c4c9a747 SHA256 82f7ff4ac32001da364a482f405fbe3fae902c2cc1b6133541dcad4679443530
+DIST showimg-0.9.5.tar.bz2 4117897 RMD160 150dc74f400b72a22f6a117aa3acd8201a059a39 SHA1 59d3a1f1a22761e0576d98e6cc6f430cc3822643 SHA256 d9c5e3174551272fffba1a530e83d2b2db60bb80e88af9dc2c060337e60bc105
+EBUILD showimg-0.9.5-r1.ebuild 1444 RMD160 e79987fc907eeee82620be1fd327dd3a46fdf3cb SHA1 b0cd455dfd478c8fe02d800e66a63f7fdcfdb6d2 SHA256 0b247288d584a81143610a1da32b12224a596e5ceade3282569b3481fe7e2f6c
+MISC ChangeLog 5827 RMD160 76f0b53ad357eddaaaed0993e4d7494ee85de09b SHA1 77dc11694d3a921af9b8af1f2bdc6b822515b061 SHA256 876ab0d0fb4128800c020f890247ece88eb861079169a3af48968a47f8578b3a
+MISC metadata.xml 244 RMD160 d0dad825021e803beef87d79bb0fad320f106357 SHA1 2e2c424a4cf2fd7e286108f23aea637e44da2879 SHA256 9e924db1025e6dc7d77447f1a04baa87fee3e324394e825e3f7ace393d076139
diff --git a/media-gfx/showimg/files/showimg-0.9.5+gcc-4.3.patch b/media-gfx/showimg/files/showimg-0.9.5+gcc-4.3.patch
new file mode 100644
index 00000000..b100dd03
--- /dev/null
+++ b/media-gfx/showimg/files/showimg-0.9.5+gcc-4.3.patch
@@ -0,0 +1,48 @@
+diff -NrU5 showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.cpp showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.cpp
+--- showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.cpp	2006-01-07 09:47:45.000000000 +0100
++++ showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.cpp	2008-04-27 21:30:03.000000000 +0200
+@@ -357,10 +357,11 @@
+ #include <string.h>
+ #include <string>
+ #include <iostream>
+ #include <assert.h>
+ #include <limits.h>
++#include <cstdlib>
+ //TODO OK?
+ #ifdef Q_WS_WIN
+ //workaround for bug on msvc
+ # undef LLONG_MIN
+ #endif
+diff -NrU5 showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.y showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.y
+--- showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.y	2006-01-07 09:47:45.000000000 +0100
++++ showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.y	2008-04-27 21:17:31.000000000 +0200
+@@ -438,10 +438,12 @@
+ #include <string.h>
+ #include <string>
+ #include <iostream>
+ #include <assert.h>
+ #include <limits.h>
++#include <alloca.h>
++#include <cstdlib>
+ //TODO OK?
+ #ifdef Q_WS_WIN
+ //workaround for bug on msvc
+ # undef LLONG_MIN
+ #endif
+diff -NrU5 showimg-0.9.5.orig/showimg/showimg/imagelistview.cpp showimg-0.9.5/showimg/showimg/imagelistview.cpp
+--- showimg-0.9.5.orig/showimg/showimg/imagelistview.cpp	2006-01-07 09:48:04.000000000 +0100
++++ showimg-0.9.5/showimg/showimg/imagelistview.cpp	2008-04-27 21:17:31.000000000 +0200
+@@ -47,10 +47,13 @@
+ #include "imagefileiconitem.h"
+ #include "dirfileiconitem.h"
+ #include "imageviewer.h"
+ #include "imagemetainfo.h"
+ 
++#include <cstdlib>
++#include <climits>
++
+ #ifdef HAVE_KIPI
+ #include "kipiplugins/kipipluginmanager.h"
+ #endif /* HAVE_KIPI */
+ 
+ #ifdef HAVE_LIBKEXIF
diff --git a/media-gfx/showimg/files/showimg-0.9.5-as-needed.patch b/media-gfx/showimg/files/showimg-0.9.5-as-needed.patch
new file mode 100644
index 00000000..acea1cc1
--- /dev/null
+++ b/media-gfx/showimg/files/showimg-0.9.5-as-needed.patch
@@ -0,0 +1,18 @@
+diff -Naur showimg-0.9.5.orig/showimg/kexi/kexidb/Makefile.am showimg-0.9.5/showimg/kexi/kexidb/Makefile.am
+--- showimg-0.9.5.orig/showimg/kexi/kexidb/Makefile.am	2006-01-07 09:47:47.000000000 +0100
++++ showimg-0.9.5/showimg/kexi/kexidb/Makefile.am	2006-09-14 10:39:19.000000000 +0200
+@@ -25,7 +25,7 @@
+ #  relationship.h parser/parser.h transaction.h \
+ #  kexidb_export.h
+ 
+-libshowimgkexidb_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO)
++libshowimgkexidb_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(showimg_top_srcdir)/kexi/kexiutils/libshowimgkexiutils.la
+ libshowimgkexidb_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ kde_servicetypes_DATA = showimg_kexidb_driver.desktop
+diff -Naur showimg-0.9.5.orig/showimg/kexi/Makefile.am showimg-0.9.5/showimg/kexi/Makefile.am
+--- showimg-0.9.5.orig/showimg/kexi/Makefile.am	2006-01-07 09:47:50.000000000 +0100
++++ showimg-0.9.5/showimg/kexi/Makefile.am	2006-09-14 10:50:49.000000000 +0200
+@@ -1 +1 @@
+-SUBDIRS= 3rdparty kexidb kexiutils
++SUBDIRS= 3rdparty kexiutils kexidb
diff --git a/media-gfx/showimg/files/showimg-0.9.5-gcc-4.3.patch b/media-gfx/showimg/files/showimg-0.9.5-gcc-4.3.patch
new file mode 100644
index 00000000..634426df
--- /dev/null
+++ b/media-gfx/showimg/files/showimg-0.9.5-gcc-4.3.patch
@@ -0,0 +1,59 @@
+diff -NrU5 showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.cpp showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.cpp
+--- showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.cpp	2006-01-07 09:47:45.000000000 +0100
++++ showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.cpp	2008-04-27 21:30:03.000000000 +0200
+@@ -357,10 +357,11 @@
+ #include <string.h>
+ #include <string>
+ #include <iostream>
+ #include <assert.h>
+ #include <limits.h>
++#include <cstdlib>
+ //TODO OK?
+ #ifdef Q_WS_WIN
+ //workaround for bug on msvc
+ # undef LLONG_MIN
+ #endif
+diff -NrU5 showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.y showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.y
+--- showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.y	2006-01-07 09:47:45.000000000 +0100
++++ showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.y	2008-04-27 21:17:31.000000000 +0200
+@@ -438,10 +438,12 @@
+ #include <string.h>
+ #include <string>
+ #include <iostream>
+ #include <assert.h>
+ #include <limits.h>
++#include <alloca.h>
++#include <cstdlib>
+ //TODO OK?
+ #ifdef Q_WS_WIN
+ //workaround for bug on msvc
+ # undef LLONG_MIN
+ #endif
+diff -NrU5 showimg-0.9.5.orig/showimg/showimg/imagelistview.cpp showimg-0.9.5/showimg/showimg/imagelistview.cpp
+--- showimg-0.9.5.orig/showimg/showimg/imagelistview.cpp	2006-01-07 09:48:04.000000000 +0100
++++ showimg-0.9.5/showimg/showimg/imagelistview.cpp	2008-04-27 21:17:31.000000000 +0200
+@@ -47,10 +47,13 @@
+ #include "imagefileiconitem.h"
+ #include "dirfileiconitem.h"
+ #include "imageviewer.h"
+ #include "imagemetainfo.h"
+ 
++#include <cstdlib>
++#include <climits>
++
+ #ifdef HAVE_KIPI
+ #include "kipiplugins/kipipluginmanager.h"
+ #endif /* HAVE_KIPI */
+ 
+ #ifdef HAVE_LIBKEXIF
+--- showimg-0.9.5/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp.orig	2009-02-09 01:29:07.000000000 +0100
++++ showimg-0.9.5/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp	2009-02-09 01:31:36.000000000 +0100
+@@ -19,6 +19,8 @@
+ #include <klocale.h>
+ #include <kdebug.h>
+ 
++#include <cstdlib>
++
+ using namespace KexiDB;
+ 
+ 
diff --git a/media-gfx/showimg/files/showimg-0.9.5-libpqxx-2.6.9.diff b/media-gfx/showimg/files/showimg-0.9.5-libpqxx-2.6.9.diff
new file mode 100644
index 00000000..c38c515a
--- /dev/null
+++ b/media-gfx/showimg/files/showimg-0.9.5-libpqxx-2.6.9.diff
@@ -0,0 +1,109 @@
+diff -Naur showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp showimg-0.9.5-libpqxx/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
+--- showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp	2006-01-07 19:47:46.000000000 +1100
++++ showimg-0.9.5-libpqxx/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp	2008-11-12 18:11:01.000000000 +1100
+@@ -16,6 +16,8 @@
+ #include <kexidb/error.h>
+ #include <klocale.h>
+ #include <string>
++#include <pqxx/nontransaction>
++#include <pqxx/transaction>
+ 
+ using namespace KexiDB;
+ 
+@@ -26,6 +28,7 @@
+ 		data = new pqxx::nontransaction(*static_cast<pqxxSqlConnection*>(conn)->m_pqxxsql /* todo: add name? */);
+ 	else
+ 		data = new pqxx::transaction<>(*static_cast<pqxxSqlConnection*>(conn)->m_pqxxsql /* todo: add name? */);
++
+ 	if (!static_cast<pqxxSqlConnection*>(conn)->m_trans) {
+ 		static_cast<pqxxSqlConnection*>(conn)->m_trans = this;
+ 	}
+@@ -248,7 +251,8 @@
+ 		//        m_trans = new pqxx::nontransaction(*m_pqxxsql);
+ 
+         //Create a result object through the transaction
+-        m_res = new pqxx::result(m_trans->data->exec(statement.utf8()));
++	std::string query(statement.utf8());
++	m_res = new pqxx::result(m_trans->data->exec(query));
+ 
+ 		//Commit the transaction
+ 		if (implicityStarted) {
+diff -Naur showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.h showimg-0.9.5-libpqxx/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.h
+--- showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.h	2006-01-07 19:47:46.000000000 +1100
++++ showimg-0.9.5-libpqxx/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.h	2008-11-12 18:10:06.000000000 +1100
+@@ -16,7 +16,9 @@
+ 
+ #include <kexidb/connection.h>
+ #include "pqxxcursor.h"
+-#include <pqxx/all.h>
++#include <pqxx/result>
++#include <pqxx/connection>
++#include <pqxx/transaction_base>
+ 
+ 
+ namespace KexiDB
+diff -Naur showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp showimg-0.9.5-libpqxx/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
+--- showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp	2006-01-07 19:47:46.000000000 +1100
++++ showimg-0.9.5-libpqxx/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp	2008-11-12 18:10:11.000000000 +1100
+@@ -11,6 +11,7 @@
+ //
+ #include "pqxxcursor.h"
+ #include "pqxxconnection.h"
++#include <pqxx/nontransaction>
+ 
+ #include <kexidb/error.h>
+ #include <kexidb/global.h>
+@@ -84,7 +85,8 @@
+ 			m_implicityStarted = true;
+ 		}
+ 
+-		m_res = new pqxx::result(((pqxxSqlConnection*)connection())->m_trans->data->exec(statement.utf8()));
++		std::string std_statement(statement.utf8());
++		m_res = new pqxx::result(((pqxxSqlConnection*)connection())->m_trans->data->exec(std_statement));
+ 		((pqxxSqlConnection*)connection())
+ 			->drv_commitTransaction(((pqxxSqlConnection*)connection())->m_trans);
+ //		my_conn->m_trans->commit();
+diff -Naur showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.h showimg-0.9.5-libpqxx/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.h
+--- showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.h	2006-01-07 19:47:46.000000000 +1100
++++ showimg-0.9.5-libpqxx/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.h	2008-11-12 18:10:16.000000000 +1100
+@@ -15,7 +15,8 @@
+ #include <kexidb/cursor.h>
+ #include <kexidb/connection.h>
+ 
+-#include <pqxx/all.h>
++#include <pqxx/result>
++#include <pqxx/connection>
+ 
+ namespace KexiDB {
+ 
+diff -Naur showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp showimg-0.9.5-libpqxx/showimg/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
+--- showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp	2006-01-07 19:47:46.000000000 +1100
++++ showimg-0.9.5-libpqxx/showimg/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp	2008-11-12 18:10:23.000000000 +1100
+@@ -22,6 +22,7 @@
+ #include <kexidb/driver_p.h>
+ #include "pqxxdriver.h"
+ #include "pqxxconnection.h"
++#include <pqxx/util>
+ #include <string>
+ 
+ #include <kdebug.h>
+@@ -132,14 +133,17 @@
+ //
+ QString pqxxSqlDriver::escapeString( const QString& str) const
+ {
+-    return QString(pqxx::Quote(str.ascii()).c_str());
++	// pqxx::sqlesc has been marked as deprecated
++	// in libpqxx 2.6, but this will get us through
++	// until showimg is killed or upgraded to a new kexi
++	return QString(pqxx::sqlesc(str.ascii()).c_str());
+ }
+ 
+ //==================================================================================
+ //
+ QCString pqxxSqlDriver::escapeString( const QCString& str) const
+ {
+-    return QCString(pqxx::Quote(QString(str).ascii()).c_str());
++	return QCString(pqxx::sqlesc(QString(str).ascii()).c_str());
+ }
+ 
+ //==================================================================================
diff --git a/media-gfx/showimg/metadata.xml b/media-gfx/showimg/metadata.xml
new file mode 100644
index 00000000..eb6141c7
--- /dev/null
+++ b/media-gfx/showimg/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<use>
+	<flag name='kipi'>
+		Support for the KDE Image Plugin Interface.
+	</flag>
+</use>
+</pkgmetadata>
diff --git a/media-gfx/showimg/showimg-0.9.5-r1.ebuild b/media-gfx/showimg/showimg-0.9.5-r1.ebuild
new file mode 100644
index 00000000..93306cc1
--- /dev/null
+++ b/media-gfx/showimg/showimg-0.9.5-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/showimg-0.9.5-r1.ebuild,v 1.7 2009/07/19 11:56:32 nixnut Exp $
+
+ARTS_REQUIRED="never"
+
+inherit kde eutils
+
+MY_PV="${PV/?.?.?.?/${PV%.*}-${PV##*.}}"
+MY_P="${PN}-${MY_PV}"
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="ShowImg is a feature-rich image viewer for KDE  including an image management system."
+HOMEPAGE="http://www.jalix.org/projects/showimg/"
+SRC_URI="http://www.jalix.org/projects/showimg/download/${MY_PV}/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc sparc ~x86"
+IUSE="exif kipi mysql postgres"
+
+DEPEND="|| ( =kde-base/libkonq-3.5* =kde-base/kdebase-3.5* )
+	mysql? ( virtual/mysql )
+	postgres? ( virtual/postgresql-base >=dev-libs/libpqxx-2.6.9 )
+	exif? ( media-libs/libkexif )
+	kipi? ( media-plugins/kipi-plugins )
+	media-libs/libexif"
+need-kde 3.5
+
+PATCHES=(
+	"${FILESDIR}/showimg-0.9.5-as-needed.patch"
+	"${FILESDIR}/showimg-0.9.5-gcc-4.3.patch"
+	"${FILESDIR}/showimg-0.9.5-libpqxx-2.6.9.diff"
+	)
+
+src_unpack() {
+	kde_src_unpack
+
+	sed -i -e '/MimeType/s:$:;:' \
+		"${S}/showimg/showimgapp/showimg.desktop" \
+		|| die "Sed failed."
+}
+
+src_compile() {
+	local myconf="--with-showimgdb \
+		$(use_with exif kexif) \
+		$(use_enable kipi libkipi) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql)"
+
+	rm -f "${S}"/configure
+	kde_src_compile all
+}