Remove old; libpng slot dependency

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

6 files changed, 29 insertions, 177 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/Manifest b/media-plugins/kipi-plugins/Manifest
index f868995bd9c6..30d9f3942eca 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,30 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX kipi-plugins-2.6.0_beta3-options.patch 1091 SHA256 2550af0eb24416a145fbfa5de5493dfb9568f20bf98b86efb108dd2c6fc5cb58 SHA512 0f399cf3de49763f383ad9e4c9d75a79d1dc6a538e81f1a51ccb02e8018c57b8c5b168f91faeaa98a488bdfa98c166b22d269f5e85618e1273f15f9ea3f1e84c WHIRLPOOL b5154f31b18e274e706490acac2e610239c7db94f2cb8ea8b28f8b0101fc65f656a4325b1ba48c6953951ea45b29afaf639a0d8e0204d2a958ba1dce7cbad50a
 AUX kipi-plugins-3.0.0-options.patch 1069 SHA256 064e9b865c21491eec7947cf0e12160866983f982243a4cc715efbf9116b172e SHA512 d58edfe3955e480e34c3ee64313c5ada15a664df7dc2369791f1bd5d7e05bc5f1666681d5b008a580de6cb00ff6c87d13dd1845ed0d7ad70a76e9888edce96cd WHIRLPOOL e59b098d5f8fcb2b487ae1dda07ed0cbc9cfa81095655eb120e985defa2aadb7e2bca6db015f1f1c6ef1645e2c8b1f329cb595c588ffc3f09c977b2cd69d856e
-DIST digikam-2.9.0.tar.bz2 56765772 SHA256 73dd0f3820fc44bba7b72c98cab73d0391e98687674da8be11ff07590c703ba0 SHA512 ef6b94f3752bd91f3b6da14f509379e3fe7bef166bc617642c531fb0a88b94876f7c59deede3957093070396c4fa9b8c6635ce9a71b7230a2809426a82e721ec WHIRLPOOL 1e5a0d61de5448f11e928f7420eba3a1c548f7a6e65dadc4728ccf304194c9653b97a78da0752d4e92be450759a5fa9fa00c66230d32aa43e581686706023e53
 DIST digikam-3.0.0.tar.bz2 58701849 SHA256 052afa32d36a075afae6d789817c073a2aa6c4037f31c603da4999a4c6579574 SHA512 f544ab2eccacf0864d0f6ad98276228f12a500896867e48048679951fbb05071269e6ff9d660df3fb1ff6dda17d93d1134d79deae38985c756e27c7a77cf6801 WHIRLPOOL 8216c4e40baf3e8996b1cdf6d014e8c9e719d1bb56656a16065d802f6863b1b26071db80232b25904d1cbb721da234b5f0e651745fbe546cf4eb9587f510f8c1
 DIST digikam-3.1.0.tar.bz2 58559707 SHA256 f70fc84f3a680a855642fcc4664710116406bbe4068b0ad4d2cfb4127684c2aa SHA512 dd81049b159f36f80dbd779d2ab4ff11a7b8ec523fe8775af4fd3cd4894ca1eda0608f8838cfb756d96150b7437c0f0f10618303d3f8b4453db92a2590459c8d WHIRLPOOL 741ae9c67e16073dfefe5c1b0d1713ecce0fd9cd6af3bbd298bccf0709bac484ef0c518ab9effe67e2dd79cf1fffc12df962798b91ecd776b7c059e87854a781
