Fixes bug 214367. Replaced elog for eerror in the SQLite USE flag detection section.

Package-Manager: portage-2.1.4.4

4 files changed, 85 insertions, 5 deletions

diff --git a/media-gfx/kphotoalbum/ChangeLog b/media-gfx/kphotoalbum/ChangeLog
index bf34a39be4be..07db220842eb 100644
--- a/media-gfx/kphotoalbum/ChangeLog
+++ b/media-gfx/kphotoalbum/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/kphotoalbum
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.27 2008/03/18 18:09:04 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.28 2008/03/26 20:01:48 deathwing00 Exp $
+
+*kphotoalbum-3.1.1-r1 (26 Mar 2008)
+
+  26 Mar 2008; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +files/kphotoalbum-3.1.1-gcc-4.3.patch, +kphotoalbum-3.1.1-r1.ebuild:
+  Fixed SQLite message: now it is reported with eerror, as it terminates the
+  compilation, instead of elog. Fixed bug #214367: Thanks to Jan Kundrát
+  <jkt@gentoo.org> for the gcc-4.3 patch.
 
 *kphotoalbum-3.1.1 (18 Mar 2008)
 
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index d80f08a8f83f..fd9eba880345 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -2,16 +2,18 @@
 Hash: SHA1
 
 AUX kphotoalbum-3.1.0-exiv2.patch 5044 RMD160 757b71a9cb299edc8341c66fff75d65823402857 SHA1 2ca7313318b6d743771b32ba01a6b6d8ba2261d3 SHA256 ae8046cdf2c3e512707552d73f3d15e9980cc1a2e13a3f2046bd3580d23d2689
+AUX kphotoalbum-3.1.1-gcc-4.3.patch 303 RMD160 a1fce81c376728bc86fd752adab264fa937abeb1 SHA1 1b298b743ea97de98574ab29227dba0d75215ecf SHA256 ed08438cf8826e0c2523085bcc9e59661a07ca6946ffeac1649c1865248eb69e
 DIST kphotoalbum-3.1.0.tar.bz2 15501532 RMD160 68c3a862a1cc2cb8f91c751edf56226b7fc7be08 SHA1 9857ab2839c9e913bfdcc61e59ac4c4e8ba8cf23 SHA256 1dd56b6f152379d26cad590fc01c6eba4ff001f3309685e07771926335412511
 DIST kphotoalbum-3.1.1.tar.bz2 15503061 RMD160 8bda36262a160f8f0db994698bf337ee89b95a7b SHA1 28957f177adda08caba1935e05b7e3dc20e7649e SHA256 9b21b32afc94f9ac82950abe87028896d30208373e5c35ebb248bba31ac107f0
 EBUILD kphotoalbum-3.1.0.ebuild 2652 RMD160 145ca9b743ef4fc0f4b11fd0cf8d6303663e132b SHA1 83ffe50b07a316dc1f7cdbf32fe9e91992f55a22 SHA256 6a5df36bba56e508e1dd11175aecd146540b3988b6b814a2ab0f0a0d87cf73ce
+EBUILD kphotoalbum-3.1.1-r1.ebuild 1815 RMD160 434cdcdd2e200ebb5a3ba67eacb1c9ed099ecb1a SHA1 79ec7c4f4653f94ed4ae48ce227a2e9425a4890b SHA256 f1f01f976af8929dd05b0f30980599bf1d37a2318685d00f26b77dbad537fd77
 EBUILD kphotoalbum-3.1.1.ebuild 1753 RMD160 eff8aa3483d0b3a6a179f42b12563a86163963e6 SHA1 2bbb4d9890b15e37c0a0666592b659fdc6742a22 SHA256 21039842a856cbbeb3a19b5ee4a9f33bfdbacc0e8f8ddf993be40e68ae54cd3f
