public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/files/, media-plugins/kipi-plugins/
@ 2011-05-20 22:47 Andreas K. Huettel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas K. Huettel @ 2011-05-20 22:47 UTC (permalink / raw
  To: gentoo-commits

commit:     f97c1e6608d27d76e223f162c33e43c4611611c6
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri May 20 23:07:47 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri May 20 23:07:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f97c1e66

[media-plugins/kipi-plugins] Beta version depending on kde-4.7

(Portage version: 2.1.9.49/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 .../files/kipi-plugins-1.7.0-expoblending.patch    |   16 ++++
 .../kipi-plugins/kipi-plugins-2.0.0_beta5.ebuild   |   94 ++++++++++++++++++++
 media-plugins/kipi-plugins/metadata.xml            |   13 +++
 3 files changed, 123 insertions(+), 0 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
new file mode 100644
index 0000000..3f7fdf6
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-1.7.0-expoblending.patch
@@ -0,0 +1,16 @@
+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_beta5.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.0.0_beta5.ebuild
new file mode 100644
index 0000000..1c3bcfd
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-2.0.0_beta5.ebuild
@@ -0,0 +1,94 @@
+# 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.8.0.ebuild,v 1.1 2011/01/28 19:42:39 dilfridge Exp $
+
+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.0"
+inherit flag-o-matic kde4-base
+
+KDEGRAPHICS_MINIMAL="4.6.29"
+# 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=""
+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
new file mode 100644
index 0000000..01b064c
--- /dev/null
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -0,0 +1,13 @@
+<?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="mjpeg">Add mjpeg suppport</flag>
+		<flag name="redeyes">Add redeyes removal suppport</flag>
+	</use>
+</pkgmetadata>



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/files/, media-plugins/kipi-plugins/
@ 2011-07-27 21:06 Andreas Hüttel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2011-07-27 21:06 UTC (permalink / raw
  To: gentoo-commits

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@gentoo.org</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>



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/files/, media-plugins/kipi-plugins/
@ 2012-08-10 18:27 Chris Reffett
  0 siblings, 0 replies; 6+ messages in thread
From: Chris Reffett @ 2012-08-10 18:27 UTC (permalink / raw
  To: gentoo-commits

commit:     70cc7f8e0c2f6353d6cee398c1b76dd4ef24e60e
Author:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
AuthorDate: Fri Aug 10 18:25:13 2012 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Fri Aug 10 18:26:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=70cc7f8e

[media-plugins/kipi-plugins] Add version 2.8.0 for testing

(Portage version: 2.2.0_alpha120/git/Linux x86_64, unsigned Manifest commit)

---
 .../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, 202 insertions(+), 0 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
new file mode 100644
index 0000000..3f7fdf6
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-1.7.0-expoblending.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000..fbe832a
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-2.2.0-panorama.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000..86733b1
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-options.patch
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 0000000..3ffdbce
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-2.8.0.ebuild
@@ -0,0 +1,118 @@
+# 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
new file mode 100644
index 0000000..43e1fb6
--- /dev/null
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -0,0 +1,21 @@
+<?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>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/files/, media-plugins/kipi-plugins/
@ 2012-08-11 15:28 Andreas Hüttel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2012-08-11 15:28 UTC (permalink / raw
  To: gentoo-commits

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>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/files/, media-plugins/kipi-plugins/
@ 2012-10-14 16:53 Andreas Hüttel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2012-10-14 16:53 UTC (permalink / raw
  To: gentoo-commits

commit:     50e697d7809cf2c1bc5d46ce90184a1d972f36b7
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Oct 14 16:56:11 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 16:56:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=50e697d7

[media-plugins/kipi-plugins] Add beta

(Portage version: 2.2.0_alpha137/git/Linux x86_64)

---
 .../files/kipi-plugins-2.6.0_beta3-options.patch   |   31 +++++
 .../kipi-plugins/kipi-plugins-3.0.0_beta2.ebuild   |  121 ++++++++++++++++++++
 media-plugins/kipi-plugins/metadata.xml            |   21 ++++
 3 files changed, 173 insertions(+), 0 deletions(-)

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
new file mode 100644
index 0000000..86733b1
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-options.patch
@@ -0,0 +1,31 @@
+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-3.0.0_beta2.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.0.0_beta2.ebuild
new file mode 100644
index 0000000..f94d867
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-3.0.0_beta2.ebuild
@@ -0,0 +1,121 @@
+# 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.9.0.ebuild,v 1.1 2012/09/03 19:13:18 creffett 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://kde/unstable/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+	handbook? ( FDL-1.2 )"
+KEYWORDS=""
+SLOT="4"
+IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki mjpeg panorama redeyes scanner vkontakte"
+
+DEPEND="
+	$(add_kdebase_dep libkipi '' '4.9.80')
+	$(add_kdebase_dep libkdcraw '' '4.9.80')
+	$(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}
+
+RESTRICT=test
+# bug 420203
+
+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
new file mode 100644
index 0000000..43e1fb6
--- /dev/null
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -0,0 +1,21 @@
+<?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>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/files/, media-plugins/kipi-plugins/
@ 2015-04-19 19:25 Michael Palimaka
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2015-04-19 19:25 UTC (permalink / raw
  To: gentoo-commits

commit:     9c703ca45bafb30df3dabf5dafe6025474a3a9e0
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Apr 18 20:38:49 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 20:38:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c703ca4

[media-plugins/kipi-plugins] 4.9.0 version bump

Package-Manager: portage-2.2.14

 .../files/kipi-plugins-4.6.0-options.patch         |  24 ++++
 .../kipi-plugins/kipi-plugins-4.9.0.ebuild         | 148 +++++++++++++++++++++
 media-plugins/kipi-plugins/metadata.xml            |  21 +++
 3 files changed, 193 insertions(+)

diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch b/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch
new file mode 100644
index 0000000..100e935
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch
@@ -0,0 +1,24 @@
+diff -ruN digikam-4.6.0.orig/extra/kipi-plugins/CMakeLists.txt digikam-4.6.0/extra/kipi-plugins/CMakeLists.txt
+--- digikam-4.6.0.orig/extra/kipi-plugins/CMakeLists.txt	2014-12-16 08:54:40.000000000 +0100
++++ digikam-4.6.0/extra/kipi-plugins/CMakeLists.txt	2014-12-21 21:50:39.901188497 +0100
+@@ -370,7 +370,11 @@
+         add_subdirectory(picasawebexport)
+         add_subdirectory(smug)
+         add_subdirectory(printimages)
++
++        if(ENABLE_expoblending)
+         add_subdirectory(expoblending)
++        endif()
++
+         add_subdirectory(kopete)
+         add_subdirectory(batchprocessimages)
+         add_subdirectory(rajceexport)
+@@ -451,7 +455,7 @@
+             add_subdirectory(mediawiki)
+         endif()
+ 
+-        if(FLEX_FOUND AND BISON_FOUND)
++        if(FLEX_FOUND AND BISON_FOUND AND ENABLE_panorama)
+             add_subdirectory(panorama)
+         endif()
+ 

diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.9.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.9.0.ebuild
new file mode 100644
index 0000000..80e70bb
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.9.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+#
+# TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for work in progress
+#
+
+EAPI=5
+
+OPENGL_REQUIRED="optional"
+
+KDE_MINIMAL="4.10"
+
+KDE_LINGUAS="af 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://kde/stable/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 panorama redeyes scanner upnp videoslideshow vkontakte"
+
+COMMONDEPEND="
+	|| ( kde-apps/libkipi:4 $(add_kdebase_dep libkipi) )
+	|| ( kde-apps/libkdcraw:4= kde-base/libkdcraw:4= )
+	|| ( kde-apps/libkexiv2:4= kde-base/libkexiv2:4= )
+	dev-libs/expat
+	dev-libs/kqoauth
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/qjson
+	dev-qt/qtxmlpatterns:4
+	gpssync?	( >=media-libs/libkgeomap-4.6.0 )
+	media-libs/libpng:0=
+	media-libs/tiff
+	virtual/jpeg
+	calendar?	( $(add_kdebase_dep kdepimlibs) )
+	crypt?		( app-crypt/qca:2[qt4(+)] )
+	ipod?		(
+			  media-libs/libgpod
+			  x11-libs/gtk+:2
+			)
+	mediawiki?	( >=net-libs/libmediawiki-3.0.0 )
+	opengl?		(
+				media-libs/phonon[qt4]
+				x11-libs/libXrandr
+			)
+	redeyes?	( >=media-libs/opencv-2.4.9 )
+	scanner? 	(
+			|| ( kde-apps/libksane:4 $(add_kdebase_dep libksane) )
+			  media-gfx/sane-backends
+			)
+	upnp?		( media-libs/herqq )
+	videoslideshow?	(
+			  >=media-libs/qt-gstreamer-0.9.0[qt4(+)]
+			  || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+			)
+	vkontakte?	( net-libs/libkvkontakte )
+"
+DEPEND="${COMMONDEPEND}
+	sys-devel/gettext
+	panorama?	(
+			  sys-devel/bison
+			  sys-devel/flex
+			)
+"
+RDEPEND="${COMMONDEPEND}
+	cdr? 		( app-cdr/k3b )
+	expoblending? 	( media-gfx/hugin )
+	imagemagick? 	( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
+	panorama?	(
+			  media-gfx/enblend
+			  >=media-gfx/hugin-2011.0.0
+			)
+"
+
+S=${WORKDIR}/${MY_P}/extra/${PN}
+
+RESTRICT=test
+# bug 420203
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6.0-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
+
+	if ! use redeyes ; then
+		sed -i -e "/DETECT_OPENCV/d" 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 gpssync KGeoMap)
+		$(cmake-utils_use_with mediawiki Mediawiki)
+		$(cmake-utils_use_find_package redeyes OpenCV)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with scanner KSane)
+		$(cmake-utils_use_with upnp Hupnp)
+		$(cmake-utils_use_with vkontakte LibKVkontakte)
+		$(cmake-utils_use_with videoslideshow QtGStreamer)
+		$(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
new file mode 100644
index 0000000..74966c6
--- /dev/null
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -0,0 +1,21 @@
+<?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="panorama">Pull in dependencies needed by panorama plugin</flag>
+		<flag name="redeyes">Add redeyes removal support</flag>
+		<flag name="videoslideshow">Build videoslideshow plugin</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>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-04-19 19:25 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-27 21:06 [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/files/, media-plugins/kipi-plugins/ Andreas Hüttel
  -- strict thread matches above, loose matches on Subject: below --
2015-04-19 19:25 Michael Palimaka
2012-10-14 16:53 Andreas Hüttel
2012-08-11 15:28 Andreas Hüttel
2012-08-10 18:27 Chris Reffett
2011-05-20 22:47 Andreas K. Huettel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox