Remove old. Version bump 1.2.0, also fixes bug 321613 and 313241. Ebuild by Andreas K. Huettel.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 112 insertions, 79 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 388eeceac731..e0f285a8de1a 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,16 @@
 # 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.67 2010/02/04 21:26:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.68 2010/07/09 23:14:42 reavertm Exp $
+
+*kipi-plugins-1.2.0-r2 (09 Jul 2010)
+
+  09 Jul 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -kipi-plugins-1.1.0.ebuild, +kipi-plugins-1.2.0-r2.ebuild,
+  +files/kipi-plugins-1.2.0-expoblending.patch,
+  +files/kipi-plugins-1.2.0-jpeg.patch.bz2, metadata.xml:
+  Remove old.
+  Version bump 1.2.0, also fixes bug 321613 and 313241.
+  Ebuild by Andreas K. Huettel.
 
   04 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   kipi-plugins-1.1.0.ebuild:
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 2c10e114f5b5..647ea1605b21 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX kipi-plugins-1.2.0-expoblending.patch 698 RMD160 08d991df50ec649387c1186f5661f53810a6ca65 SHA1 a24867095ad275308d2ab02bc415bc1d9de02a92 SHA256 4070a17dc3e61806a69e99342d11cb2ba9f24e9adc57f0febaef2486ec9f6894
+AUX kipi-plugins-1.2.0-jpeg.patch.bz2 18380 RMD160 f553f3c0b8eea973105eeb6cdcf34d3a5922f57a SHA1 c1923acee6defdfde2993963512227cac1bf3a53 SHA256 df35fa99a46da4582df5c985e4765b55c5e87711e2610bfe8944530cbdd3195f
 DIST kipi-plugins-0.8.0.tar.bz2 3856681 RMD160 ce5c7e5b4832757e39bb285033eff0ecf0a6bfce SHA1 652aaa0d27c5aff648d71848d4b35a6385bf0f97 SHA256 23a2b3304bf84d5efc35f8282a875798594004e9e3b9b07c9f21fdc21dbd6ae8
-DIST kipi-plugins-1.1.0.tar.bz2 4391411 RMD160 b5b35c2064994ce49db4d1d0edc434a5803df186 SHA1 e65c9b6df70651c5cc10a1c7ec16e167b33a991f SHA256 9e89da338fa877818c41e6581f80148160ccbaba0a0b97a8fb4f8a67405a946d
+DIST kipi-plugins-1.2.0.tar.bz2 4597178 RMD160 bbf79302bedab7cd55e9d7d91253261e954c56cf SHA1 f68038c59ddae10840d67f0071201fdfcabbeabf SHA256 6724fcebca59bb1087ddaf401a0bfe8ffa5c8cb572bf97af9339d27b40bc85c3
 EBUILD kipi-plugins-0.8.0.ebuild 1757 RMD160 4bc0c38ce5cf269c802c3805d3c72bc52e9aec79 SHA1 b2f2142cd0ea868a82696600d896cdcc87aa25e3 SHA256 a1a06fef9c577b39dfd1188a8b9fcb618323a4f3abfbe3c082d2a4393b39f4fa
