[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/files/, media-plugins/kipi-plugins/

[Andreas Hüttel]

commit:     3731c37ac247cb3740e1bed11300a76df6d13ff0
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Jul 27 21:05:44 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 21:05:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3731c37a

[media-plugins/kipi-plugins] Moved to main tree

---
 .../files/kipi-plugins-1.7.0-expoblending.patch    |   16 ----
 .../kipi-plugins/kipi-plugins-2.0.0_beta6.ebuild   |   94 --------------------
 .../kipi-plugins/kipi-plugins-2.0.0_rc.ebuild      |   93 -------------------
 media-plugins/kipi-plugins/metadata.xml            |   13 ---
 4 files changed, 0 insertions(+), 216 deletions(-)

diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-1.7.0-expoblending.patch b/media-plugins/kipi-plugins/files/kipi-plugins-1.7.0-expoblending.patch
deleted file mode 100644
index 3f7fdf6..0000000
--- a/media-plugins/kipi-plugins/files/kipi-plugins-1.7.0-expoblending.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN kipi-plugins-1.7.0.orig/CMakeLists.txt kipi-plugins-1.7.0/CMakeLists.txt
---- kipi-plugins-1.7.0.orig/CMakeLists.txt	2010-12-19 10:44:04.000000000 +0100
-+++ kipi-plugins-1.7.0/CMakeLists.txt	2010-12-28 18:11:40.000000000 +0100
-@@ -358,7 +358,11 @@
-     ADD_SUBDIRECTORY(smug)
-     ADD_SUBDIRECTORY(facebook)
-     ADD_SUBDIRECTORY(printimages)
--    ADD_SUBDIRECTORY(expoblending)
-+
-+    IF(ENABLE_expoblending)
-+        ADD_SUBDIRECTORY(expoblending)
-+    ENDIF(ENABLE_expoblending)
-+
-     ADD_SUBDIRECTORY(kopete)
- 
-     # Plugins which are optional depencies.

diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.0.0_beta6.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.0.0_beta6.ebuild
deleted file mode 100644
index 18af48d..0000000
--- a/media-plugins/kipi-plugins/kipi-plugins-2.0.0_beta6.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-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"
-
-KDE_MINIMAL="4.5"
-inherit flag-o-matic kde4-base
-
-KDEGRAPHICS_MINIMAL="4.6.30"
-# please leave the weird number here for the moment
-
-MY_P="digikam-${PV/_/-}"
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~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
-	>=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
-	>=kde-base/libkexiv2-${KDEGRAPHICS_MINIMAL}
-	>=media-libs/libkmap-${PV}
-	>=media-libs/libmediawiki-${PV}
-	$(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? 	(
-			  >=kde-base/libksane-${KDEGRAPHICS_MINIMAL}
-			  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 )
-"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-PATCHES=( "${FILESDIR}/${PN}-1.7.0-expoblending.patch" )
-
-src_prepare() {
-	mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
-	if use handbook; then
-		echo "add_subdirectory( doc )" >> CMakeLists.txt
-	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
-}

diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.0.0_rc.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.0.0_rc.ebuild
deleted file mode 100644
index 0b17744..0000000
--- a/media-plugins/kipi-plugins/kipi-plugins-2.0.0_rc.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-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"
-
-inherit flag-o-matic kde4-base
-
-KDEGRAPHICS_MINIMAL="4.6.31"
-# please leave the weird number here for the moment
-
-MY_P="digikam-${PV/_/-}"
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~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
-	>=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
-	>=kde-base/libkexiv2-${KDEGRAPHICS_MINIMAL}
-	>=media-libs/libkmap-${PV}
-	>=media-libs/libmediawiki-${PV}
-	$(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? 	(
-			  >=kde-base/libksane-${KDEGRAPHICS_MINIMAL}
-			  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 )
-"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-PATCHES=( "${FILESDIR}/${PN}-1.7.0-expoblending.patch" )
-
-src_prepare() {
-	mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
-	if use handbook; then
-		echo "add_subdirectory( doc )" >> CMakeLists.txt
-	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
-}

diff --git a/media-plugins/kipi-plugins/metadata.xml b/media-plugins/kipi-plugins/metadata.xml
deleted file mode 100644
index 01b064c..0000000
--- a/media-plugins/kipi-plugins/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>kde</herd>
-	<maintainer>
-		<email>dilfridge@g.o</email>
-	</maintainer>
-	<use>
-		<flag name="expoblending">Build the expoblending plugin, which requires media-gfx/hugin</flag>
-		<flag name="mjpeg">Add mjpeg suppport</flag>
-		<flag name="redeyes">Add redeyes removal suppport</flag>
-	</use>
-</pkgmetadata>