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

(Portage version: 2.1.4.4)

3 files changed, 79 insertions, 1 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/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
+}