-EBUILD kipi-plugins-1.1.0.ebuild 1814 RMD160 a6f800da97848429c1f5afe569f987c7fe0eb729 SHA1 a0513eceb5375eb7e8fd2cecad961c5768d4f79d SHA256 9325ad63a939b796320ac18becb56017bd7eab42290b56598547ff57366b5e10
-MISC ChangeLog 11939 RMD160 595a2a77c52a5753a6a2945a28459e75038941c7 SHA1 e10f8dacc9814b74b0452ba07801ee66be42a2b7 SHA256 1c7c5d06a6bdcd9320697ab852796e27fe4f28accdeb540a3fd36490696f244b
-MISC metadata.xml 271 RMD160 b3b31e8b6accd71002572196eba31606aab54f78 SHA1 0ba86b45b046991ad7351970705f59ec0da7eda8 SHA256 91d4861bc6d8d0d40b49e5021d3900eaeef2aeb8dbb8e46c5860b493d1334d8f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuZYUsACgkQdz7hIScOURFtigCgnuHLdqDHRaIybykpt/2/5GTd
-rXcAoO/rkU6se/IfZe/GORqi21ZG1FAw
-=q9G3
------END PGP SIGNATURE-----
+EBUILD kipi-plugins-1.2.0-r2.ebuild 2196 RMD160 53383dec68493d4e14ed65e01a24b11c3b459cfe SHA1 400341766cdbdf99e56ecde54647d0187ea3a01c SHA256 494188217a04efa51fe35a5f387cbb91b0bcfd33d4b296c69f81733785e3dbae
+MISC ChangeLog 12300 RMD160 8811d2cc7541a78da4bdc52d96383b5127da4a7e SHA1 f332c206a3d7b07884bba5b0d777f4a03c720902 SHA256 af2fe5485619110124ae797483a672bc753de049223b2bba28199531b86ee1e6
+MISC metadata.xml 375 RMD160 38d29b8fbae0431deb6964627acd787041c1264b SHA1 88557f65e5fe7fc68b326f670145bf138ed2eea7 SHA256 b9b34c9b718bba794774e4cae652735ab49f541cd13b5516afba86d8f5cb4d22
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-1.2.0-expoblending.patch b/media-plugins/kipi-plugins/files/kipi-plugins-1.2.0-expoblending.patch
new file mode 100644
index 000000000000..a09cd67e4444
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-1.2.0-expoblending.patch
@@ -0,0 +1,15 @@
+diff -r -u kipi-plugins-1.2.0.orig/CMakeLists.txt kipi-plugins-1.2.0/CMakeLists.txt
+--- kipi-plugins-1.2.0.orig/CMakeLists.txt	2010-03-28 23:57:54.000000000 +0200
++++ kipi-plugins-1.2.0/CMakeLists.txt	2010-07-08 22:56:13.518262763 +0200
+@@ -368,9 +368,9 @@
+         ENDIF(CMAKE_USE_PTHREADS_INIT OR CMAKE_USE_WIN32_THREADS_INIT)
+     ENDIF(EXPAT_FOUND AND KDCRAW_FOR_DNGCONVERTER)
+ 
+-    IF(KDCRAW_FOR_EXPOBLENDING)
++    IF(KDCRAW_FOR_EXPOBLENDING AND ENABLE_expoblending)
+         ADD_SUBDIRECTORY(expoblending)
+-    ENDIF(KDCRAW_FOR_EXPOBLENDING)
++    ENDIF(KDCRAW_FOR_EXPOBLENDING AND ENABLE_expoblending)
+ 
+ #   Laurent Montel : wallpaper is currently disabled. Waiting new api with KDE 4.2
+ #
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-1.2.0-jpeg.patch.bz2 b/media-plugins/kipi-plugins/files/kipi-plugins-1.2.0-jpeg.patch.bz2
new file mode 100644
index 000000000000..567ce4a63568
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-1.2.0-jpeg.patch.bz2
diff --git a/media-plugins/kipi-plugins/kipi-plugins-1.1.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-1.1.0.ebuild
deleted file mode 100644
index a07c32d963c0..000000000000
--- a/media-plugins/kipi-plugins/kipi-plugins-1.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.1.0.ebuild,v 1.2 2010/02/04 21:26:51 ssuominen Exp $
-
-EAPI=2
-OPENGL_REQUIRED=optional
-
-KDE_LINGUAS="ar ast be ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hi hne hr 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"
-
-inherit kde4-base
-
-DESCRIPTION="KDE Image Plugin Interface"
-HOMEPAGE="http://www.kipi-plugins.org/"
-SRC_URI="mirror://sourceforge/kipi/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdr calendar crypt debug +imagemagick ipod mjpeg redeyes scanner"
-
-DEPEND=">=dev-libs/expat-2.0.1
-	>=dev-libs/libxml2-2.7
-	dev-libs/libxslt
-	>=kde-base/libkdcraw-${KDE_MINIMAL}
-	>=kde-base/libkexiv2-${KDE_MINIMAL}
-	>=kde-base/libkipi-${KDE_MINIMAL}
-	media-libs/jpeg:0
-	>=media-libs/libpng-1.2
-	media-libs/tiff
-	calendar? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
-	ipod? ( x11-libs/gtk+:2
-		>=media-libs/libgpod-0.7 )
-	opengl? ( virtual/opengl )
-	redeyes? ( media-libs/opencv )
-	scanner? ( media-gfx/sane-backends
-		>=kde-base/libksane-${KDE_MINIMAL} )
-	crypt? ( app-crypt/qca:2 )"
-RDEPEND="${DEPEND}
-	cdr? ( app-cdr/k3b )
-	imagemagick? ( media-gfx/imagemagick )
-	mjpeg? ( media-video/mjpegtools )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-src_configure() {
-	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 scanner KSane)
-		$(cmake-utils_use_with calendar KdepimLibs)
-		$(cmake-utils_use_with redeyes OpenCV)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with crypt QCA2) )
-
-	kde4-base_src_configure
-}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-1.2.0-r2.ebuild b/media-plugins/kipi-plugins/kipi-plugins-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..81424e2a07cc
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-1.2.0-r2.ebuild
@@ -0,0 +1,74 @@
+# 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-r2.ebuild,v 1.1 2010/07/09 23:14:42 reavertm 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"
+
+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}
+	>=media-libs/jpeg-6b
+	>=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=( "${FILESDIR}/${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/metadata.xml b/media-plugins/kipi-plugins/metadata.xml
index 191039cabd0f..5bc37d47c582 100644
--- a/media-plugins/kipi-plugins/metadata.xml
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<use>
-	<flag name="mjpeg">Add mjpeg support</flag>
-	<flag name="redeyes">Add redeyes removal support</flag>
-</use>
+	<herd>kde</herd>
+	<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>