Version bump. Remove old. Slotmove.

Package-Manager: portage-2.2_rc38/cvs/Linux i686

5 files changed, 23 insertions, 179 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 1d18551938c2..1f79ba8eb9ca 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # 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.58 2009/08/16 11:14:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.59 2009/08/30 09:08:26 scarabeus Exp $
+
+*kipi-plugins-0.6.0 (30 Aug 2009)
+
+  30 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kipi-plugins-0.3.0.ebuild, -kipi-plugins-0.4.0.ebuild,
+  -kipi-plugins-0.5.0.ebuild, +kipi-plugins-0.6.0.ebuild:
+  Version bump. Remove old. Slotmove.
 
   16 Aug 2009; Raúl Porcel <armin76@gentoo.org> kipi-plugins-0.1.7.ebuild:
   sparc stable wrt #270950
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 6720bc1823d5..4e6aa1d78341 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,13 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kipi-plugins-0.1.4-ipod-191195.patch 1100 RMD160 e93a5430f8d9e74575759a14c923cc07603728f4 SHA1 0044a5c31c9f6995d06afb93680c566ac99b1948 SHA256 ff9feba1085bbe2fdd47b3c400fdb5feea70824d2feb9559fafeac3951054191
 AUX kipi-plugins-default_chroma_opt.patch 376 RMD160 4f6f8584dae11f5646d0f8cf630bb9114cac1ea4 SHA1 34b5b3c6318e2b4b7b9236326d0ec6e1302bee36 SHA256 81f680e9efca3faa19bb051bf8a3ec9f5f17a85eaf1ef05abf96803a9cc8a7d0
 AUX kipi-plugins-libgpod-0.7.patch 5336 RMD160 b2cfbf87ffaf72a231b66704c15e18dd26afa70a SHA1 16d73b76827b42c7b9a2fc0a8af2a930b02cd12e SHA256 e7649915095464b3e88ed8205fd1871cf7282a07d2d48bcaa12eb05b293462ad
 DIST kipi-plugins-0.1.7.tar.bz2 8836654 RMD160 f66473c11e66f9e06aa6772c7952b640b565def9 SHA1 520b6b9d36a8c5b8893c3a6b5a1a14f6b9cbd216 SHA256 3c8a73d0658935b75fc0e0ed48f66cd72225249152bce969f4c9676c7038124b
-DIST kipi-plugins-0.3.0.tar.bz2 3547558 RMD160 f07893d049c8830900747a6d1e9f0a0247ca525f SHA1 a9c57258d72f1d157df08887ef4aeb407b00df36 SHA256 bebcaf149be6fac3e7cbc15da2c0df1d900e9fcc28f00e3d53051b314531c7ad
-DIST kipi-plugins-0.4.0.tar.bz2 3669095 RMD160 ad27722a70b6a171513fb475fe082e1c0c91da8a SHA1 a86692c87f885d205724aa06b11e55efaedb26e7 SHA256 6f000abd01378d24797b7bad56b559594135f1179e91cbcdaef036c51d286697
-DIST kipi-plugins-0.5.0.tar.bz2 3711696 RMD160 117d34f2e18b899de5d61f5a06697dd09bccd27d SHA1 9eec9387ffc2164745adb443fe753d9158efb119 SHA256 6d349d7b156617603dadfe88d6a62b42bea083d9e15ef200f40d7f4d7d64c6e9
+DIST kipi-plugins-0.6.0.tar.bz2 3731330 RMD160 a4e407c51c0e45bcb172b58cab28bda9c778e312 SHA1 52c63c50a74e12218ae455615fc7dd877de42f6b SHA256 b219a1b0d63849563bf87fade0cd107aa8cdeb6fafa0bc10734beaf812cf9a6a
 EBUILD kipi-plugins-0.1.7.ebuild 1972 RMD160 3c5e8eed72333e23b4c66cbbcef0106d75718481 SHA1 c7cd891e1564827db06e98798922ed964afc967e SHA256 a61f7138c0e9565cfb1befd14525e6db37b177fcddeb90c8246e2d6b5a6efefa
