4 files changed, 25 insertions, 88 deletions
diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 44ef3f5b5e3e..78b58b240c8d 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.65 2009/12/07 23:33:07 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.66 2010/02/04 21:20:22 ssuominen Exp $
+
+*kipi-plugins-1.1.0 (04 Feb 2010)
+
+  04 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +kipi-plugins-1.1.0.ebuild:
+  Version bump.
 
   07 Dec 2009; Markus Meier <maekke@gentoo.org> kipi-plugins-0.8.0.ebuild:
   x86 stable, bug #295477
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 8bd83a10b5d1..c69c90c8fde6 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST kipi-plugins-0.6.0.tar.bz2 3731330 RMD160 a4e407c51c0e45bcb172b58cab28bda9c778e312 SHA1 52c63c50a74e12218ae455615fc7dd877de42f6b SHA256 b219a1b0d63849563bf87fade0cd107aa8cdeb6fafa0bc10734beaf812cf9a6a
 DIST kipi-plugins-0.8.0.tar.bz2 3856681 RMD160 ce5c7e5b4832757e39bb285033eff0ecf0a6bfce SHA1 652aaa0d27c5aff648d71848d4b35a6385bf0f97 SHA256 23a2b3304bf84d5efc35f8282a875798594004e9e3b9b07c9f21fdc21dbd6ae8
-DIST kipi-plugins-0.9.0.tar.bz2 3957419 RMD160 c849b42726885b89fc29ce31841b681674aaf093 SHA1 cb36856998f9379465cc06bb38432d751d75d5b0 SHA256 16bb13fac1add9d78e1e70e068ad41cd6564f9f95f62344bd924227c80c9a173
-EBUILD kipi-plugins-0.6.0.ebuild 1661 RMD160 2e3894641f6a762467507d0513ec12b9f3d3fbc1 SHA1 76c35a76cab8fa21fcd95c4f86b1175b46ff261a SHA256 b9d5272e8297267e034ffcd9d615b9cf1b59a73be77be4520fb83b520e5e9930
+DIST kipi-plugins-1.1.0.tar.bz2 4391411 RMD160 b5b35c2064994ce49db4d1d0edc434a5803df186 SHA1 e65c9b6df70651c5cc10a1c7ec16e167b33a991f SHA256 9e89da338fa877818c41e6581f80148160ccbaba0a0b97a8fb4f8a67405a946d
 EBUILD kipi-plugins-0.8.0.ebuild 1757 RMD160 4bc0c38ce5cf269c802c3805d3c72bc52e9aec79 SHA1 b2f2142cd0ea868a82696600d896cdcc87aa25e3 SHA256 a1a06fef9c577b39dfd1188a8b9fcb618323a4f3abfbe3c082d2a4393b39f4fa
-EBUILD kipi-plugins-0.9.0.ebuild 1762 RMD160 6003c52932d1ee3ec3134416f0bbb99b30d91a7a SHA1 e709e634fad4c997afa834a8dc72332d7acf3fe5 SHA256 468eac172a48fcd6a3eb4b7b211a273064cbee280255eb5e8a521706b9756dc4
-MISC ChangeLog 11672 RMD160 84173b685da56bf288717536ea8703bf7c910c04 SHA1 4dc87922c79c2e9c989137bf98a9f1977b14029c SHA256 f367bd22e5de8132bfb9470ea570b6ca70e9e20608898e0211cd17e9d0e4c55a
+EBUILD kipi-plugins-1.1.0.ebuild 1840 RMD160 a7036ed204492180f6f00f4f79be7e2f9e7da62f SHA1 a31e8234fc1c8416c1aa8a4af0e3e3dd66c51c3d SHA256 748ed3b3910118e37edb4ad3204e39fee33f498a84f2eef65473ed0e2c83cc6c
+MISC ChangeLog 11811 RMD160 3b08ecceae94ee3f8a63ff13b7c0cbf6117b50a1 SHA1 54e71486c4cceea6efbbeb6ca0ad9b20bb1745a3 SHA256 caa54847dd4e603c776c029a7d5ba940d9fba2f242e3d6eaad757a6029aead97
 MISC metadata.xml 273 RMD160 34d3f6bdbda807ea4ec0134e26f5913e454fca78 SHA1 d265dee00e4651aa61a1daa374dcb69ebb753c1d SHA256 7f4adb459c6d4aff40ab23022a287e0f97a8165a5f6c1d80b9c3b9d554d21fa5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksdkLAACgkQkKaRLQcq0GIWJgCfSLkGY2zFpmZk/28m5+Gc8YB3
