Invalid aRts dependency, proper desktop file fix, missing eclass function call, ebuild cleanup.

(Portage version: 2.2_rc23/cvs/Linux i686)

3 files changed, 80 insertions, 2 deletions

diff --git a/media-gfx/kphotoalbum/ChangeLog b/media-gfx/kphotoalbum/ChangeLog
index ee3aacc1a28a..6170495fd388 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.32 2008/12/08 19:34:56 tcunha Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.33 2009/02/08 23:07:15 carlo Exp $
+
+*kphotoalbum-3.1.1-r2 (08 Feb 2009)
+
+  08 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +files/kphotoalbum-3.1.1-desktop-files-fixes.diff,
+  +kphotoalbum-3.1.1-r2.ebuild:
+  Invalid aRts dependency, proper desktop file fix, missing eclass function
+  call, ebuild cleanup.
 
   08 Dec 2008; Tiago Cunha <tcunha@gentoo.org> kphotoalbum-3.1.1-r1.ebuild:
   stable sparc, bug 245198
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-3.1.1-desktop-files-fixes.diff b/media-gfx/kphotoalbum/files/kphotoalbum-3.1.1-desktop-files-fixes.diff
new file mode 100644
index 000000000000..746903f0d646
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-3.1.1-desktop-files-fixes.diff
@@ -0,0 +1,22 @@
+--- ./kphotoalbum-3.1.1/src/kphotoalbum.desktop.orig	2009-02-08 23:46:38.000000000 +0100
++++ ./kphotoalbum-3.1.1/src/kphotoalbum.desktop	2009-02-08 23:46:38.000000000 +0100
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=KPhotoAlbum
+ Name[pa]=ਕ-ਫੋਟੋਐਲਬਮ
+ Name[sv]=Kfotoalbum
+--- ./kphotoalbum-3.1.1/src/kphotoalbum-import.desktop.orig	2009-02-08 23:46:38.000000000 +0100
++++ ./kphotoalbum-3.1.1/src/kphotoalbum-import.desktop	2009-02-08 23:46:38.000000000 +0100
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=KPhotoAlbum
+ Name[pa]=ਕ-ਫੋਟੋਐਲਬਮ
+ Name[sv]=Kfotoalbum
+@@ -45,4 +44,4 @@
+ Icon=kphotoalbum
+ Categories=Qt;KDE;Graphics;
+ NoDisplay=true
+-MimeType=application/vnd.kde.kphotoalbum-import
++MimeType=application/vnd.kde.kphotoalbum-import;
diff --git a/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r2.ebuild
new file mode 100644
index 000000000000..6579415d6090
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 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-r2.ebuild,v 1.1 2009/02/08 23:07:15 carlo Exp $
+
+ARTS_REQUIRED="never"
+
+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="exif raw"
+
+DEPEND="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"
+		"${FILESDIR}/kphotoalbum-3.1.1-desktop-files-fixes.diff" )
+
+pkg_setup() {
+	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."
+		die
+	fi
+	kde_pkg_setup
+}
+
+src_compile() {
+	local myconf="$(use_enable raw kdcraw) $(use_enable exif exiv2)"
+	kde_src_compile
+}