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

Package-Manager: portage-2.2_rc44/cvs/Linux x86_64

4 files changed, 77 insertions, 8 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/Manifest b/media-plugins/kipi-plugins/Manifest
index 51a943f9d493..942d27b96e71 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -4,6 +4,7 @@ AUX kipi-plugins-libgpod-0.7.patch 5336 RMD160 b2cfbf87ffaf72a231b66704c15e18dd2
 DIST kipi-plugins-0.1.7.tar.bz2 8836654 RMD160 f66473c11e66f9e06aa6772c7952b640b565def9 SHA1 520b6b9d36a8c5b8893c3a6b5a1a14f6b9cbd216 SHA256 3c8a73d0658935b75fc0e0ed48f66cd72225249152bce969f4c9676c7038124b
 DIST kipi-plugins-0.6.0.tar.bz2 3731330 RMD160 a4e407c51c0e45bcb172b58cab28bda9c778e312 SHA1 52c63c50a74e12218ae455615fc7dd877de42f6b SHA256 b219a1b0d63849563bf87fade0cd107aa8cdeb6fafa0bc10734beaf812cf9a6a
 EBUILD kipi-plugins-0.1.7.ebuild 1978 RMD160 40f93a894d6d78636204ce4c078e001104e6b119 SHA1 a420276ba8f4f64ea7952d5df9e9cfb7eb7c72d1 SHA256 41104d1310d6335bb7337bd849edaeaa59faf3fc8dc7989cbd805b1516c6f5bd
-EBUILD kipi-plugins-0.6.0.ebuild 1724 RMD160 2686392d28496837879dbbfb52ab7e11fe2e41bd SHA1 71e98cd9f0874b8e78d170862d3a8fd83871436b SHA256 c20c923b46cf6b49deb1543862a30b7533494830d3478d3f8673a39eb66b0f31
-MISC ChangeLog 10756 RMD160 b038cc3d0f8463f98c49b0d8c79fe061d521e8ec SHA1 dc13ff0830cf270991aea11dd608dd48ca152019 SHA256 9c28e7fafa2a14bc633a575d91f9dd17a2e5143ce4da422d64f8681044118444
+EBUILD kipi-plugins-0.6.0-r1.ebuild 1727 RMD160 093455f6fa4dbad1f3663f430f4643ec334ec56b SHA1 b3b84a6724e8314611a57476c1ed5a6a2a1eb794 SHA256 2b0ba74fd46d1704d914f69a909082793005a0f589d0bd3674fc2c6e81c1a1ca
+EBUILD kipi-plugins-0.6.0.ebuild 1662 RMD160 86d6d9768b7953228c2a7ede3193924ce3c1c793 SHA1 a1a7ef90eda240f19740a342d52d550652aa26cb SHA256 f295c1ac58dbdf633f496e2059e7e05b6f0b1633ca17550cfc1b305f5a8de70c
+MISC ChangeLog 11011 RMD160 5e3d55be00690faeda3e5ed4401d2f532fc88dac SHA1 518d186e89240ce4d36f89fcf7d718bc5e7917d9 SHA256 2538e0f1345a1caabb93f9211b2fde5276a303b29aefe8b29a84f6c659026cc2
 MISC metadata.xml 334 RMD160 e2eb335e36d56e157d7ec99a4e69dc9363d7030b SHA1 c011597782306d847f8c99e16aa39fb7dbf72f24 SHA256 9fc059997dc429d52b950644823e1b1ac5b623d822025b741f5f851919826e42
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
 }