Remove old; libpng slot dependency

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)

5 files changed, 10 insertions, 157 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index f969499ef156..b51fd60fe140 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.142 2013/03/31 16:59:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.143 2013/04/06 10:19:32 dilfridge Exp $
+
+  06 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/kipi-plugins-2.6.0_beta3-options.patch, -kipi-plugins-2.9.0.ebuild,
+  kipi-plugins-3.0.0.ebuild, kipi-plugins-3.1.0.ebuild:
+  Remove old; libpng slot dependency
 
   31 Mar 2013; Agostino Sarubbo <ago@gentoo.org> kipi-plugins-3.0.0.ebuild:
   Stable for x86, wrt bug #462890
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-options.patch b/media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-options.patch
deleted file mode 100644
index 86733b15cbc6..000000000000
--- a/media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-options.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ruN digikam-2.6.0-beta3.orig/extra/kipi-plugins/CMakeLists.txt digikam-2.6.0-beta3/extra/kipi-plugins/CMakeLists.txt
---- digikam-2.6.0-beta3.orig/extra/kipi-plugins/CMakeLists.txt	2012-04-01 12:54:26.000000000 +0200
-+++ digikam-2.6.0-beta3/extra/kipi-plugins/CMakeLists.txt	2012-04-08 18:50:53.918419219 +0200
-@@ -391,7 +391,11 @@
-     ADD_SUBDIRECTORY(picasawebexport)
-     ADD_SUBDIRECTORY(smug)
-     ADD_SUBDIRECTORY(printimages)
--    ADD_SUBDIRECTORY(expoblending)
-+
-+    IF(ENABLE_expoblending)
-+        ADD_SUBDIRECTORY(expoblending)
-+    ENDIF(ENABLE_expoblending)
-+
-     ADD_SUBDIRECTORY(kopete)
-     ADD_SUBDIRECTORY(batchprocessimages)
-     ADD_SUBDIRECTORY(rajceexport)
-@@ -457,9 +461,11 @@
-         ADD_SUBDIRECTORY(mediawiki)
-     ENDIF(MEDIAWIKI_FOUND)
- 
--    IF(Boost_FOUND)
--        ADD_SUBDIRECTORY(panorama)
--    ENDIF(Boost_FOUND)
-+    IF(ENABLE_panorama)
-+        IF(Boost_FOUND)
-+            ADD_SUBDIRECTORY(panorama)
-+        ENDIF(Boost_FOUND)
-+    ENDIF(ENABLE_panorama)
- 
- #   Laurent Montel : wallpaper is currently disabled. Waiting new api with KDE 4.2
- #
diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.9.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.9.0.ebuild
deleted file mode 100644
index c28fd4f7b4c7..000000000000
--- a/media-plugins/kipi-plugins/kipi-plugins-2.9.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.9.0.ebuild,v 1.5 2012/11/23 06:25:05 dilfridge Exp $
-
-EAPI=4
-
-OPENGL_REQUIRED="optional"
-
-KDE_MINIMAL="4.7"
-
-KDE_LINGUAS="ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga
-gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn
-nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr ss sv ta te tg th tr tt uk uz ven vi wa xh
-zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-
-inherit flag-o-matic kde4-base
-
-MY_PV=${PV/_/-}
-MY_P="digikam-${MY_PV}"
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki mjpeg panorama redeyes scanner vkontakte"
-
-DEPEND="
-	$(add_kdebase_dep libkipi)  <kde-base/libkipi-4.9.50
-	$(add_kdebase_dep libkdcraw)  <kde-base/libkdcraw-4.9.50
-	$(add_kdebase_dep libkexiv2)
-	dev-libs/expat
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/qjson
-	gpssync?	( media-libs/libkgeomap )
-	media-libs/libpng
-	media-libs/tiff
-	virtual/jpeg
-	calendar?	( $(add_kdebase_dep kdepimlibs) )
-	crypt?		( app-crypt/qca:2 )
-	ipod?		(
-			  media-libs/libgpod
-			  x11-libs/gtk+:2
-			)
-	mediawiki?	( >=net-libs/libmediawiki-2.6.0 )
-	panorama?	( dev-libs/boost )
-	redeyes?	( media-libs/opencv )
-	scanner? 	(
-			  $(add_kdebase_dep libksane)
-			  media-gfx/sane-backends
-			)
-	vkontakte?	( net-libs/libkvkontakte )
-"
-RDEPEND="${DEPEND}
-	cdr? 		( app-cdr/k3b )
-	expoblending? 	( media-gfx/hugin )
-	imagemagick? 	( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
-	mjpeg? 		( media-video/mjpegtools )
-	panorama?	(
-			  media-gfx/enblend
-			  >=media-gfx/hugin-2011.0.0
-			)
-"
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-RESTRICT=test
-# bug 420203
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0_beta3-options.patch"
-)
-
-src_prepare() {
-	# prepare the handbook
-	mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
-	if use handbook; then
-		echo "add_subdirectory( doc )" >> CMakeLists.txt
-	fi
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -name "kipiplugin*.po" -exec rm {} +
-	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
-	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-	echo "add_subdirectory( po )" >> CMakeLists.txt
-
-	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 gpssync KGeoMap)
-		$(cmake-utils_use_with mediawiki MEDIAWIKI)
-		$(cmake-utils_use_with redeyes OpenCV)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with scanner KSane)
-		$(cmake-utils_use_enable expoblending)
-		$(cmake-utils_use_enable panorama)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-3.0.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.0.0.ebuild
index cf2dac6e406a..23d3b104ba19 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-3.0.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.0.0.ebuild,v 1.5 2013/03/31 16:59:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.0.0.ebuild,v 1.6 2013/04/06 10:19:32 dilfridge Exp $
 
 EAPI=5
 
@@ -39,7 +39,7 @@ DEPEND="
 	dev-libs/libxslt
 	dev-libs/qjson
 	gpssync?	( media-libs/libkgeomap )
-	media-libs/libpng
+	media-libs/libpng:0=
 	media-libs/tiff
 	virtual/jpeg
 	calendar?	( $(add_kdebase_dep kdepimlibs) )
diff --git a/media-plugins/kipi-plugins/kipi-plugins-3.1.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.1.0.ebuild
index 07d363c2f325..05d9a0e9f88c 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-3.1.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.1.0.ebuild,v 1.1 2013/03/29 16:26:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.1.0.ebuild,v 1.2 2013/04/06 10:19:32 dilfridge Exp $
 
 EAPI=5
 
@@ -39,7 +39,7 @@ DEPEND="
 	dev-libs/libxslt
 	dev-libs/qjson
 	gpssync?	( media-libs/libkgeomap )
-	media-libs/libpng
+	media-libs/libpng:0=
 	media-libs/tiff
 	virtual/jpeg
 	calendar?	( $(add_kdebase_dep kdepimlibs) )