4 files changed, 13 insertions, 80 deletions
diff --git a/media-libs/libkface/ChangeLog b/media-libs/libkface/ChangeLog
index ee0b76d930b3..5f6ee28753ec 100644
--- a/media-libs/libkface/ChangeLog
+++ b/media-libs/libkface/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libkface
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/ChangeLog,v 1.15 2012/05/13 15:15:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/ChangeLog,v 1.16 2012/06/07 19:21:09 dilfridge Exp $
+
+*libkface-2.6.0 (07 Jun 2012)
+
+  07 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libkface-2.4.1.ebuild, -libkface-2.6.0_beta3.ebuild,
+  -libkface-2.6.0_rc.ebuild, +libkface-2.6.0.ebuild:
+  Version bump; remove old, beta, and rc
 
 *libkface-2.6.0_rc (13 May 2012)
 
diff --git a/media-libs/libkface/libkface-2.4.1.ebuild b/media-libs/libkface/libkface-2.4.1.ebuild
deleted file mode 100644
index 5915ce687acb..000000000000
--- a/media-libs/libkface/libkface-2.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/libkface-2.4.1.ebuild,v 1.3 2012/01/16 23:57:18 ago Exp $
-
-EAPI=4
-
-DIGIKAMPN=digikam
-
-KDE_LINGUAS=""
-KDE_MINIMAL="4.7"
-
-CMAKE_MIN_VERSION=2.8
-
-inherit kde4-base
-
-MY_P="${DIGIKAMPN}-${PV/_/-}"
-
-DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detection"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${DIGIKAMPN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-SLOT=4
-
-DEPEND=">=media-libs/opencv-2.1"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-src_configure() {
-	mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-	)
-	kde4-base_src_configure
-}
diff --git a/media-libs/libkface/libkface-2.6.0_beta3.ebuild b/media-libs/libkface/libkface-2.6.0.ebuild
index 29085ac30781..444de8949f1b 100644
--- a/media-libs/libkface/libkface-2.6.0_beta3.ebuild
+++ b/media-libs/libkface/libkface-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/libkface-2.6.0_beta3.ebuild,v 1.1 2012/04/08 19:47:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/libkface-2.6.0.ebuild,v 1.1 2012/06/07 19:21:09 dilfridge Exp $
 
 EAPI=4
 
@@ -13,18 +13,19 @@ CMAKE_MIN_VERSION=2.8
 
 inherit kde4-base
 
-MY_P="${DIGIKAMPN}-${PV/_/-}"
+MY_PV=${PV/_/-}
+MY_P="digikam-${MY_PV}"
+SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2"
 
 DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detection"
 HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${DIGIKAMPN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS=""
 IUSE=""
 SLOT=4
 
-DEPEND=">=media-libs/opencv-2.1"
+DEPEND="media-libs/opencv"
 RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${MY_P}/extra/${PN}
diff --git a/media-libs/libkface/libkface-2.6.0_rc.ebuild b/media-libs/libkface/libkface-2.6.0_rc.ebuild
deleted file mode 100644
index cc2ba7f626da..000000000000
--- a/media-libs/libkface/libkface-2.6.0_rc.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/libkface-2.6.0_rc.ebuild,v 1.1 2012/05/13 15:15:52 dilfridge Exp $
-
-EAPI=4
-
-DIGIKAMPN=digikam
-
-KDE_LINGUAS=""
-KDE_MINIMAL="4.8"
-
-CMAKE_MIN_VERSION=2.8
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P="digikam-software-compilation-${MY_PV}"
-SRC_URI="mirror://sourceforge/digikam/digikam/${MY_PV}/${MY_P}.tar.bz2"
-
-DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detection"
-HOMEPAGE="http://www.digikam.org/"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-SLOT=4
-
-DEPEND=">=media-libs/opencv-2.1"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-src_configure() {
-	mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-	)
-	kde4-base_src_configure
-}