-MISC ChangeLog 5137 RMD160 eab6919925eaeb61a53db98e7b2120000bd07039 SHA1 75198179f17e40c80a442d6a7c1cee659045e9d8 SHA256 7918f7b966a554d0bf5a7e0b1f0fafc7e1e60b2c1c7a9cd224881888461bbcb9
+MISC ChangeLog 5505 RMD160 b126d7c13eb453b84cf9b3c5e2142fc5d181fc93 SHA1 93c4ea90e4548a7b7fd3bae81205ffd72044e4f0 SHA256 e3ef8f792003fa4186640f57f065253d4c28a6e1fed2b985c288496e363536a3
 MISC metadata.xml 248 RMD160 2496433ba875280762276effbe643d23ed6ebc24 SHA1 d52a48022c4d51e5da3b9321d031d6a05e71092e SHA256 7c28b3f9ef364c8202e380a019e8688e0f488ed625969485fea60e5d1f8eeeb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH4AVIfxJ68Jl1NeERArFhAJoDW6SISn6vaXVSsI/ToKiSE78ayACfRmHz
-p39rbb51my8lSAUr2FDrUF8=
-=yjAf
+iD8DBQFH6quzwMU+7UfzcKARAgGvAJ44KE1UpuITtiBMJlV5VNpQ/NWYvwCeOmBW
+KxZxwpZ5cKDtbnPR++Ihgp8=
+=zgNb
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-3.1.1-gcc-4.3.patch b/media-gfx/kphotoalbum/files/kphotoalbum-3.1.1-gcc-4.3.patch
new file mode 100644
index 000000000000..2aef639bb293
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-3.1.1-gcc-4.3.patch
@@ -0,0 +1,10 @@
+--- kphotoalbum-3.1.1/src/MainWindow/Window.cpp	(revision 787701)
++++ kphotoalbum-3.1.1/src/MainWindow/Window.cpp	(revision 787702)
+@@ -108,6 +108,7 @@
+ #include <kurldrag.h>
+ #include <qclipboard.h>
+ #include <stdexcept>
++#include <typeinfo>
+ 
+ MainWindow::Window* MainWindow::Window::_instance = 0;
+ 
diff --git a/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..f4151733cbda
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r1.ebuild,v 1.1 2008/03/26 20:01:48 deathwing00 Exp $
+
+USE_KEG_PACKAGING=1
+LANGS="ar be br ca cs cy da de el en_GB es et fi fr ga gl hi is it ja ka lt ms
+mt nb nds nl pa pl pt pt_BR ro ru rw sk sr sr@Latn sv ta tr uk vi zh_CN"
+KEG_PO_DIR=translations
+inherit kde
+
+DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing images."
+HOMEPAGE="http://www.kphotoalbum.org/"
+SRC_URI="http://www.kphotoalbum.org/download/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="${IUSE} arts exif raw"
+
+DEPEND="arts? ( =kde-base/arts-3.5* )
+	exif? ( >=media-gfx/exiv2-0.15 )
+	raw? ( >=media-libs/libkdcraw-0.1.1 )
+	>=media-libs/jpeg-6b-r7
+	>=media-libs/libkipi-0.1
+	|| ( =kde-base/kdegraphics-kfile-plugins-3.5* =kde-base/kdegraphics-3.5* )"
+
+need-kde 3.5
+
+PATCHES="${FILESDIR}/${P}-gcc-4.3.patch"
+
+pkg_setup() {
+	setupok=0
+	if use exif && ! built_with_use =x11-libs/qt-3* sqlite ; then
+		eerror "To enable KPhotoAlbum to search your images"
+		eerror "using EXIF information you also need to have"
+		eerror "Qt installed with SQLite support."
+		eerror
+		eerror "Make sure your Qt is installed with the sqlite USE flag."
+		((setupok++))
+	fi
+
+	slot_rebuild "media-libs/libkipi" && ((setupok++))
+
+	if (($setupok > 0)); then
+		die
+	fi
+}
+
+src_compile() {
+	sed -i -e '/^MimeType/ s/$/;/' "${S}"/src/kphotoalbum-import.desktop || \
+		die "sed to fix desktop entry failed."
+
+	local myconf="$(use_enable raw kdcraw) $(use_enable exif exiv2)"
+	if ! use exif; then
+		elog "NOTICE: You have the exif USE flag disabled. ${CATEGORY}/${PN}"
+		elog "will be compiled without EXIF support."
+	fi
+
+	kde_src_compile
+}