Depend on virtual/jpeg

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 100 insertions, 18 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 468c2fff78be..11c6a4312cdf 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.79 2010/11/01 18:59:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.80 2010/11/08 21:32:43 dilfridge Exp $
+
+*kipi-plugins-1.2.0-r3 (08 Nov 2010)
+
+  08 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kipi-plugins-1.2.0-r3.ebuild, kipi-plugins-1.5.0.ebuild:
+  Depend on virtual/jpeg
 
   01 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org>
   -kipi-plugins-0.8.0.ebuild, -kipi-plugins-1.4.0.ebuild:
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 36a97aabaf14..3416d4b83e4d 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -8,23 +8,24 @@ DIST kipi-plugins-1.2.0.tar.bz2 4597178 RMD160 bbf79302bedab7cd55e9d7d91253261e9
 DIST kipi-plugins-1.5.0.tar.bz2 4429371 RMD160 f635480bde7d5a8bec6602d7eaee18552a511ad8 SHA1 047b7d70bb0b6f8afc916857db61ab51a466aaa4 SHA256 7ccd0529ff80a3d5ed25d50b7301b200f0eb6b5da3b8b4aa6bdf63bd288058f3
 DIST kipi-plugins-doc-1.5.0.tar.bz2 1689039 RMD160 f4342798caf14817b96afdb11959f53ab175ae1d SHA1 55a57e1fffbd291ed2f31dbbe840ccd85cb499cc SHA256 13dfda13a1f5e276020dbae3f7c2227f5cc1ac4264070250eeff0a3eb59b67cf
 EBUILD kipi-plugins-1.2.0-r2.ebuild 2227 RMD160 64ddb75fd9f49bce30f2368a91803de47e157750 SHA1 483a48bf19dc52d9520ab4e3a6cc4906d212c5ec SHA256 0a741543a5b8224fb29c13891287e9b98c186aad8de3d71972bfce2e55a160a3
-EBUILD kipi-plugins-1.5.0.ebuild 2537 RMD160 2c39f1cae96213fbf2deb240f46a3d1cca397348 SHA1 77e938206ff9ee00c3e9141952caedc2510c39c7 SHA256 b008b560aef0305577c3e72d17b4dcb830748ef436ebdc536f0fc80b483b26f8
-MISC ChangeLog 13842 RMD160 5d6c83b58531fba94cac7ed7c0053bbe6aaa0678 SHA1 cd7ef1cdd9ee1ad0ab5cb8021d7edb5f4df02299 SHA256 8329bc17e9a4e056c9b01cdce5ae993cb3fbb68348daa43bf01cdbd0a0d565b7
+EBUILD kipi-plugins-1.2.0-r3.ebuild 2225 RMD160 58b4662ca05bd880c264fe9da6e046d8114f8b90 SHA1 e780984c026c2b46360d3a1fd421536d3ae8f215 SHA256 5d5ec8b017331ed28a8294cf024c8ef43e65d06ba1b742ec8a7898f3b4d91bd7
+EBUILD kipi-plugins-1.5.0.ebuild 2529 RMD160 5f4e7e7f61d7208aa9788963d3821137f988d9f8 SHA1 a1cdbdac99e22f7b8a72a8e3b987c4efdd19fe24 SHA256 cca81375ca3d2158cf58f27b5f92913e632ed395c5c250fdf786c70a77eba6f3
+MISC ChangeLog 14023 RMD160 70b98cd9e1c76e4b66b0ff1a771700a3ff0b3379 SHA1 4c0aa6d4502cc68e79bb8a1f86634e472a4a8520 SHA256 75259ef7b40eb59bc2f27a321a69ec97332a1f6df04439d5599f2bc9ee2a4505
 MISC metadata.xml 442 RMD160 3ebeb3175e61f59febadca1633f0f7dbb60dc011 SHA1 cc18d6adaa318b095bdd00b3c37e59fb7f621055 SHA256 41b0a7ff3057182bd5d434dbe6643a95714f54c75ffc0a33625725fa0a8bd57b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMzxwXAAoJENwGBM22xffeApYP+wR3fns8fD0XjdMtIaJ/B2NA