-EBUILD kipi-plugins-2.9.0.ebuild 3395 SHA256 cef442b63b4e32a745813a41117aec65db41d83e2f7dc69c83060169847bccd3 SHA512 26af530abd07fb044a397aa653450f28cd0dea73eb10e3941ab76f3b78d909b42ec17a5e37f01e56264078067ee84aae7d2f93273a85c0606a267a9419ffb794 WHIRLPOOL 5f3f502854a558d43a705c40029485c6fa87439d5f0641fd10b1261ee83dbe29e1e9fe278feebe4cc4e20fb3d165ecc860705e2f841f2ad39f09d5e2da8fb731
-EBUILD kipi-plugins-3.0.0.ebuild 3428 SHA256 9aa592c958c910dee047839fbde875beda4a4ce4d8ba8890ea714acbf39edce6 SHA512 e1fc4c7636e8ec60f6eff643f26ca321a1e7daf20b3c629c3b3e9ba8796c186ee874062ab073c885e3d23d50c0feedfd5b3f3cd9f24d6eaf308103b7c0e799f9 WHIRLPOOL fe36a7856f05ae6ecff3e8f3bf4580cffffbbd49c04f6e35747c878b8b429ce775ec553a2897dbd7c246c28709bbedd20cb71690f8514dad4c7845a71293c8b1
-EBUILD kipi-plugins-3.1.0.ebuild 3436 SHA256 337c5e17b08841f03f9cf6a5b39a137ea535c518922ae8f282caf6bfa84a18f7 SHA512 717976f2ac892f734ba2b2958c45d18d7ee308b69e26d394a65ab64de3fa11a2b64b7f1525b66a9d5a2d590f060b689ed4442db0109abebd8e8c618fd710f554 WHIRLPOOL e32175a51d9b473ba7e4e8ad78b48399e581a29f47269231cac356d69f99d4365ef9da5ada8e4750d0fb26cf4edb9fa9d2ce896a394e7d15f0869548267c4ae8
-MISC ChangeLog 23698 SHA256 22329ccfaa1aad03c1f39861345e24f9700e62c77a50be6e22e73e0a8279fa7f SHA512 36854aa7b17c6414081858f866d783510c6de70564c2f7d09343060772208813d3fc2bdd7358cefa94b831d1be4ead85ba0ae93e6d7b0a8cb8dc2afdcfe7302d WHIRLPOOL 5df8fee79f601659a0d24e603921e9c7cf4f1a02558e7b7052ddaa50bfe4e88aea1e502f485956da295f7238d4e39db94e08f83c6b7e9269999fbc1ef95a6fe4
+EBUILD kipi-plugins-3.0.0.ebuild 3437 SHA256 5ac9b553c1f22c89ec31208ef4a467d869a168f60b612d0ee9ae8718069b41e7 SHA512 60806a51d180ea1a4b143f200aee4d8ea40bdbf3728b77ba7f8735f24a3ad794bdd5711a7228b54037bc2ddc04b8bfa6f825bf6209d0cee1df353a452d673389 WHIRLPOOL 889f108a7e1f71ee7dfdc32c3c232732ea5872f578a28c5e2198a0897f4d10a36ab0bbf196488c6efaa3f6cb3268a221556f229dca2fc2ac1278ca1c13f3bc8f
+EBUILD kipi-plugins-3.1.0.ebuild 3439 SHA256 b57d5994975949f88908a9dd32e1c5a4668818555ee5695628a990a6e1a9ee33 SHA512 b5797d45028e03ebf3513254e3947564ffe8a94e859c7daa31a53fc98374e0479b8050102bba08c9c0a8241d4abc6743f97f9fa8588f8e7916b258a613ee8ab2 WHIRLPOOL 66f7fa49f62e018b7c58508ea087592c6e6cc09f433df73ff7650b1a248ef1b976dad3b31e3801157e0d2f208c834f38628cc03e9c073f7813b650bd46693d36
+MISC ChangeLog 23932 SHA256 f7ebd304486c5f709aeb635ef158da9bbbde5b7be6007e2ebd7249f570294cde SHA512 bf2e291838268eb7b852d3036513df519cf076fd3d263e91f778c753ca77307e1c51ea6d5f16c2d92cbb88f6579c2486ea52e6b9b85992e55786f012e8291a0c WHIRLPOOL d707c7bcf605fb1f368093eb273a59ea08c4bc29446f7e40b9d0c0196ca4f82df73abc1a479a81190d0d79b0a877d0a2f1192ae49852065dd6cd6341a1477bab
 MISC metadata.xml 961 SHA256 8a137c5797a41e37989bd78aa7761c84a42b685b59b7f5b3ddbd1639b4637af0 SHA512 7e1a93a9317e3a46cf7780bfea20439956419cbbacf241604ca15c573aa57774b4a6959fd6dec2c605f5973b57e03162e7ca9e25e6ee711520df9a423ad0c160 WHIRLPOOL bd78564f762bdab04b3466a86579d8d4c065e1b8eb28399b2bb2b8d59bb518b1d7e4916f2238376cc14eb0b064b7cdcba53ee77a211fc746ae1e0bb8ebf7ea98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRWGrCAAoJELp701BxlEWfDfAP/3XGAHGvQc0Vvwjk9Cxf9+Fl