-7BcAn0rgiGjmMp2lkb+M/ml3x6Q7FvjU
-=pT4b
------END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.6.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.6.0.ebuild
deleted file mode 100644
index 9221c787dcee..000000000000
--- a/media-plugins/kipi-plugins/kipi-plugins-0.6.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.6.0.ebuild,v 1.4 2009/12/02 10:07:31 scarabeus Exp $
-
-EAPI="2"
-
-OPENGL_REQUIRED="optional"
-KDE_LINGUAS="ar be ca cs da de el 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"
-inherit kde4-base
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface (libkipi)."
-HOMEPAGE="http://www.kipi-plugins.org"
-SRC_URI="mirror://sourceforge/kipi/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="cdr calendar debug +imagemagick ipod mjpeg scanner"
-SLOT="4"
-
-DEPEND="
-	>=dev-libs/expat-2.0.1
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=kde-base/libkdcraw-${KDE_MINIMAL}
-	>=kde-base/libkexiv2-${KDE_MINIMAL}
-	>=kde-base/libkipi-${KDE_MINIMAL}
-	media-libs/jpeg
-	media-libs/libpng
-	>=media-libs/tiff-3.5
-	calendar? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
-	ipod? ( media-libs/libgpod )
-	opengl? ( virtual/opengl )
-	scanner? (
-		media-gfx/sane-backends
-		>=kde-base/libksane-${KDE_MINIMAL}
-	)
-"
-RDEPEND="${DEPEND}
-	cdr? ( app-cdr/k3b )
-	imagemagick? ( media-gfx/imagemagick )
-	mjpeg? ( media-video/mjpegtools )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with calendar KdepimLibs)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with scanner KSane)
-		$(cmake-utils_use_with scanner Sane)
-		$(cmake-utils_use_with ipod Gpod)
-		$(cmake-utils_use_with ipod GLIB2)
-		$(cmake-utils_use_with ipod GObject)
-		-DWITH_OpenCV=OFF"
-
-	kde4-base_src_configure
-}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.9.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-1.1.0.ebuild
index 5adb66e0581a..d004f34d9d91 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-0.9.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-1.1.0.ebuild
@@ -1,11 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-0.9.0.ebuild,v 1.1 2009/12/02 10:07:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-1.1.0.ebuild,v 1.1 2010/02/04 21:20:22 ssuominen 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"
+
+# FIXME. What is ca@valencia in po/ ?
+KDE_LINGUAS="ar ast be ca 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
 
@@ -24,9 +27,9 @@ DEPEND=">=dev-libs/expat-2.0.1
 	>=kde-base/libkdcraw-${KDE_MINIMAL}
 	>=kde-base/libkexiv2-${KDE_MINIMAL}
 	>=kde-base/libkipi-${KDE_MINIMAL}
-	>=media-libs/jpeg-6b
+	media-libs/jpeg:0
 	>=media-libs/libpng-1.2
-	>=media-libs/tiff-3.5
+	media-libs/tiff
 	calendar? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
 	ipod? ( x11-libs/gtk+:2
 		>=media-libs/libgpod-0.7 )
@@ -40,17 +43,18 @@ RDEPEND="${DEPEND}
 	imagemagick? ( media-gfx/imagemagick )
 	mjpeg? ( media-video/mjpegtools )"
 
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
 src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with ipod GLIB2)
+	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)
-		$(cmake-utils_use_with scanner Sane)"
+		$(cmake-utils_use_with crypt QCA2) )
 
 	kde4-base_src_configure
 }