Version bump; cleanup

(Portage version: 2.1.9.41/cvs/Linux x86_64)

3 files changed, 105 insertions, 15 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 388b890e9ff3..0b475eb16064 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.89 2011/02/11 20:29:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.90 2011/03/01 20:25:02 dilfridge Exp $
+
+*kipi-plugins-1.9.0 (01 Mar 2011)
+
+  01 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/kipi-plugins-1.3.0-expoblending.patch, +kipi-plugins-1.9.0.ebuild:
+  Version bump; cleanup
 
   11 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
   kipi-plugins-1.2.0-r3.ebuild, kipi-plugins-1.8.0.ebuild:
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-1.3.0-expoblending.patch b/media-plugins/kipi-plugins/files/kipi-plugins-1.3.0-expoblending.patch
deleted file mode 100644
index bd7554168478..000000000000
--- a/media-plugins/kipi-plugins/files/kipi-plugins-1.3.0-expoblending.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r -u kipi-plugins-1.3.0.orig/CMakeLists.txt kipi-plugins-1.3.0/CMakeLists.txt
---- kipi-plugins-1.3.0.orig/CMakeLists.txt	2010-06-08 00:08:13.000000000 +0200
-+++ kipi-plugins-1.3.0/CMakeLists.txt	2010-07-10 22:02:30.111202256 +0200
-@@ -321,7 +321,10 @@
-     ADD_SUBDIRECTORY(smug)
-     ADD_SUBDIRECTORY(facebook)
-     ADD_SUBDIRECTORY(printimages)
-+
-+    IF(ENABLE_expoblending)
-     ADD_SUBDIRECTORY(expoblending)
-+    ENDIF(ENABLE_expoblending)
- 
-     # Plugins which are optional depencies.
- 
diff --git a/media-plugins/kipi-plugins/kipi-plugins-1.9.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-1.9.0.ebuild
new file mode 100644
index 000000000000..5a5fd4424aa0
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-1.9.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2011 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.9.0.ebuild,v 1.1 2011/03/01 20:25:02 dilfridge Exp $
+
+EAPI=3
+
+OPENGL_REQUIRED="optional"
+KDE_LINGUAS="ar ast be bg ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl he hi hne hr hu is it ja km ko
+lt lv mai 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"
+KDE_MINIMAL="4.5"
+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
+	handbook? ( mirror://gentoo/${PN}-doc-1.5.0.tar.bz2 )"
+
+LICENSE="GPL-2
+	handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="4"
+IUSE="cdr calendar crypt debug expoblending handbook +imagemagick ipod mjpeg redeyes scanner"
+
+DEPEND="
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/libxml2-2.7
+	>=dev-libs/libxslt-1.1
+	dev-libs/qjson
+	$(add_kdebase_dep libkdcraw)
+	$(add_kdebase_dep libkexiv2)
+	$(add_kdebase_dep libkipi)
+	virtual/jpeg
+	media-libs/libpng
+	media-libs/tiff
+	calendar?	( $(add_kdebase_dep kdepimlibs) )
+	crypt?		( app-crypt/qca:2 )
+	ipod?		(
+			  media-libs/libgpod
+			  x11-libs/gtk+:2
+			)
+	redeyes?	( media-libs/opencv )
+	scanner? 	(
+			  $(add_kdebase_dep libksane)
+			  media-gfx/sane-backends
+			)
+"
+RDEPEND="${DEPEND}
+	cdr? 		( app-cdr/k3b )
+	expoblending? 	( media-gfx/hugin )
+	imagemagick? 	( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
+	mjpeg? 		( media-video/mjpegtools )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.7.0-expoblending.patch" )
+
+src_prepare() {
+	if use handbook; then
+		mv "${WORKDIR}/${PN}"-1.5.0/* "${S}/" || die
+		echo "add_subdirectory( doc )" >> CMakeLists.txt
+	else
+		mkdir doc || die
+		echo >> doc/CMakeLists.txt || die
+	fi
+
+	kde4-base_src_prepare
+}
+
+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
+}
+
+src_install() {
+	kde4-base_src_install
+
+	if use handbook; then
+		dodoc readme-handbook.txt || die
+	fi
+}