Correct dependency.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 10 insertions, 36 deletions

diff --git a/media-gfx/showimg/ChangeLog b/media-gfx/showimg/ChangeLog
index a923ff388476..d028fd432f13 100644
--- a/media-gfx/showimg/ChangeLog
+++ b/media-gfx/showimg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/showimg
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.44 2009/02/09 00:51:56 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.45 2009/02/10 01:22:25 carlo Exp $
+
+  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)
 
diff --git a/media-gfx/showimg/Manifest b/media-gfx/showimg/Manifest
index 16bd3836d0f2..3626d85a54e1 100644
--- a/media-gfx/showimg/Manifest
+++ b/media-gfx/showimg/Manifest
@@ -2,10 +2,8 @@ AUX showimg-0.9.5+gcc-4.3.patch 1700 RMD160 69314a70e781db6193e640304194d1901f36
 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.4-1.tar.bz2 1574750 RMD160 e92de226e97256fe5cb2d4b1f899a084fd158d90 SHA1 3bb382d5a41257305c668256dc04b5a1a9e6298b SHA256 241f92a7e4495336e4b54c6d335349f7df406ec3e6e341edb6e3a32dbfe67256
 DIST showimg-0.9.5.tar.bz2 4117897 RMD160 150dc74f400b72a22f6a117aa3acd8201a059a39 SHA1 59d3a1f1a22761e0576d98e6cc6f430cc3822643 SHA256 d9c5e3174551272fffba1a530e83d2b2db60bb80e88af9dc2c060337e60bc105
-EBUILD showimg-0.9.4.1.ebuild 767 RMD160 733930ea1b2778348bd96665ffa6479cce7eeb83 SHA1 8571eb683b71e9c172a9c98d35099a1c91a1a4fe SHA256 6987cc5d7013f330df7f7b84b5bf9fc1d7f32f4d1321d8ebb8e07b9ec97effdc
 EBUILD showimg-0.9.5-r1.ebuild 1311 RMD160 8a2917930398178e498a9b280ca35bbd11da7089 SHA1 cb096995611dd48e47e3726aeee6d1324cdd4d72 SHA256 52dda5fc96c3da50ca907998f8a9440b32154179aa2485b859b2f9a01314467e
-EBUILD showimg-0.9.5.ebuild 1186 RMD160 1869a385349a61ecc2a8f5e5d8e4126a7b7d880f SHA1 8894a2726b54307215252104cbf66c10ab6966ed SHA256 e5e95f346cff59bf0328fb98b9947453db8d51b4a9b79c21a5ae02e00f91bc4c
-MISC ChangeLog 5174 RMD160 9365477609408c2494a0aadf22f188e051948f9f SHA1 157792cf1dec5f19e9b65ccdd7b1012f43fb9a38 SHA256 9df84483b830de4bd0b7f7140b1c0880e7d7bc4b179228f2a449fa3e67dc696b
+EBUILD showimg-0.9.5.ebuild 1190 RMD160 edb7eee69e506bdc135a890c258de62ed3456030 SHA1 2e9945bba584abd59076b4eb23fce9ccf3c4927c SHA256 3269ad15db515a11615685084db25c2c984826a1616211ac321b20a3784c11c6
+MISC ChangeLog 5295 RMD160 b5ccdc3dc33b3f5e33a37151d046fb14582b2c9c SHA1 b66ea9926ee5814c41e65b825b32e51a1976bd81 SHA256 c885f5f1992ad0712e0a777f86b438927410c702822896004ecf3a115b90a94b
 MISC metadata.xml 244 RMD160 d0dad825021e803beef87d79bb0fad320f106357 SHA1 2e2c424a4cf2fd7e286108f23aea637e44da2879 SHA256 9e924db1025e6dc7d77447f1a04baa87fee3e324394e825e3f7ace393d076139
diff --git a/media-gfx/showimg/showimg-0.9.4.1.ebuild b/media-gfx/showimg/showimg-0.9.4.1.ebuild
deleted file mode 100644
index e096af57e94c..000000000000
--- a/media-gfx/showimg/showimg-0.9.4.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/showimg-0.9.4.1.ebuild,v 1.7 2008/02/19 01:41:17 ingmar Exp $
-
-inherit kde
-
-MY_PV="${PV/?.?.?.?/${PV%.*}-${PV##*.}}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="feature-rich image viewer for KDE"
-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="x86 ~sparc ~ppc amd64"
-IUSE=""
-
-DEPEND="|| ( =kde-base/libkonq-3.5* =kde-base/kdebase-3.5* )
-	media-libs/libkexif
-	media-plugins/kipi-plugins"
-need-kde 3.1
-
-src_compile(){
-	local myconf="--enable-libkipi"
-	kde_src_compile all
-}
diff --git a/media-gfx/showimg/showimg-0.9.5.ebuild b/media-gfx/showimg/showimg-0.9.5.ebuild
index 7e49e6479f8e..9d75cacefdbe 100644
--- a/media-gfx/showimg/showimg-0.9.5.ebuild
+++ b/media-gfx/showimg/showimg-0.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.ebuild,v 1.13 2008/05/19 20:05:17 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/showimg-0.9.5.ebuild,v 1.14 2009/02/10 01:22:25 carlo Exp $
 
 inherit kde eutils
 
@@ -20,7 +20,7 @@ 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 )
+	postgres? ( virtual/postgresql-base <dev-libs/libpqxx-2.6.9 )
 	exif? ( media-libs/libkexif )
 	kipi? ( media-plugins/kipi-plugins )
 	media-libs/libexif"