-CvYHeaYmR8lrYedeCp1XWsB8KzBle2qfDR9pcbmYq9qywU8mm/GNfweVxtc9+kaA
-e0pQALp1kUF39NK/Spl5TRr7ItAOKyPyO+x2GrTPrad8pz63Wef1MHsZICBphFMp
-0fzBte+Rm+ekVRtvNVknFnoLAeJnBI5T8GoE3MuU5KmKq2Jg6KPiumsTzA0i18xF
-BrYdGdTvjJe5unHZfTCv2VD/ktimL1Tn9dlwjzJthd5Nn49B7vkvugB8nKCnqEUx
-Tj6DZ76gapm4z1yKnlA4/+7SPnNBez/ENCpE8x8JttejlwUpW1lI/QwAIQMbLrt1
-iOkY4TxiQiPGL8HzzAuxT/fijzZq29slJh7HG32glpoaHvpQfmzScM1eWMoesmH9
-RyZy9Zg71QpmmZp9ffuzvLv4umgdcFcqRkaen7rfJCr5nohv+wM1yEpwBNSK+Wvz
-SjFMyFmGCTaOwdDLfMsiJwwhll+8FlMkhztQzuR8YluiQPoDP1otO/SQ4GJQdOIT
-mJ13jqpGNmwThjqUcyL1pahS8Ic+jtNwMfhLt56yX9SXKwPzwyAt4setvtZx9+Z9
-1ZYRP+OK5HIa8bzeogYRlmkv8si/+eRXw9mCnM0JgxINNUcpFsitMy0pXdna0lD2
-2Gev4UTlXqKhIPDJdGqQ
-=kWjG
+iQIcBAEBAgAGBQJM2GwcAAoJENwGBM22xffeGzoQAJ3XTjasBoSnTJP9PF/9r8fX
+f6Kr3W0VjUsEUvNnoD7RaAQKPAgI6MRK6F1S13jMBY5VHs5VkaRGVL8/fbukpaaq
+UHvcNM+vuc/Wja0HB8V3I1IW0PCs6GP6QiVYg7jLhBStcP+7Cfq1K6Sv/fiFEjiU
+aCpY45Qo07KaPmGl8OnByXVZ1ckrzzfm3nqOBv/R0nHNicmRNsLabzmpcG7IrhOX
+FGMKd6WAr5/6ZO2SFl2D29Yb3WYxDsn0p+tAzdaMWcfrW7DzA2bz6hkR5Cn4BJIQ
+iuu2qp0KK5FgkkC3JjkxcbuRMS2jvpfGij+vckCpH0ROnGj+pSc33xBJ2JV08FPe
+U8feCSIBXSbWbAM3mB+z0dfDrVn8y+EB66eIS6c/Czq+gX+pdSyD9IOWNJe4iGz2
+GV1hxd1HdGy8/JI1HgvG6XAY9aAN9dZiKGrGM7UJ3zlBmhKYAQUEj1t9urVhxRM9
+boXsDb2nnkfE8AEC4/XpkYvKTNmbB4zRejyY2mRlmylABAeMJJdBL+MYXK9MUOGz
+RKeN27dbe9QYMa2/T6WFzz9KnTZnoE2ORKQdY+zJ9daN4zx5G1Q5smHhtwoJzM4u
+ZTbKI/fMUdmoMJIi3x+MIGG4D3Xy6MKVz1KM9JEj66m3fy8Oyz8SjDbvjOTaEphJ
+yj+OhMNHnEN+O52l9ahT
+=by7N
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/kipi-plugins-1.2.0-r3.ebuild b/media-plugins/kipi-plugins/kipi-plugins-1.2.0-r3.ebuild
new file mode 100644
index 000000000000..362f3e74fc41
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-1.2.0-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-1.2.0-r3.ebuild,v 1.1 2010/11/08 21:32:43 dilfridge Exp $
+
+EAPI="2"
+
+OPENGL_REQUIRED="optional"
+KDE_LINGUAS="ar be ca cs da de el en_GB 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 zh_CN zh_TW"
+KMNAME="extragear/graphics"
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="Plugins for the KDE Image Plugin Interface"
+HOMEPAGE="http://www.kipi-plugins.org"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/kipi/${P}.tar.bz2 mirror://gentoo/${P}-jpeg.patch.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="cdr calendar crypt debug expoblending +imagemagick ipod mjpeg redeyes scanner"
+
+DEPEND="
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/libxml2-2.7
+	>=dev-libs/libxslt-1.1
+	>=kde-base/libkdcraw-${KDE_MINIMAL}
+	>=kde-base/libkexiv2-${KDE_MINIMAL}
+	>=kde-base/libkipi-${KDE_MINIMAL}
+	virtual/jpeg
+	>=media-libs/libpng-1.2
+	>=media-libs/tiff-3.6
+	calendar? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
+	crypt? ( app-crypt/qca:2 )
+	ipod? (
+		>=media-libs/libgpod-0.7
+		x11-libs/gtk+:2
+	)
+	redeyes? ( >=media-libs/opencv-1.0 )
+	scanner? (
+		>=kde-base/libksane-${KDE_MINIMAL}
+		media-gfx/sane-backends
+	)
+"
+RDEPEND="${DEPEND}
+	cdr? ( app-cdr/k3b )
+	expoblending? ( media-gfx/hugin )
+	imagemagick? ( >=media-gfx/imagemagick-5.5.4 )
+	mjpeg? ( media-video/mjpegtools )
+"
+
+PATCHES=( "${DISTDIR}/${P}-jpeg.patch.bz2"
+	"${FILESDIR}/${P}-expoblending.patch" )
+
+src_configure() {
+	# Remove flags -floop-block -floop-interchange
+	# -floop-strip-mine due to bug #305443.
+	filter-flags -floop-block
+	filter-flags -floop-interchange
+	filter-flags -floop-strip-mine
+
+	mycmakeargs+=(
+		$(cmake-utils_use_with ipod GLIB2)
+		$(cmake-utils_use_with ipod GObject)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with ipod Gpod)
+		$(cmake-utils_use_with calendar KdepimLibs)
+		$(cmake-utils_use_with redeyes OpenCV)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with scanner Sane)
+		$(cmake-utils_use_enable expoblending)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-1.5.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-1.5.0.ebuild
index a52cf697d419..d2d2a6737719 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-1.5.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-1.5.0.ebuild,v 1.2 2010/10/16 17:59:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-1.5.0.ebuild,v 1.3 2010/11/08 21:32:43 dilfridge Exp $
 
 EAPI="2"
 
@@ -29,7 +29,7 @@ DEPEND="
 	>=kde-base/libkdcraw-${KDE_MINIMAL}
 	>=kde-base/libkexiv2-${KDE_MINIMAL}
 	>=kde-base/libkipi-${KDE_MINIMAL}
-	>=media-libs/jpeg-6b
+	virtual/jpeg
 	>=media-libs/libpng-1.2
 	>=media-libs/tiff-3.6
 	calendar? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )