Introduce

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

4 files changed, 63 insertions, 10 deletions

diff --git a/media-gfx/kphotoalbum/ChangeLog b/media-gfx/kphotoalbum/ChangeLog
index 33527fcc3563..430c3633b99c 100644
--- a/media-gfx/kphotoalbum/ChangeLog
+++ b/media-gfx/kphotoalbum/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/kphotoalbum
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.34 2009/02/14 16:38:12 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.35 2009/05/28 19:44:22 scarabeus Exp $
+
+*kphotoalbum-4.0.1 (28 May 2009)
+*kphotoalbum-3.1.1-r3 (28 May 2009)
+
+  28 May 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kphotoalbum-3.1.1-r2.ebuild, +kphotoalbum-3.1.1-r3.ebuild,
+  +kphotoalbum-4.0.1.ebuild, metadata.xml:
+  Introduce kde4 version of kphotoalbum. Bump kde3 one, fix slot, fix eapi2.
 
   14 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
   kphotoalbum-3.1.1-r2.ebuild:
diff --git a/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r3.ebuild
index f66679d9898b..58ed0f1bcdc7 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2009/02/14 17:50:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-3.1.1-r3.ebuild,v 1.1 2009/05/28 19:44:22 scarabeus Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing imag
 HOMEPAGE="http://www.kphotoalbum.org/"
 SRC_URI="http://www.kphotoalbum.org/download/${P}.tar.bz2"
 
-SLOT="0"
+SLOT="3.5"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="exif raw"
@@ -27,6 +27,9 @@ DEPEND="exif? ( >=media-gfx/exiv2-0.15 x11-libs/qt:3[sqlite] )
 	>=media-libs/jpeg-6b-r7
 	>=media-libs/libkipi-0.1
 	|| ( kde-base/kdegraphics-kfile-plugins:3.5 kde-base/kdegraphics:3.5 )"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:0
+"
 
 need-kde 3.5
 
@@ -35,7 +38,7 @@ PATCHES=(
 	"${FILESDIR}/kphotoalbum-3.1.1-desktop-files-fixes.diff"
 	)
 
-src_compile() {
+src_configure() {
 	local myconf="$(use_enable raw kdcraw) $(use_enable exif exiv2)"
-	kde_src_compile
+	kde_src_configure
 }
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.0.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.0.1.ebuild
new file mode 100644
index 000000000000..b321e2d619e7
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.0.1.ebuild
@@ -0,0 +1,42 @@
+# 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-4.0.1.ebuild,v 1.1 2009/05/28 19:44:22 scarabeus Exp $
+
+EAPI="2"
+
+inherit kde4-base
+
+DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing images."
+HOMEPAGE="http://www.kphotoalbum.org/"
+SRC_URI="http://www.${PN}.org/data/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug +exif +geolocation +kipi +raw +semantic-desktop"
+
+DEPEND="
+	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
+	media-libs/jpeg
+	>=x11-libs/qt-sql-4.4:4[sqlite]
+	exif? ( >=media-gfx/exiv2-0.17 )
+	geolocation? ( >=kde-base/marble-${KDE_MINIMAL} )
+	kipi? ( >=kde-base/libkipi-${KDE_MINIMAL} )
+	raw? ( >=kde-base/libkdcraw-${KDE_MINIMAL} )
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:0
+	semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
+"
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with raw Kdcraw)
+		$(cmake-utils_use_with kipi Kipi)
+		$(cmake-utils_use_with geolocation Marble)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)"
+
+	kde4-base_src_configure
+}
diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index e76ab4523213..342cf6acfe2d 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
-<maintainer>
-	<email>deathwing00@gentoo.org</email>
-	<name>deathwing00</name>
-</maintainer>
+<use>
+	<flag name="geolocation">Add support for <pkg>kde-base/marble</pkg></flag>
+	<flag name="kipi">Support for the KDE Image Plugin Interface</flag>
+</use>
 </pkgmetadata>