Eapi4, use add_kdebase_dep, use kde_handbook variable.

Package-Manager: portage-2.2.0_alpha32/cvs/Linux x86_64

3 files changed, 30 insertions, 38 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/Manifest b/media-gfx/digikam/Manifest
index 31051143b884..fc9bba025a25 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX digikam-1.2.0-docs-r3.patch 1926 RMD160 963f134c1bdb2e6b1a59b82efb7009733294ce6a SHA1 7cf403d5fd8f20142b7c1c6f6de225b5e66c28b9 SHA256 0687cd39780c1e40fec424f6ae5cce851e460681d02088eec763902c170ecb28
 AUX digikam-1.2.0-lapack.patch 6429 RMD160 e42b9600822fbd28b31c751fe6515a691db4cb0b SHA1 a495d7734c355419e4cba629354e4e9077f15782 SHA256 02169ca57f86f3f7d40dced07b7c54f612bd8fe3b03d2a5808184c47b5b360c0
@@ -12,24 +12,14 @@ DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880
 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
-EBUILD digikam-1.9.0-r1.ebuild 3351 RMD160 9a3da4b9de8fa9868d7fc922af8e5f04eeab6c0d SHA1 da9d1c54b08b42db52056a2edd5b047e2aaf5a59 SHA256 c02b152f72826bcefaaed94a07928d68c767784e707aa507b52d6abee843ec25
+EBUILD digikam-1.9.0-r1.ebuild 3260 RMD160 9a81da4a6a320bc4f86b05665654c4b7e0cbacdf SHA1 5bfc5984b6f9bdc9b724b9a6196123ec812bc703 SHA256 a4b15d1c633ad4f793471d09563a1c4ee14d3889de3cc09afed8df85e83d5a28
 EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
-MISC ChangeLog 30535 RMD160 ef5eab39403381936668182166b576734183d265 SHA1 e3ce89205a27112091c80e333139a52f742c87ac SHA256 86cd80f5ede418e249df6ff111735498346a474a4673d904d66b9f20b0276c93
+MISC ChangeLog 30673 RMD160 711e6e4b822ddacf45431c4635ec30d793a60128 SHA1 18f8dff2b1624c4e467d518dcee1510ab46b8832 SHA256 bdea02a6c7b62ab64e4ee1dacb203eb424e939871cc81ddc570029950fca5cba
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNyaxHAAoJENwGBM22xffetq0P/1bchhXTs2plTEikgcw0cYRL
-+EFhQG/7Hnf2K3I82FklEeDZErsPwr9rSYp03IieLtN40zyMwzIDtZQuKJx41LOD
-+q63OOmaMt0+V82iYyS7vzIlmGs0XvhTfx7DVTfxAwkFvxFuxKcEyBgZTWk2FFn1
-UdZkYBNa2/90YJsJ5mBvhtMswSi/KnZfOgWosF+1KL/njnrlFsJqKcdAtIocyKe8
-OWVEEWAH+faA9PpqauN9S7N0yT5kOLwqUiZR/VzW+EEMAeywhKb3UShW18QZ/FSG
-OTcVugmk7AQPYQnlDbB2RdsME+MUI6RWMNjCYkzXecKdRdDPZZUyphKJfL/Rsy4z
-LRFWcwnzqyyFoBMi3/+Pel0DtKHTrekQyOuTHY6rRxQl8x73brjEoinT+KgR3YBa
-85XvUSHx/F3TX3GgGuPo4EbWY3qDuAlBztyrbkigTrf7ykLG7dwdFFPZdGeRcUqQ
-+y+aO0XQvbDDKh+5XF4s0Unmpr0mldcvFCpdHvXAjhoK0ycPaRMJ0zfdOpXbp783
-VQD0bRrbIQ+M3H1U4iaGyQ/iAw1P6fCUjvAA17jkZ40Oe6cnq74LOb2Lt19kH0SN
-A95tbSIclJjvcDXpRBTypQy9VL1nF1mKQOoB861SHiI1jfj6XucY27gtfi9hZPdP
-9ABbBK6Vztdd4CLFjuAa
-=kiSN
+iEYEARECAAYFAk3KaNEACgkQHB6c3gNBRYeq4gCfQkE0J23mQaSSYmRXlWrm/+iA
+WdgAnA6u/ZiEEQDnFhwbCen9yTJStU4m
+=MzBK
 -----END PGP SIGNATURE-----
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
 }