Depend on virtual/jpeg

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 84 insertions, 3 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/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} )