-EBUILD kipi-plugins-0.3.0.ebuild 2149 RMD160 564f949cdab5cd126db7f90fe3cd4987a078b466 SHA1 c322686855eb410a8dda279d8ffa3fb1f7e52410 SHA256 ddaa58c76fd4168fb6951d333618163d218703075a979d57265f08e81175f836
-EBUILD kipi-plugins-0.4.0.ebuild 2156 RMD160 8e405784f19d8a5aa74d853bcc05598843729e29 SHA1 73c90fe5943b0403af1f34c3dce4e3935a5c564c SHA256 55b80b504dddc0ee98489ab5cc00742ecf7d4e0c9bb3a1b4b9b67bfafba77f39
-EBUILD kipi-plugins-0.5.0.ebuild 2155 RMD160 a780b9c491f6c455189996eb67fb7a0d4bc1ae13 SHA1 1e68643bac63981b8d6ac4ec5fedf7dfd5af38f1 SHA256 4e4f7f00aeec006866f11686172ff794caa050d515480a9ae4157ccf86a7dd72
-MISC ChangeLog 10509 RMD160 e57e47d1c4552147694dd058c7c51d465b834788 SHA1 d2e0f6ae685f483036af72f48e8e85e37b649b2b SHA256 c873029ed18aaf094ec572312dda7536bc726e53a397f54a4935df76771fc57a
+EBUILD kipi-plugins-0.6.0.ebuild 1724 RMD160 2686392d28496837879dbbfb52ab7e11fe2e41bd SHA1 71e98cd9f0874b8e78d170862d3a8fd83871436b SHA256 c20c923b46cf6b49deb1543862a30b7533494830d3478d3f8673a39eb66b0f31
+MISC ChangeLog 10756 RMD160 b038cc3d0f8463f98c49b0d8c79fe061d521e8ec SHA1 dc13ff0830cf270991aea11dd608dd48ca152019 SHA256 9c28e7fafa2a14bc633a575d91f9dd17a2e5143ce4da422d64f8681044118444
 MISC metadata.xml 334 RMD160 e2eb335e36d56e157d7ec99a4e69dc9363d7030b SHA1 c011597782306d847f8c99e16aa39fb7dbf72f24 SHA256 9fc059997dc429d52b950644823e1b1ac5b623d822025b741f5f851919826e42
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqaQY8ACgkQHB6c3gNBRYfLzQCgkThVEEGl0ebYnZNoGbpRg/Qp
+bggAoIzj/rF51mCN9aadiXPx1An83V0x
+=ORGk
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.3.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.3.0.ebuild
deleted file mode 100644
index 1f651bb9bf7a..000000000000
--- a/media-plugins/kipi-plugins/kipi-plugins-0.3.0.ebuild
+++ /dev/null
@@ -1,77 +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.3.0.ebuild,v 1.1 2009/05/22 16:17:57 scarabeus Exp $
-
-EAPI="2"
-
-KDE_MINIMAL="4.2"
-OPENGL_REQUIRED="optional"
-KDE_LINGUAS="ar be ca cs da de el es et fr ga gl hi 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 zn_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 redeyes scanner"
-SLOT="2"
-
-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 )
-	redeyes? ( media-libs/opencv )
-	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() {
-	# This Plugin hard depends on libksane, deactivate it if use flag scanner is
-	# not set.
-	if ! use scanner; then
-		sed -i \
-			-e '/acquireimages/ s:^:#DONOTCOMPILE :' \
-			"${S}"/CMakeLists.txt || die "Sed deactivating scanner support failed."
-	fi
-
-	# Fix linking
-	sed -i \
-		-e '/KDE4_KDEUI_LIBS/ c\\${KDE4_KIO_LIBS}'\
-		"${S}"/common/libkipiplugins/CMakeLists.txt \
-		|| die "Sed fixing kipi linking failed."
-
-	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)
-		$(cmake-utils_use_with redeyes OpenCV)"
-
-	kde4-base_src_configure
-}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.5.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.5.0.ebuild
deleted file mode 100644
index e5d79905d9af..000000000000
--- a/media-plugins/kipi-plugins/kipi-plugins-0.5.0.ebuild
+++ /dev/null
@@ -1,77 +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.5.0.ebuild,v 1.1 2009/07/24 18:08:10 hwoarang Exp $
-
-EAPI="2"
-
-KDE_MINIMAL="4.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 zn_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 redeyes scanner"
-SLOT="2"
-
-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 )
-	redeyes? ( media-libs/opencv )
-	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() {
-	# This Plugin hard depends on libksane, deactivate it if use flag scanner is
-	# not set.
-	if ! use scanner; then
-		sed -i \
-			-e '/acquireimages/ s:^:#DONOTCOMPILE :' \
-			"${S}"/CMakeLists.txt || die "Sed deactivating scanner support failed."
-	fi
-
-	# Fix linking
-	sed -i \
-		-e '/KDE4_KDEUI_LIBS/ c\\${KDE4_KIO_LIBS}'\
-		"${S}"/common/libkipiplugins/CMakeLists.txt \
-		|| die "Sed fixing kipi linking failed."
-
-	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)
-		$(cmake-utils_use_with redeyes OpenCV)"
-
-	kde4-base_src_configure
-}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.4.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.6.0.ebuild
index 904b1f017bb2..1e0ff9467d8d 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-0.4.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-0.6.0.ebuild
@@ -1,10 +1,9 @@
 # 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.4.0.ebuild,v 1.2 2009/07/04 10:15:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.6.0.ebuild,v 1.1 2009/08/30 09:08:26 scarabeus Exp $
 
 EAPI="2"
 
-KDE_MINIMAL="4.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 zn_CN"
@@ -19,7 +18,7 @@ SRC_URI="mirror://sourceforge/kipi/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="cdr calendar debug +imagemagick ipod mjpeg redeyes scanner"
-SLOT="2"
+SLOT="4"
 
 DEPEND="
 	>=dev-libs/expat-2.0.1
@@ -49,20 +48,6 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {
-	# This Plugin hard depends on libksane, deactivate it if use flag scanner is
-	# not set.
-	if ! use scanner; then
-		sed -i \
-			-e '/acquireimages/ s:^:#DONOTCOMPILE :' \
-			"${S}"/CMakeLists.txt || die "Sed deactivating scanner support failed."
-	fi
-
-	# Fix linking
-	sed -i \
-		-e '/KDE4_KDEUI_LIBS/ c\\${KDE4_KIO_LIBS}'\
-		"${S}"/common/libkipiplugins/CMakeLists.txt \
-		|| die "Sed fixing kipi linking failed."
-
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with calendar KdepimLibs)
 		$(cmake-utils_use_with opengl OpenGL)