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

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     ed6af37d1d85d14a90422747a12cd6c9136e8b2d
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 11 15:29:48 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Aug 11 15:29:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ed6af37d

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

---
 .../files/kipi-plugins-1.7.0-expoblending.patch    |   16 ---
 .../files/kipi-plugins-2.2.0-panorama.patch        |   16 ---
 .../files/kipi-plugins-2.6.0_beta3-options.patch   |   31 -----
 .../kipi-plugins/kipi-plugins-2.8.0.ebuild         |  118 --------------------
 media-plugins/kipi-plugins/metadata.xml            |   21 ----
 5 files changed, 0 insertions(+), 202 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/files/kipi-plugins-2.2.0-panorama.patch b/media-plugins/kipi-plugins/files/kipi-plugins-2.2.0-panorama.patch
deleted file mode 100644
index fbe832a..0000000
--- a/media-plugins/kipi-plugins/files/kipi-plugins-2.2.0-panorama.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN digikam-2.2.0.orig/extra/kipi-plugins/CMakeLists.txt digikam-2.2.0/extra/kipi-plugins/CMakeLists.txt
---- digikam-2.2.0.orig/extra/kipi-plugins/CMakeLists.txt	2011-10-03 12:34:09.000000000 +0200
-+++ digikam-2.2.0/extra/kipi-plugins/CMakeLists.txt	2011-11-05 20:14:23.000000000 +0100
-@@ -389,7 +389,11 @@
-     ADD_SUBDIRECTORY(batchprocessimages)
-     ADD_SUBDIRECTORY(rajceexport)
-     ADD_SUBDIRECTORY(kmlexport)
--    ADD_SUBDIRECTORY(panorama)
-+
-+    IF(ENABLE_panorama)
-+        ADD_SUBDIRECTORY(panorama)
-+    ENDIF(ENABLE_panorama)
-+
-     ADD_SUBDIRECTORY(photolayoutseditor)
- 
-     # Plugins which are optional depencies.

diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-options.patch b/media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-options.patch
deleted file mode 100644
index 86733b1..0000000
--- a/media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-options.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ruN digikam-2.6.0-beta3.orig/extra/kipi-plugins/CMakeLists.txt digikam-2.6.0-beta3/extra/kipi-plugins/CMakeLists.txt
---- digikam-2.6.0-beta3.orig/extra/kipi-plugins/CMakeLists.txt	2012-04-01 12:54:26.000000000 +0200
-+++ digikam-2.6.0-beta3/extra/kipi-plugins/CMakeLists.txt	2012-04-08 18:50:53.918419219 +0200
-@@ -391,7 +391,11 @@
-     ADD_SUBDIRECTORY(picasawebexport)
-     ADD_SUBDIRECTORY(smug)
-     ADD_SUBDIRECTORY(printimages)
--    ADD_SUBDIRECTORY(expoblending)
-+
-+    IF(ENABLE_expoblending)
-+        ADD_SUBDIRECTORY(expoblending)
-+    ENDIF(ENABLE_expoblending)
-+
-     ADD_SUBDIRECTORY(kopete)
-     ADD_SUBDIRECTORY(batchprocessimages)
-     ADD_SUBDIRECTORY(rajceexport)
-@@ -457,9 +461,11 @@
-         ADD_SUBDIRECTORY(mediawiki)
-     ENDIF(MEDIAWIKI_FOUND)
- 
--    IF(Boost_FOUND)
--        ADD_SUBDIRECTORY(panorama)
--    ENDIF(Boost_FOUND)
-+    IF(ENABLE_panorama)
-+        IF(Boost_FOUND)
-+            ADD_SUBDIRECTORY(panorama)
-+        ENDIF(Boost_FOUND)
-+    ENDIF(ENABLE_panorama)
- 
- #   Laurent Montel : wallpaper is currently disabled. Waiting new api with KDE 4.2
- #

diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.8.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.8.0.ebuild
deleted file mode 100644
index 3ffdbce..0000000
--- a/media-plugins/kipi-plugins/kipi-plugins-2.8.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.7.0.ebuild,v 1.1 2012/07/09 20:45:31 dilfridge Exp $
-
-EAPI=4
-
-OPENGL_REQUIRED="optional"
-
-KDE_MINIMAL="4.7"
-
-KDE_LINGUAS="ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga
-gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn
-nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr ss sv ta te tg th tr tt uk uz ven vi wa xh
-zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-
-inherit flag-o-matic kde4-base
-
-MY_PV=${PV/_/-}
-MY_P="digikam-${MY_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 gpssync +imagemagick ipod mediawiki mjpeg panorama redeyes scanner vkontakte"
-
-DEPEND="
-	$(add_kdebase_dep libkipi)
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	dev-libs/expat
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/qjson
-	gpssync?	( media-libs/libkgeomap )
-	media-libs/libpng
-	media-libs/tiff
-	virtual/jpeg
-	calendar?	( $(add_kdebase_dep kdepimlibs) )
-	crypt?		( app-crypt/qca:2 )
-	ipod?		(
-			  media-libs/libgpod
-			  x11-libs/gtk+:2
-	mediawiki?	( >=media-libs/libmediawiki-2.6.0 )
-			)
-	panorama?	( dev-libs/boost )
-	redeyes?	( media-libs/opencv )
-	scanner? 	(
-			  $(add_kdebase_dep libksane)
-			  media-gfx/sane-backends
-			)
-	vkontakte?	( net-libs/libkvkontakte )
-"
-RDEPEND="${DEPEND}
-	cdr? 		( app-cdr/k3b )
-	expoblending? 	( media-gfx/hugin )
-	imagemagick? 	( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
-	mjpeg? 		( media-video/mjpegtools )
-	panorama?	(
-			  media-gfx/enblend
-			  >=media-gfx/hugin-2011.0.0
-			)
-"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0_beta3-options.patch"
-)
-
-src_prepare() {
-	# prepare the handbook
-	mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
-	if use handbook; then
-		echo "add_subdirectory( doc )" >> CMakeLists.txt
-	fi
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -name "kipiplugin*.po" -exec rm {} +
-	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
-	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-	echo "add_subdirectory( po )" >> CMakeLists.txt
-
-	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 gpssync KGeoMap)
-		$(cmake-utils_use_with mediawiki MEDIAWIKI)
-		$(cmake-utils_use_with redeyes OpenCV)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with scanner KSane)
-		$(cmake-utils_use_enable expoblending)
-		$(cmake-utils_use_enable panorama)
-	)
-
-	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 43e1fb6..0000000
--- a/media-plugins/kipi-plugins/metadata.xml
+++ /dev/null
@@ -1,21 +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@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="expoblending">Build the expoblending plugin, which requires media-gfx/hugin</flag>
-		<flag name="gpssync">Build the gpssync plugin, which requires media-lib/libkgeomap and thereby marble</flag>
-		<flag name="mediawiki">Build the mediawiki export plugin</flag>
-		<flag name="mjpeg">Add mjpeg suppport</flag>
-		<flag name="panorama">Pull in dependencies needed by panorama plugin</flag>
-		<flag name="redeyes">Add redeyes removal suppport</flag>
-		<flag name="vkontakte">Build plugin for vkontakte.ru</flag>
-		<flag name="linguas_ha">Hausa translation</flag>
-		<flag name="linguas_mi">Maori translation</flag>
-		<flag name="linguas_tt">?? translation</flag>
-		<flag name="linguas_ven">Venda translation</flag>
-	</use>
-</pkgmetadata>