Version bump; remove old

(Portage version: 2.1.9.26/cvs/Linux i686)

3 files changed, 51 insertions, 26 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 16dc091bdc8b..9de68f1a23ca 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.81 2010/11/25 21:08:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.82 2010/12/29 18:18:11 dilfridge Exp $
+
+*kipi-plugins-1.7.0 (29 Dec 2010)
+
+  29 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kipi-plugins-1.5.0.ebuild, +kipi-plugins-1.7.0.ebuild,
+  +files/kipi-plugins-1.7.0-expoblending.patch:
+  Version bump; remove old
 
 *kipi-plugins-1.6.0 (25 Nov 2010)
 
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 000000000000..3f7fdf68c6e3
--- /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-1.5.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-1.7.0.ebuild
index d2d2a6737719..3f37fcc17e4f 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-1.5.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-1.7.0.ebuild
@@ -1,12 +1,12 @@
 # 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.5.0.ebuild,v 1.3 2010/11/08 21:32:43 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-1.7.0.ebuild,v 1.1 2010/12/29 18:18:11 dilfridge Exp $
 
 EAPI="2"
 
 OPENGL_REQUIRED="optional"
-KDE_LINGUAS="ar be ca ca@valencia cs de el en_GB eo es eu fi gl hi hne hr is ja km
-lt lv mai ms nds nl pt pt_BR ro ru se sk sv th uk zh_CN zh_TW"
+KDE_LINGUAS="ar ast be ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl hi hne hr is it ja km
+lt lv mai ms nb nds nl nn pa pl pt pt_BR ro ru se sv tr uk zh_CN zh_TW"
 KMNAME="extragear/graphics"
 KDE_MINIMAL="4.5"
 inherit flag-o-matic kde4-base
@@ -14,7 +14,7 @@ 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-${PV}.tar.bz2 )"
+	handbook? ( mirror://gentoo/${PN}-doc-1.5.0.tar.bz2 )"
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
@@ -26,35 +26,37 @@ 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}
+	dev-libs/qjson
+	$(add_kdebase_dep libkdcraw)
+	$(add_kdebase_dep libkexiv2)
+	$(add_kdebase_dep libkipi)
 	virtual/jpeg
-	>=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 )
-	scanner? (
-		>=kde-base/libksane-${KDE_MINIMAL}
-		media-gfx/sane-backends
-	)
+	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 )
-	mjpeg? ( media-video/mjpegtools )
+	cdr? 		( app-cdr/k3b )
+	expoblending? 	( media-gfx/hugin )
+	imagemagick? 	( media-gfx/imagemagick )
+	mjpeg? 		( media-video/mjpegtools )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.3.0-expoblending.patch" )
+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