Revision bump to drop USE redeyes because media-libs/opencv is broken. Mark -r0 stable for amd64.

(Portage version: 2.2_rc44/cvs/Linux x86_64)

3 files changed, 74 insertions, 6 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 1f79ba8eb9ca..142178808f34 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.59 2009/08/30 09:08:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.60 2009/10/10 17:00:13 ssuominen Exp $
+
+*kipi-plugins-0.6.0-r1 (10 Oct 2009)
+
+  10 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  kipi-plugins-0.6.0.ebuild, +kipi-plugins-0.6.0-r1.ebuild:
+  Revision bump to drop USE redeyes because media-libs/opencv is broken.
+  Mark -r0 stable for amd64.
 
 *kipi-plugins-0.6.0 (30 Aug 2009)
 
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.6.0-r1.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..ec8452525366
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-0.6.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.6.0-r1.ebuild,v 1.1 2009/10/10 17:00:13 ssuominen Exp $
+
+EAPI="2"
+
+OPENGL_REQUIRED="optional"
+KDE_LINGUAS="ar be ca cs da de el es et fi fr ga gl hi hne is it ja km lt lv ms nb nds nl
+nn oc pa pl pt pt_BR ro ru se sk sv th tr uk zn_CN"
+inherit kde4-base
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Plugins for the KDE Image Plugin Interface (libkipi)."
+HOMEPAGE="http://www.kipi-plugins.org"
+SRC_URI="mirror://sourceforge/kipi/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdr calendar debug +imagemagick ipod mjpeg redeyes scanner"
+SLOT="4"
+
+DEPEND="
+	>=dev-libs/expat-2.0.1
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=kde-base/libkdcraw-${KDE_MINIMAL}
+	>=kde-base/libkexiv2-${KDE_MINIMAL}
+	>=kde-base/libkipi-${KDE_MINIMAL}
+	media-libs/jpeg
+	media-libs/libpng
+	>=media-libs/tiff-3.5
+	calendar? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
+	ipod? ( media-libs/libgpod )
+	opengl? ( virtual/opengl )
+	redeyes? ( media-libs/opencv )
+	scanner? (
+		media-gfx/sane-backends
+		>=kde-base/libksane-${KDE_MINIMAL}
+	)
+"
+RDEPEND="${DEPEND}
+	cdr? ( app-cdr/k3b )
+	imagemagick? ( media-gfx/imagemagick )
+	mjpeg? ( media-video/mjpegtools )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with calendar KdepimLibs)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with scanner KSane)
+		$(cmake-utils_use_with scanner Sane)
+		$(cmake-utils_use_with ipod Gpod)
+		$(cmake-utils_use_with ipod GLIB2)
+		$(cmake-utils_use_with ipod GObject)
+		$(cmake-utils_use_with redeyes OpenCV)"
+
+	kde4-base_src_configure
+}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.6.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.6.0.ebuild
index 1e0ff9467d8d..410694e4a14f 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-0.6.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-0.6.0.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-plugins/kipi-plugins/kipi-plugins-0.6.0.ebuild,v 1.1 2009/08/30 09:08:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.6.0.ebuild,v 1.2 2009/10/10 17:00:13 ssuominen Exp $
 
 EAPI="2"
 
@@ -16,8 +16,8 @@ HOMEPAGE="http://www.kipi-plugins.org"
 SRC_URI="mirror://sourceforge/kipi/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdr calendar debug +imagemagick ipod mjpeg redeyes scanner"
+KEYWORDS="amd64 ~x86"
+IUSE="cdr calendar debug +imagemagick ipod mjpeg scanner"
 SLOT="4"
 
 DEPEND="
@@ -33,7 +33,6 @@ DEPEND="
 	calendar? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
 	ipod? ( media-libs/libgpod )
 	opengl? ( virtual/opengl )
-	redeyes? ( media-libs/opencv )
 	scanner? (
 		media-gfx/sane-backends
 		>=kde-base/libksane-${KDE_MINIMAL}
@@ -56,7 +55,7 @@ src_configure() {
 		$(cmake-utils_use_with ipod Gpod)
 		$(cmake-utils_use_with ipod GLIB2)
 		$(cmake-utils_use_with ipod GObject)
-		$(cmake-utils_use_with redeyes OpenCV)"
+		-DWITH_OpenCV=OFF"
 
 	kde4-base_src_configure
 }