Version bump; cleanup

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64

4 files changed, 128 insertions, 17 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/Manifest b/media-plugins/kipi-plugins/Manifest
index 2b9a7440b72d..ebdb40f18cf9 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,11 +1,32 @@
+-----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.3.0-expoblending.patch 501 RMD160 ebcde1b3ead4d16166a585bf000a1e90a865dad1 SHA1 1db5476f9c3eb669a5cd546822a82d236d7eac81 SHA256 f9504f51e9f20d9f62c477cd5679db5bf76abafe4ffde71e19f7aa995f7ea752
 AUX kipi-plugins-1.7.0-expoblending.patch 570 RMD160 c08b628dceb39b4a2dbe15fd376256785dd8cacf SHA1 763aec7f286f4cd208aa38f5665c62986bcfaddb SHA256 31788bac46a0af39e2b8475bdd84e07710af5d6655efbdaa6939795eb8b7d7f0
 DIST kipi-plugins-1.2.0-jpeg.patch.bz2 18380 RMD160 f553f3c0b8eea973105eeb6cdcf34d3a5922f57a SHA1 c1923acee6defdfde2993963512227cac1bf3a53 SHA256 df35fa99a46da4582df5c985e4765b55c5e87711e2610bfe8944530cbdd3195f
 DIST kipi-plugins-1.2.0.tar.bz2 4597178 RMD160 bbf79302bedab7cd55e9d7d91253261e954c56cf SHA1 f68038c59ddae10840d67f0071201fdfcabbeabf SHA256 6724fcebca59bb1087ddaf401a0bfe8ffa5c8cb572bf97af9339d27b40bc85c3
 DIST kipi-plugins-1.8.0.tar.bz2 5745914 RMD160 f56d00c5e31457e1c2d3a294a2d39bbe65b40c1a SHA1 d90c6545ef033bb587f4f642f1d9917956de34af SHA256 10e8be835c00a3b2e880d5653e0b294cbe004dee9d98809e45501a5638c7d142
+DIST kipi-plugins-1.9.0.tar.bz2 5775775 RMD160 9bc1ae309e556335fa770e20b31b2527ddc4856b SHA1 fc12c018f4f73f7a7d025d7af2af99d4ae2dedc5 SHA256 d52466586725492788514c1b8d7bbea02f95c9deb744a0814d221c99c34e934c
 DIST kipi-plugins-doc-1.5.0.tar.bz2 1689039 RMD160 f4342798caf14817b96afdb11959f53ab175ae1d SHA1 55a57e1fffbd291ed2f31dbbe840ccd85cb499cc SHA256 13dfda13a1f5e276020dbae3f7c2227f5cc1ac4264070250eeff0a3eb59b67cf
 EBUILD kipi-plugins-1.2.0-r3.ebuild 2227 RMD160 1ee08e6c4dcab0bd395dbf2e00951a323b1c5377 SHA1 b154b3eef802482534d9ae413eb9a54fa16c03da SHA256 0db31d337356651fef039c808d9edd7475e55703c8fc842eca83050c68056d88
 EBUILD kipi-plugins-1.8.0.ebuild 2662 RMD160 c7b4cec7960cf12f155ffc113ee9c20ab2c19067 SHA1 47a8f448e3ba7f88b6ee0946180e638b93f6476a SHA256 12af4fa4db626b26c2ea2dc45fd84358566dd189c72d0c3dbb4b7f28bd766370
-MISC ChangeLog 15385 RMD160 f87e0fe9841006769cef018c7d4c2423f72405cf SHA1 b0b251a6efc6d82edd91aa9ff2636a3ccc8e0539 SHA256 194bf1ed7bdc4aeb067c807d7f74c6e5722b817ccaf740a7a0d3db7a9d281743
+EBUILD kipi-plugins-1.9.0.ebuild 2661 RMD160 199dffebc7b5e45d2567b427d6f2dfb011e89989 SHA1 32519462b62f9a0b4915e82a4ac11a4a4b2d8937 SHA256 598b0ed94b2a6d5508e1f1fe31ae7b77a3f2880174628e71e2cb58c04cdd5645
+MISC ChangeLog 15577 RMD160 6a41fbba5cd1fa1bbed61341a4ab4ad39726280e SHA1 30e705168c24928d366bc40def10f026624177ce SHA256 17d7ca5e08ea9cb0900a541e97c02945a6785bcd3d3edc70dd4f01e15ae33d90
 MISC metadata.xml 442 RMD160 3ebeb3175e61f59febadca1633f0f7dbb60dc011 SHA1 cc18d6adaa318b095bdd00b3c37e59fb7f621055 SHA256 41b0a7ff3057182bd5d434dbe6643a95714f54c75ffc0a33625725fa0a8bd57b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNbVZqAAoJENwGBM22xffesJQP/2AGx+ViuNoQVaRf7wtZ4fUd
+k8je3fXhcpikJZh53k84EAWlu4KOqx3c8jscRhET7NmxT27V8wXgDa4newunvqQg
+BDOWarvA8pHChjtpXOXDVXHfrVEOXRHipAZpI82b+L92JhAiMsoBt30vgH8GT4tp
+c8BjP8KBuY11YXbqDbCr3M78PiazzeT0tNt5N+52iBN8LpOmFiX6t2iUgF8a2NC8
+pMJuf/+CYTP++WqNc2C5DxLZxNnwEW07vNDYUVZfiyW2riDbmNAjbr3Tf4p2eSu8
+TCV18H6P9dCsKjz+3HuLT60BKj49CxfDELTdLMSpZK6g5MprITMi1kB+T/RyCHpG
+GP+DKcV8TqNo5NyGCupVbSqaeZgfSAHCfX9VeBCrQijqfSppIDX2sYFVO/xqjdgZ
+ByqwOb56/UgR6weN1cCxrC9E4N1lSOY6RYZYHoBDNN3B540TTrYL4jsPDTXI/e82
+v41MAde7PyaVsYQk+X2b524hxwJGwXQBSEQ1zGlZ0lVFfaU9OLK3Cg5m4uXtNZkv
+4X91/3VLWtd1vH+jjfGWOQlsgwIYKZkum9gCU1ay4T6ZwWR8XAV066HTz6DTf2QJ
+91ak1p8XQt9tZB32WI74JleTgl9Pn4vk34Kdt7Htmjq5sPAEQcZG/r6c5wM2gP12
+JvOVoi7audulxSoftg2Q
+=kgeC
+-----END PGP SIGNATURE-----
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
+}