-2fXDbWsQtpflbXv0bhG0ZH92WaU8HuR3xI31XeUYEgSpt0wjdfXyMYyLmw1TSgkj
-nfapVK8MKeNuXg8f4PPZkGX9JDGQgEgG6L5d6uw6R28XUzacbP+fKPm2n0gwuSpd
-X4Rc+jDxviHi+vHGKgT9VJMekz5Gr7JQEbcmI7Y+GY9+i2JMx+lNl/Z7Oi/aevnJ
-pgO3zUMPnNbtoktOmp5rSwfkgGHUIZ+O2cw8yb6E//Z8SZ2GDvZxwxjW4jlPjd4G
-vC7NVSrTWj3MDPXuvyW1t0DPJu6iIuhuX9ZW6AaN976j/dcB/aKg9sPoqnxWEvdn
-UFjyaN3JNJpfvEeEPRdPykMIN2dbdXLzcv0MjBytef4+fRhWfVkvXXq7REX6waOY
-uJbgDQFodAQF6CZH0Q2jtRzgEu7n0xUKeaCXOjbs/eaLYMwFn50OObbssGLHZuPw
-E2jIduTktlcoMEHAfzmP3vvG1karihZrqLR7dxrTVf3gt3VTkdKCZrVUdGkQr+5R
-valYovzGTmuC1CFJp+NqpqS8fP+mI1feOqLWxouXUMnATjEdGUgRZxxuFH0OZDBn
-mn1nC4HY4nFesdEK/WgbhL7qg2hTsXx7ekHBMt2s11j5rJIaEiQ9BMjjraSw0hGP
-5Db/ZgnWLJ+bJ4tuaPeu
-=X7A/
+iQJ8BAEBCABmBQJRX/bvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcZrwQAMwrVDoRmC+s4f9tOPzE5iyO
+HnVNrjNJGdjOTGrEaE9p4APgSUHQHldwkz2rQe3zzUU2R3AVjFwdVHXc6wo03vp4
+bD4iOwSkqWrUcimvZIGszu8gigiWmkQSZHoE0uj1Vx74OOjm8crzIYKG18J2IVee
+pwQd0vwt64UB0ChaTckccjKe+mEmxbUbjq9zD0tf86zuZe7Ji6Eh0HCKtyN1/j6q
+IYRzuy66QmXYYMitVRGdohNx7Lh54YMbXePN+lRIdih/GIDjzwsUfZui7NLcvTf3
+pNpIZAi73UkGnX4rVN2Zv4qUjJ2KxK6MzX4Q3+HpSNa8GyoMFMZkJ8oAc2nar1yJ
+wkGHJCj1aLtLJxyNWrpWhTVPrbnCZJh+1OilrlHMx2FOJ5pzb3TlEcR/34WKHD3h
+sKAdoAX2YtAcTl7iukhznxV5XnbL/tjWc0mtOmnbyW645msQTTqNl+647sQ3WhJ6
+584WeQivr15KWozza5Pe9jT7jGX1TUIqp/HDFJryLz4E6AZPv1gQbS3Q9UtnESmC
+v4ccsHEUnvayl8XIAUf3DTF2zVRXIBrNIj2riiSxwNFOLu4y6VX3J6ZVXcJCppgk
+6Jgc+S3wa94nsVQ3z6zom0AY0IkuwHm+EBIP+BDYZxg+myFHiR8T5e9BBaF5OvNm
+HObrYV0nVml7xNhIzmLE
+=aIlk
 -----END PGP SIGNATURE-----
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) )