Remove old; pin libkface dependency since API changed

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

6 files changed, 29 insertions, 483 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index b722778b90e5..48342e783435 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.274 2014/12/17 23:03:05 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.275 2014/12/21 14:59:44 dilfridge Exp $
+
+  21 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org> -digikam-4.0.0.ebuild,
+  -digikam-4.2.0.ebuild, -digikam-4.4.0.ebuild, digikam-4.4.0-r1.ebuild:
+  Remove old; pin libkface dependency since API changed
 
   17 Dec 2014; Manuel Rüger <mrueg@gentoo.org> digikam-4.4.0-r1.ebuild:
   Add kde-applications dependency option.
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 3d2d8f20050c..f0792229c436 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,13 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX digikam-4.4.0-hang.patch 3491 SHA256 c7318579e23e0912940eda369335c34ed545d4a36391b414dffb357740493364 SHA512 91977b6184181624db3e0aa21d20a74452d839090b59187f98be6dbf25959fe211fb8c19d88722e6efe3f75b4867bee139f8bfa3deaaf9bf37d33869de804d1d WHIRLPOOL cc5d96e5fac6d088dbb757824715691d9ab73aa37177fc2d086e279c6d506ef79151393ed68a5ec49468d9b055619417fb7c10361e2a722b4b12f9844e3a6dc4
 AUX digikam-4.4.0-libkexiv2.patch 1886 SHA256 66a8d2c682300d908677d7430b488de9daa4183c91aa4f4e3f7ea8e594f6a102 SHA512 9e797897f4a892d1a9e7aaa6a477a3300c7a11f170eb2a1768e89fa42009b9b30e33e2f3cc2d633b424681d9f37b2f5ecd812a90ad691359c20fd43d782f6c50 WHIRLPOOL a003726a30c9495d47d15eca45bb769ab15990ae246ef069b02c24ae2ddc5ad14158e9021cc6f89f128f338e46323555db5e47e6c2cc9dbdf296f238dd40fccd
 DIST digikam-3.5.0.tar.bz2 65698806 SHA256 57bd2aa4fdde44333d1362b02b26ebf6c1a70675bf5cb40de5172df02857c42a SHA512 d9c4651398ab85490016324ee69d1303e57e6ac646ab48ac5860d2966b3f3f0b5b4112de1d793795aef322d3dc6e7c3aba33bd2b164a084e5b65d38944fb0d73 WHIRLPOOL e7e6527270f3daf6ca97c007253793ea6e02b637f86f3355d675bfc0d562a36d5a7311d2e1be0701bc4f6119037398bbc6f2e9deb4da04f01cc008ec52679aba
-DIST digikam-4.0.0.tar.bz2 68931371 SHA256 984f7a47a3fdd5b5b30991b436848ed420fbcfffa01ffaa3abdf7202848b17ae SHA512 d76dbdc72fc5c42e2628d43bf669cce53b82e21eb5dbfa3c908740ec10f2bc949f6faba595f36e3a376f9d9c8b9db8af2c10a4921bd5b21d9c744b0bd8570661 WHIRLPOOL 55463465f2b1a6b9fa8bb9e63e1ac1fd5fa8a21f41ed94bf5a7e9ba8404ebf0cc3e4d027d51179881736a4cd40734774c2c666e7f3a4a40396230330f69b21c2
-DIST digikam-4.2.0.tar.bz2 68849613 SHA256 e86575b76672dfd0a7ed5f1d7b8b74425171804d7f16b0d743a5d2375c1c1b08 SHA512 ff9442360a343beff1643ef95f4dcff81e764a03cf18d8de800b45ca19b0a3727e59916ca0613cf4977c8e19ebc87f3f6682a48d5ab78b313b1d0189fbaa1169 WHIRLPOOL 5aee618acf79301a08d5efc30cc6a754d884b491fbf28bd555ac109b304725a8da1ff75c26af8d241414549957827665c9bf6299c030df5b7e71c74a4ca5886f
 DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
 EBUILD digikam-3.5.0.ebuild 4111 SHA256 d372538b818c5269d1cb5d69feb23d8bcc5e32a28651f3a3f0a9a0e456fa2fcb SHA512 f9973a8ee9bf0385b8b1a40c1c41c34400b1d1191228c16890d1677c77518aa63526e9330a26848bd419f28bff07081f37f02f4295aac0703f696c6ff9b0d7a3 WHIRLPOOL 37ac33b748e6f456663af60941fc995002c219e37ecd1b277d8b4b980edda017596e11b0bb3e7ee3bc4b2f60824b40ef548ca30285b06c6879798755410ac7e0
