Eapi4, use add_kdebase_dep, use kde_handbook variable.

(Portage version: 2.2.0_alpha32/cvs/Linux x86_64)

2 files changed, 24 insertions, 22 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 064c84feac11..939e1b6e583f 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.183 2011/05/10 21:00:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.184 2011/05/11 10:45:31 scarabeus Exp $
+
+  11 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> digikam-1.9.0-r1.ebuild:
+  Eapi4, use add_kdebase_dep, use kde_handbook variable.
 
 *digikam-1.9.0-r1 (10 May 2011)
 
diff --git a/media-gfx/digikam/digikam-1.9.0-r1.ebuild b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
index c37abe0a4c38..6e439a43e942 100644
--- a/media-gfx/digikam/digikam-1.9.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0-r1.ebuild,v 1.1 2011/05/10 21:00:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0-r1.ebuild,v 1.2 2011/05/11 10:45:31 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
 KDE_LINGUAS="ar be bg ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl he hi hne hr hu is it ja km
 ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW"
 KMNAME="extragear/graphics"
-
+KDE_HANDBOOK="optional"
 # needed for sufficiently new libkdcraw
 KDE_MINIMAL="4.5"
 inherit kde4-base
@@ -23,14 +23,14 @@ LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
 KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="4"
-IUSE="addressbook debug doc geolocation gphoto2 handbook mysql semantic-desktop themedesigner +thumbnails video"
+IUSE="addressbook debug doc geolocation gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
 
 CDEPEND="
-	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
-	>=kde-base/libkdcraw-${KDE_MINIMAL}
-	>=kde-base/libkexiv2-${KDE_MINIMAL}
-	>=kde-base/libkipi-${KDE_MINIMAL}
-	>=kde-base/solid-${KDE_MINIMAL}
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep libkdcraw)
+	$(add_kdebase_dep libkexiv2)
+	$(add_kdebase_dep libkipi)
+	$(add_kdebase_dep solid)
 	media-libs/jasper
 	virtual/jpeg
 	media-libs/lcms:0
@@ -43,17 +43,17 @@ CDEPEND="
 	>=sci-libs/clapack-3.2.1-r3
 	x11-libs/qt-gui[qt3support]
 	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
-	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
-	geolocation? ( >=kde-base/marble-${KDE_MINIMAL}[plasma] )
+	addressbook? ( $(add_kdebase_dep kdepimlibs) )
+	geolocation? ( $(add_kdebase_dep marble 'plasma') )
 	gphoto2? ( media-libs/libgphoto2 )
 	mysql? ( virtual/mysql )
 "
 RDEPEND="${CDEPEND}
-	>=kde-base/kreadconfig-${KDE_MINIMAL}
+	$(add_kdebase_dep kreadconfig)
 	video? (
 		|| (
-			>=kde-base/mplayerthumbs-${KDE_MINIMAL}
-			>=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+			$(add_kdebase_dep ffmpegthumbs)
+			$(add_kdebase_dep mplayerthumbs)
 		)
 	)
 "
@@ -65,10 +65,10 @@ DEPEND="${CDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-		"${FILESDIR}/${PN}"-1.9.0-docs.patch
-		"${FILESDIR}/${PN}"-1.8.0-tests.patch
-		"${FILESDIR}/${PN}"-1.9.0-nomysql.patch
-	)
+	"${FILESDIR}/${PN}"-1.9.0-docs.patch
+	"${FILESDIR}/${PN}"-1.8.0-tests.patch
+	"${FILESDIR}/${PN}"-1.9.0-nomysql.patch
+)
 
 src_prepare() {
 	if use handbook; then
@@ -86,7 +86,7 @@ src_configure() {
 
 	use semantic-desktop && backend="Nepomuk" || backend="None"
 	# LQR = only allows to choose between bundled/external
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DFORCED_UNBUNDLE=ON
 		-DWITH_LQR=ON
 		-DWITH_LENSFUN=ON
@@ -110,7 +110,6 @@ src_install() {
 
 	if use doc; then
 		# install the api documentation
-		dodir /usr/share/doc/${PF}/html || die
 		insinto /usr/share/doc/${PF}/html
 		doins -r ${CMAKE_BUILD_DIR}/api/html/* || die
 	fi
@@ -124,6 +123,6 @@ pkg_postinst() {
 	kde4-base_pkg_postinst
 
 	if use doc; then
-		elog The digikam api documentation has been installed at /usr/share/doc/${PF}/html
+		elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
 	fi
 }