-EBUILD digikam-4.0.0.ebuild 4123 SHA256 f444ae5b2bd336fa9756764747da661dfbeddf8cec72f0b207c9803e6eccbf45 SHA512 d94f9e7f2d2d574ae33407e153955a81dbfb3d33e4e411b8ed10f5ff5d4a712d64668ea7c4024d7ed3bf5f301ee2cfa7e6790c1e8c73eb9f452f7fd710ce201f WHIRLPOOL 1cac3eee95763cc96038feb0e3b11aebef2fb02a85b1bb3d6082cf3b8ecbea132cb411dc2e921e2a734206b18866541222d3fb37109dbbfb03e7c940db07f374
-EBUILD digikam-4.2.0.ebuild 4173 SHA256 1e4a8b893779bf01fc127effec2c4649d51480ae907ed61306409bd26cb638c2 SHA512 1a5b8d13d1b43c5e669ef07ca43c5e4f897a81f5317b140193f5421733c4cff3572a5cecce60de52b75fbaa0e6b8e812bb5e7d9e6bee3a0dc939cc9c5071b3fe WHIRLPOOL 579d78540aaa5bece8983b0b18328104dc6ccd5fe76d636f4acbdc9f08386f84cb53cd64d215dd51c8fe004122d2b13aec321c4b8dcea2628edc92b6f368eb8c
-EBUILD digikam-4.4.0-r1.ebuild 4635 SHA256 00d42c0a3b521c03e0d8a9cf90cf7dc9608f474581166e223b431b9a0d972b71 SHA512 05ed54ae83c6ad91ac494982d796e96bb1610cfb10f6cc621f88dd2cb6dfd9c106bccbd190559168f3ecdf0960fa1deeb78fca869d748c394edf4e5c28be5842 WHIRLPOOL 68de9f19cb44e311e680b27cc0a85c778f916d59586ffc1c26fec68d747a7deffe2c90a6c3f33a8aa99bdd95701480660f7f2360b81c84fd954391fef2ce22be
-EBUILD digikam-4.4.0.ebuild 4333 SHA256 ec5b3765a88777a05cf6b38b6965f153a928ae2ef0b0ec2403957e5ef98c1ab8 SHA512 ff30494714a4e1cf90a9562c753039593a2d9c53a727bf075dfe81d0f92409854bfacb8d07bdd059d8d8b21eb76645147bd66a54ab68e23c74dd06b784afaeb5 WHIRLPOOL 1ff613beb006c2f442645c6400b94cd285330646ced6c6541b0ea2bbf506386a0011e59be5a62e48486bd21ca0e4be09a4e6dd8d880690344175df8a27e51550
-MISC ChangeLog 44416 SHA256 62598755817744a018b0facbf6cb548da015ca6b563d167e448368f0a4a48032 SHA512 a616273ff1b567c8eab1a72cec872e498a1652d3277e2e83d7f36f4a51f48751d39a459cde7d6a22776d0b26e99b3f35e730e1d0808a9470c2c0d376fe3505f6 WHIRLPOOL a4bd1dbe05105a81c75753067e278e56ce02f5801609e0d3ef4c440982e0545bd395dd99e86c16491942bc1b30a0e867aa1447df6c5b2408942820cbf56dcccb
+EBUILD digikam-4.4.0-r1.ebuild 4639 SHA256 637aec1c6c7b6bc12bad9e732d9f55f4856ac7ebdbdbcb685f2cb0c15ef505f6 SHA512 185b59d28596eb400e6d4e39724664fa6773df7308ecf727c73145b7ab1ecab1eb4332da5f1ab2f1b28020453de0779465a9958ed75b6867de37bb77e1b03ef4 WHIRLPOOL 111b7907676a82a79ade34c86608cb88776bf3fb8fb8a12db8c4029d21d7aa51fde86d2f0072a2a0ee4018fc8b339bdce95cd783d7df95ad98c85ad08bb8be7f
+MISC ChangeLog 44630 SHA256 60951768d407bc4c1f208cbef875a9a2d4cdf29ca18c05353f0236b478d198f1 SHA512 5b47e3e43189ac755fed374c44a9b2a3890a74cae9792bb06785e9ded7f2f9c17af7222ee955c17314bddfc83028d2651eeed71ae04a105c8d96445480d73536 WHIRLPOOL c7e0cf03583b7a3458e6705f9d25ceb2e4a19bb3a28542a6d42fe78b14dd1c181291c254290fa1c988261b66b7e20659a6d5e7350301ccc6d9a5f76295385739
 MISC metadata.xml 736 SHA256 86156e040ab866e9a95236a9e4a3943b02ed4b9309e688b0217a7449e9601613 SHA512 d19e6e93b72c8141e778c36b0cd032db08ad2a87fc8f8325a32ab5df3c457787520267a8b86cce7272590d971de835fdf647a1a84a4c7d4c656f605dfe42d01e WHIRLPOOL bcb65d07cc4325fbde7b748da9977ddccb52097398cb0ab9db9599505a477bff1c97388c8143fc747d854d42ecab534d81160cb09c9e868b7c63f7bcea3c53f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUluC8AAoJEJS/30SErRQvHL0P/jXvRGUjlSa7T5QEah6HQ8VG
+PYY96QQYmx2JTBgLuXaONgCiPEn/HGZ7FXTQku2WVLzYJNGsdM5mgZboPSzJYmvj
+KG+MHmSkMQ5b99C2gYl+jdte4HEFo4jYy1oejt5ZZ2TxSwDSDbmXlkmMQZ/sRivf
+ghNbxnHsCfyBO1iAnXZsVKRwm3a73oGIKWhUHXWxv9z1kCw/TlgZ+CfKuL2l46ft
+WbmBCj9dRCd8zAAjuuBbR1NFjo0iADiAo60+doEVlP5ChkNB6RzXtWvEUQk1J6WP
+DjhL8rrtOOz+unhuh+ybfGcr++anHcPSBw3aD/H4+LaRlGagZllaxAfwLp/H1e0f
+p6hTr/gZ3z0gHd5ckNAodWuylS3UoxPMhzmYM2+dv4QJU5vM5rNyymAwYmCgKK/u
+0v7nbaY/87x1HRpYZ8iWoKEp+O8/17f0n2YPFnSs7jgBmiq5gC9qsVfRzUFrNyhI
+u2q6zuFJyoke/h1Mixsp0GEu9RuSBg6xtqzF1NcudSsA16DwVvsR6Vq5zOg1leAa
+e7GP6iRGG2mPCOJFJIhvYouf6nU+5WWgu68R2YH6WgWnvyaYJC9cONLusF99Cv1x
+dt8spiG4hJgupKMBaAnep158nE/4HBT4K5jCQdzGJ75dwXditYOgBfd9FBrKwftI
+q8NmnYr0CHm/hZdEKhE6
+=KIxt
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-4.0.0.ebuild b/media-gfx/digikam/digikam-4.0.0.ebuild
deleted file mode 100644
index d1bbdbff5826..000000000000
--- a/media-gfx/digikam/digikam-4.0.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.0.0.ebuild,v 1.1 2014/06/07 13:57:37 dilfridge Exp $
-
-EAPI=5
-
-KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
-hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
-rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-CMAKE_MIN_VERSION="2.8"
-KDE_MINIMAL="4.10"
-
-KDE_DOC_DIRS="doc-digikam doc-showfoto"
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Digital photo management application for KDE"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 mysql nepomuk themedesigner +thumbnails video"
-
-CDEPEND="
-	$(add_kdebase_dep kdebase-kioslaves)
-	kde-base/libkdcraw:4=
-	kde-base/libkexiv2:4=
-	$(add_kdebase_dep libkipi)
-	kde-base/marble:4=[plasma]
-	media-libs/jasper
-	media-libs/lcms:2
-	media-libs/lensfun
-	>=media-libs/libkface-3.3.0
-	media-libs/libkgeomap
-	media-libs/liblqr
-	>=media-libs/libpgf-6.12.27
-	media-libs/libpng:0=
-	media-libs/tiff
-	virtual/jpeg
-	dev-qt/qtgui:4
-	|| ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	gphoto2? ( media-libs/libgphoto2:= )
-	mysql? ( virtual/mysql )
-	nepomuk? (
-		dev-libs/shared-desktop-ontologies
-		dev-libs/soprano
-		$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
-		$(add_kdebase_dep nepomuk-core)
-	)
-"
-RDEPEND="${CDEPEND}
-	$(add_kdebase_dep kreadconfig)
-	media-plugins/kipi-plugins
-	video? (
-		|| (
-			$(add_kdebase_dep mplayerthumbs)
-			$(add_kdebase_dep ffmpegthumbs)
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-RESTRICT=test
-# bug 366505
-
-src_prepare() {
-	# just to make absolutely sure
-	rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
-	# prepare the handbook
-	mkdir doc-digikam doc-showfoto || die
-	echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
-	echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
-	sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
-
-	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
-	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-	echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
-	kde4-base_src_prepare
-
-	if use handbook; then
-		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
-		echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
-	fi
-}
-
-src_configure() {
-	# LQR = only allows to choose between bundled/external
-	local mycmakeargs=(
-		-DENABLE_LCMS2=ON
-		-DFORCED_UNBUNDLE=ON
-		-DWITH_LQR=ON
-		-DWITH_LENSFUN=ON
-		$(cmake-utils_use_with addressbook KdepimLibs)
-		-DWITH_MarbleWidget=ON
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_with nepomuk Soprano)
-		$(cmake-utils_use_enable themedesigner)
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
-		$(cmake-utils_use_enable mysql INTERNALMYSQL)
-		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
-		$(cmake-utils_use_enable nepomuk NEPOMUKSUPPORT)
-	)
-
-	kde4-base_src_configure
-}
-
-src_compile() {
-	local mytargets="all"
-	use doc && mytargets+=" doc"
-
-	kde4-base_src_compile ${mytargets}
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		# install the api documentation
-		insinto /usr/share/doc/${PF}/
-		doins -r ${CMAKE_BUILD_DIR}/api/html
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use doc; then
-		einfo "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
-	fi
-}
diff --git a/media-gfx/digikam/digikam-4.2.0.ebuild b/media-gfx/digikam/digikam-4.2.0.ebuild
deleted file mode 100644
index f8d7460e9e82..000000000000
--- a/media-gfx/digikam/digikam-4.2.0.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.2.0.ebuild,v 1.3 2014/10/30 20:08:53 dilfridge Exp $
-
-EAPI=5
-
-KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
-hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
-rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-CMAKE_MIN_VERSION="2.8"
-KDE_MINIMAL="4.10"
-
-KDE_DOC_DIRS="doc-digikam doc-showfoto"
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Digital photo management application for KDE"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 mysql nepomuk test themedesigner +thumbnails video"
-
-CDEPEND="
-	$(add_kdebase_dep kdebase-kioslaves)
-	kde-base/libkdcraw:4=
-	kde-base/libkexiv2:4=
-	$(add_kdebase_dep libkipi)
-	kde-base/marble:4=[plasma]
-	media-libs/jasper
-	media-libs/lcms:2
-	<media-libs/lensfun-0.3.0
-	>=media-libs/libkface-3.3.0
-	media-libs/libkgeomap
-	media-libs/liblqr
-	>=media-libs/libpgf-6.12.27
-	media-libs/libpng:0=
-	media-libs/tiff
-	virtual/jpeg
-	dev-qt/qtgui:4
-	|| ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	gphoto2? ( media-libs/libgphoto2:= )
-	mysql? ( virtual/mysql )
-	nepomuk? (
-		dev-libs/shared-desktop-ontologies
-		dev-libs/soprano
-		$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
-		$(add_kdebase_dep nepomuk-core)
-	)
-"
-RDEPEND="${CDEPEND}
-	$(add_kdebase_dep kreadconfig)
-	media-plugins/kipi-plugins
-	video? (
-		|| (
-			$(add_kdebase_dep mplayerthumbs)
-			$(add_kdebase_dep ffmpegthumbs)
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-	test? ( media-libs/opencv )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-RESTRICT=test
-# bug 366505
-
-src_prepare() {
-	# just to make absolutely sure
-	rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
-	# prepare the handbook
-	mkdir doc-digikam doc-showfoto || die
-	echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
-	echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
-	sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
-
-	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
-	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-	echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
-	kde4-base_src_prepare
-
-	if use handbook; then
-		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
-		echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
-	fi
-}
-
-src_configure() {
-	# LQR = only allows to choose between bundled/external
-	local mycmakeargs=(
-		-DENABLE_LCMS2=ON
-		-DFORCED_UNBUNDLE=ON
-		-DWITH_LQR=ON
-		-DWITH_LENSFUN=ON
-		$(cmake-utils_use_enable addressbook KDEPIMLIBSSUPPORT)
-		-DWITH_MarbleWidget=ON
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_with nepomuk Soprano)
-		$(cmake-utils_use_enable themedesigner)
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
-		$(cmake-utils_use_enable mysql INTERNALMYSQL)
-		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
-		$(cmake-utils_use_enable nepomuk NEPOMUKSUPPORT)
-	)
-
-	kde4-base_src_configure
-}
-
-src_compile() {
-	local mytargets="all"
-	use doc && mytargets+=" doc"
-
-	kde4-base_src_compile ${mytargets}
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		# install the api documentation
-		insinto /usr/share/doc/${PF}/
-		doins -r ${CMAKE_BUILD_DIR}/api/html
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use doc; then
-		einfo "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
-	fi
-}
diff --git a/media-gfx/digikam/digikam-4.4.0-r1.ebuild b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
index 340d4afdbc5b..ab4cfa34f033 100644
--- a/media-gfx/digikam/digikam-4.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.6 2014/12/17 23:03:05 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.7 2014/12/21 14:59:44 dilfridge Exp $
 
 EAPI=5
 
@@ -45,7 +45,7 @@ CDEPEND="
 	media-libs/jasper
 	media-libs/lcms:2
 	media-libs/lensfun
-	|| ( kde-apps/libkface:4 >=media-libs/libkface-3.3.0 )
+	|| ( kde-apps/libkface:4 <=media-libs/libkface-4.4.0 )
 	media-libs/libkgeomap
 	media-libs/liblqr
 	>=media-libs/libpgf-6.12.27
diff --git a/media-gfx/digikam/digikam-4.4.0.ebuild b/media-gfx/digikam/digikam-4.4.0.ebuild
deleted file mode 100644
index 3f89fde604c7..000000000000
--- a/media-gfx/digikam/digikam-4.4.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0.ebuild,v 1.1 2014/10/30 20:06:36 dilfridge Exp $
-
-EAPI=5
-
-KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
-hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
-rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-CMAKE_MIN_VERSION="2.8"
-KDE_MINIMAL="4.10"
-
-KDE_DOC_DIRS="doc-digikam doc-showfoto"
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Digital photo management application for KDE"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 mysql nepomuk semantic-desktop themedesigner +thumbnails video"
-
-CDEPEND="
-	$(add_kdebase_dep kdebase-kioslaves)
-	kde-base/libkdcraw:4=
-	kde-base/libkexiv2:4=
-	$(add_kdebase_dep libkipi)
-	kde-base/marble:4=[plasma]
-	media-libs/jasper
-	media-libs/lcms:2
-	media-libs/lensfun
-	>=media-libs/libkface-3.3.0
-	media-libs/libkgeomap
-	media-libs/liblqr
-	>=media-libs/libpgf-6.12.27
-	media-libs/libpng:0=
-	>=media-libs/opencv-2.4.9
-	media-libs/tiff
-	virtual/jpeg
-	dev-qt/qtgui:4
-	|| ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	gphoto2? ( media-libs/libgphoto2:= )
-	mysql? ( virtual/mysql )
-	nepomuk? (
-		dev-libs/shared-desktop-ontologies
-		dev-libs/soprano
-		$(add_kdebase_dep kdelibs 'semantic-desktop(+)')
-		$(add_kdebase_dep nepomuk-core)
-	)
-	semantic-desktop? (
-		$(add_kdebase_dep baloo)
-	)
-"
-RDEPEND="${CDEPEND}
-	$(add_kdebase_dep kreadconfig)
-	media-plugins/kipi-plugins
-	video? (
-		|| (
-			$(add_kdebase_dep mplayerthumbs)
-			$(add_kdebase_dep ffmpegthumbs)
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=( "${FILESDIR}/${P}-libkexiv2.patch" )
-
-src_prepare() {
-	# just to make absolutely sure
-	rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
-	# prepare the handbook
-	mkdir doc-digikam doc-showfoto || die
-	echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
-	echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
-	sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
-
-	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
-	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-	echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
-	kde4-base_src_prepare
-
-	if use handbook; then
-		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
-		echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
-	fi
-}
-
-src_configure() {
-	# LQR = only allows to choose between bundled/external
-	local mycmakeargs=(
-		-DENABLE_LCMS2=ON
-		-DFORCED_UNBUNDLE=ON
-		-DWITH_LQR=ON
-		-DWITH_LENSFUN=ON
-		$(cmake-utils_use_enable addressbook KDEPIMLIBSSUPPORT)
-		-DWITH_MarbleWidget=ON
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_with nepomuk Soprano)
-		$(cmake-utils_use_enable themedesigner)
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
-		$(cmake-utils_use_enable mysql INTERNALMYSQL)
-		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
-		$(cmake-utils_use_enable nepomuk NEPOMUKSUPPORT)
-		$(cmake-utils_use_enable semantic-desktop BALOOSUPPORT)
-	)
-
-	kde4-base_src_configure
-}
-
-src_compile() {
-	local mytargets="all"
-	use doc && mytargets+=" doc"
-
-	kde4-base_src_compile ${mytargets}
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		# install the api documentation
-		insinto /usr/share/doc/${PF}/
-		doins -r ${CMAKE_BUILD_DIR}/api/html
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use doc; then
-		einfo "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
-	fi
-}