Remove old; fix libpng slot dependency

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

6 files changed, 29 insertions, 193 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 3e17628695b6..e8d43f728831 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.241 2013/03/31 16:58:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.242 2013/04/06 10:14:13 dilfridge Exp $
+
+  06 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org> -digikam-2.9.0.ebuild,
+  -files/digikam-2.9.0-mariadb55.patch, digikam-3.0.0.ebuild,
+  digikam-3.1.0.ebuild:
+  Remove old; fix libpng slot dependency
 
   31 Mar 2013; Agostino Sarubbo <ago@gentoo.org> digikam-3.0.0.ebuild:
   Stable for x86, wrt bug #462890
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 5b3ded75a0a2..7e1dffdf5859 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,29 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX digikam-2.9.0-mariadb55.patch 946 SHA256 84fd039462d6a8f100584174c30646d554ab7eea2f276b44aa05c49ce911589c SHA512 d10f7c8cf5fa727b36e2f07d604f328e6020d7f67648a1dbbfb5f2e7b8f3dbfe5b7e0c3be1d2591d9f8ddb709b91fa35d4202d7ea3c60357b4f9bbb4f523af1c WHIRLPOOL 55eaac8687424749cc9cafac10b374a8685cfa0a047ba9974f3f9ccd53280b29e336056dbb4eb6cb3b435dc96a7f7ab6a883d0096739c681f5d42b0b2675924e
-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 digikam-2.9.0.ebuild 4291 SHA256 1031f9e7d6c02f0b5c64b33b2fd4a11ee5ad6ea9d6720a9dba978cd9eeec9f19 SHA512 7f17a3884dd6f492d1967be76abf1fedb49b020404f73fe96fd25d4bb0f60bc35d19c3e85c6b3d67acf75a6184bb555d6c4a64c8c76996c6277137b6d6c66f2d WHIRLPOOL 1360a6e108fffa07f0bde0311a07cbd1cf464dc7ec03cd168e7f8dc352084cf0183dd4a811c5aa483a1ec8eeec567e758977a0f96f98654e405315f35609b919
-EBUILD digikam-3.0.0.ebuild 4175 SHA256 157ecba144c5259b376d356c387f7026b2b55b5f655733d9421822dee2a13a34 SHA512 03333ce790a7fa3160e137817dcae805df41c212c46897effa6c37c048e6e54bd5f02603792e418031f59c3e9fed00bbe666de2c7bb36626b13e749cef88dbc2 WHIRLPOOL 013a102d384e498278189127370303dfbbfdc982703c2607b6cf656cff12a91470d88aa278cecbc8e63c0dc506a89ab89b624a0f06c1f8022a27bc564e9026dd
-EBUILD digikam-3.1.0.ebuild 4183 SHA256 445e1895db4d4cbc1fd387dce8e62efa12928627e39afa020b0f1311ee0e864d SHA512 ddee784de626bbc50d14e2b590cda59d372fefd164df3eb515b56a092465e4f945d36e78f2723476dc5e7c8dac1025a5916d0ddcd8923e978b6de4f801563c03 WHIRLPOOL a11c5a8696c18aef4d5f5ef52de080037a0c5237c2daf2e783a176121bf2a2544fc4ab01847bf84b660e23cb9b036cea188cee6ea4321dfeee54cf5e50d30f16
-MISC ChangeLog 39960 SHA256 db43e29a0c5ae046123c85eef3b177c93efef9371bdf828dbec522300f0d51b0 SHA512 a98ce7f710fcdb8797a3eebc8ceb44160d55525c47a60b7917b7fa27b18675ad2d2fb4c6517c47b9e2338dd2f8f59c90507005df53318380e9bd2a83b8312368 WHIRLPOOL 43c7cabd1fc4551f3058cd92dcdbd95998de8fabe43d96b6af578e67159acdf3ac09792cce8f68ae8570ed9966691c0a7ec5b4b8479d7a616422facd90b591ac
+EBUILD digikam-3.0.0.ebuild 4182 SHA256 437c40f3c1fa42cadc35c7ec87076991261e326b86149a9cfdbc5305f1fef7e8 SHA512 03e1c7496e17c133ca54c6f51a4049bbeadf14be1b40faae72f1c61e9bf76c100ed9f72ccaeeb69a69973f4096bd236782ff0b809e5bae0cb01af4b3dd6dd8ce WHIRLPOOL 53e31ae5124e6d80bd918174461f883098e1c18178d4692b151a31ba897b18fdd3f4d517f40b96cd9665b12abc13857c59d17ceaa941612a39d48da636bccdee
+EBUILD digikam-3.1.0.ebuild 4184 SHA256 b9d068804f898896ab13f74a75524211698fe84fc88065d081bd597ce5a932d9 SHA512 4c4e9046a809c19422f7302e7b5fc4d33625b1159d2d24ee85918c92edc7fae6a73a9c7a55c1d83a5bb5bcfa4d397859b39a3df3446c05f2e23ec8b5451058e7 WHIRLPOOL f9847461f3e214c065763555779455eed63a2dfc7d5eecbf58e2ea23e1987b1f91262727fd786f35ee07dc8cfacb5145016eb42e9b0d35bcb141768291468a84
+MISC ChangeLog 40174 SHA256 f4f88b32f68ef362719ea30fa2bfa27a31e1da032859a5c53aedd6267891bd5f SHA512 a0cef4124dfeaab33735a82850621955a0b6a270c55e90286ba250b340c2a63436858159cf6361b08b2134f8a0f76be399843c595dc7e460d215db4378441f8f WHIRLPOOL 5c25af83e6de95c2da772930e1b19e7d87d694771b3f176e39cb587ebe6f160863cbc9389152085fd358917a6f7196eddc4f4a53bb908fd0797970a0251f525f
 MISC metadata.xml 648 SHA256 fed8bb77a841bcbc558e06fbe5f729a616152051924fa17fed0e527237f09f8c SHA512 70b5b6c2f5d5ae242a3a3fe287802eaf722cd611ea0db1abe1c2daabf7a960c2f7ebc30e646db52f373efa9f9aa18481abc422bf9b080a8d6248551e0b8bd86d WHIRLPOOL 45976f32e90b1ba1e0b654017400b7e4860cbf5f6a1284fbfd81d05dd3df13654d7cea41a925c6bfc227c63566fc2af80299458c9c866b10628e12d38951803f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRWGqeAAoJELp701BxlEWfCsEQAKOR6K/wHUnnS4ksz50i+mIi
-xXGbqJXQEzvTPJb9NLKfKknjfUvqxsQndd5R2juJHXetqeJpERlbqW5m2C1A/C+P
-m1ox3TH3NIkjYgOqC6e8CtcdMXZ3BlND606azC99JMp+gqLlmzVY6r4xsOFY3qEu
-UGzuN0yuCsKgLdnX08dWwz2rdUkscUS61KYR4+H3TKTrSVyy//JAMhcIKP1VJ0sp
-dI1ZbS+5JUlcJWor4IkGf7bHmJQSfdCc3QpYfQ7YfxySgESoswtJQtNe0nZZ4HRf
-RcS3IkR1/xRGKPcdwsHY4PSg5s0foeeaZ+NNxYs2uTZAf8452W0BEE+Rl542/sVU
-FeyyBcorr9n2Zxz49zWfeK2qI84uw173k3LAbdPh+0KHZmZrCLWZv1xLCArdANnA
-ELu3z/BwOqtsZkJG+SrpMPoqls3D3G1+he89DI3F2imHFm3j6PIJF9/lgwrNSDa8
-Go2865t7EVqdXCD6kk9WNO2mW6t7ebcSHu+y58chXbUdC+WBopF2Z9KachC57bCJ
-JS79H5vsRqXdRLaO/R2Ua/HzwxgeilJgLsjMSEKOY3D3XJfH6LOKx5IzL4QpacEA
-DcPPpwPzIKYXsf7gf9PXRWe+Z0k7fB7e05lO8fXX8vBjpbfgL7uZrmTRz+NmemWS
-RK+DqG385g8wdLcxGft1
-=ZP6i
+iQJ8BAEBCABmBQJRX/WwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcrpsP/3v5jGUNGqhSx4gwarGOh7lL
+qyJULPfjlySqNtXc/vgBe6bBIeiG647cGbb4p12DqEPoe3aJ9i2qvLIoEo+L1rlK
+o6hlDZhyl+Q4621+vc6xctfHujFkdpIDuP7SLr43QE5iQE00R9Bski2yFON8dnfe
+4iIjOQFf55fkqmYTBiJ8QnxC6Oga5+4ztnDctre+m+N0IDPGTJkeAMH2HeLXL7Z+
+m9/PIgEsDu/fLj3sVO5P8vWvOdGkKCdh+/qXWRzV15Go4qoDIiNpofl/YDsNjsEa
+UQsrz9oNhACMokoAm2/CSwBupXadzJbDUHrebdLM46+FqSvegVQcyOxCKJmGtDgB
+pLC3xw11+ryK2RBbFcCoAsnGMk1IrE1jxRuubcG83cm3yGt2eXUzP8Cwm4W4o1EP
+W7WLjB3fAcHICJq5CYq9ozBFBNC21tOVaI0xcBvWloE4eAwx3FdJbPPLlU56GwCt
+6uTIXCSdaxy4h7jkcCgUQ1d+lkKEQm+MAJxs5MTM0NxT3AGszUEkMDd05ClKq/5D
++2D9L5/9NyH+jcUtnG2MfUpF3xaYjTTYkWSYG6O8b0YSBCyq4mbjaPHZHv5grozZ
+RcYUi+hkZ4dWQ+T+DMmglIqO3Jcc+SHIBe2GmALFCo6C1An2KxLQL99QudmG4Mpt
+kp5fmOTIar3NtwWTCu3z
+=6ajV
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.9.0.ebuild b/media-gfx/digikam/digikam-2.9.0.ebuild
deleted file mode 100644
index 766502680dc9..000000000000
--- a/media-gfx/digikam/digikam-2.9.0.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.9.0.ebuild,v 1.7 2013/03/02 21:34:50 hwoarang Exp $
-
-EAPI=4
-
-KDE_LINGUAS="af 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 sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-CMAKE_MIN_VERSION="2.8"
-KDE_MINIMAL="4.8"
-
-KDE_DOC_DIRS="doc-digikam doc-showfoto"
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Digital photo management application for KDE"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
-
-#Keep libf2c blocker until bug 433782 is resolved
-CDEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep kdebase-kioslaves)
-	$(add_kdebase_dep libkdcraw)  <kde-base/libkdcraw-4.9.50
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep libkipi)  <kde-base/libkipi-4.9.50
-	$(add_kdebase_dep marble plasma)
-	$(add_kdebase_dep solid)
-	media-libs/jasper
-	media-libs/lcms:0
-	media-libs/lensfun
-	media-libs/libkface
-	media-libs/libkgeomap
-	media-libs/liblqr
-	>=media-libs/libpgf-6.12.27
-	media-libs/libpng
-	media-libs/tiff
-	sci-libs/clapack
-	virtual/jpeg
-	dev-qt/qtgui:4[qt3support]
-	|| ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	gphoto2? ( media-libs/libgphoto2 )
-	mysql? ( virtual/mysql )
-"
-RDEPEND="${CDEPEND}
-	$(add_kdebase_dep kreadconfig)
-	media-plugins/kipi-plugins
-	video? (
-		|| (
-			$(add_kdebase_dep mplayerthumbs)
-			$(add_kdebase_dep ffmpegthumbs)
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=( "${FILESDIR}/${PN}-2.9.0"-mariadb55.patch )
-
-src_prepare() {
-	# just to make absolutely sure
-	rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
-	# prepare the handbook
-	mkdir doc-digikam doc-showfoto || die
-	echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
-	echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
-	mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
-	sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -name "digikam.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 || die
-
-	kde4-base_src_prepare
-
-	if use handbook; then
-		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
-		echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
-	fi
-}
-
-src_configure() {
-	local backend
-
-	use semantic-desktop && backend="Nepomuk" || backend="None"
-	# LQR = only allows to choose between bundled/external
-	local mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-		-DWITH_LQR=ON
-		-DWITH_LENSFUN=ON
-		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
-		$(cmake-utils_use_with addressbook KdepimLibs)
-		-DWITH_MarbleWidget=ON
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_enable themedesigner)
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
-		$(cmake-utils_use_enable mysql INTERNALMYSQL)
-		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
-	)
-
-	kde4-base_src_configure
-}
-
-src_compile() {
-	local mytargets="all"
-	use doc && mytargets+=" doc"
-
-	kde4-base_src_compile ${mytargets}
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		# install the api documentation
-		insinto /usr/share/doc/${PF}/html
-		doins -r ${CMAKE_BUILD_DIR}/api/html/*
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use doc; then
-		elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
-	fi
-}
diff --git a/media-gfx/digikam/digikam-3.0.0.ebuild b/media-gfx/digikam/digikam-3.0.0.ebuild
index c6e53a840103..7b8c9e538190 100644
--- a/media-gfx/digikam/digikam-3.0.0.ebuild
+++ b/media-gfx/digikam/digikam-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-gfx/digikam/digikam-3.0.0.ebuild,v 1.4 2013/03/31 16:58:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-3.0.0.ebuild,v 1.5 2013/04/06 10:14:13 dilfridge Exp $
 
 EAPI=5
 
@@ -45,7 +45,7 @@ CDEPEND="
 	media-libs/libkgeomap
 	media-libs/liblqr
 	>=media-libs/libpgf-6.12.27
-	media-libs/libpng:=
+	media-libs/libpng:0=
 	media-libs/tiff
 	sci-libs/clapack
 	virtual/jpeg
diff --git a/media-gfx/digikam/digikam-3.1.0.ebuild b/media-gfx/digikam/digikam-3.1.0.ebuild
index 5bb65b3c619d..93c77b221212 100644
--- a/media-gfx/digikam/digikam-3.1.0.ebuild
+++ b/media-gfx/digikam/digikam-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-gfx/digikam/digikam-3.1.0.ebuild,v 1.1 2013/03/29 16:43:36 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-3.1.0.ebuild,v 1.2 2013/04/06 10:14:13 dilfridge Exp $
 
 EAPI=5
 
@@ -45,7 +45,7 @@ CDEPEND="
 	media-libs/libkgeomap
 	media-libs/liblqr
 	>=media-libs/libpgf-6.12.27
-	media-libs/libpng:=
+	media-libs/libpng:0=
 	media-libs/tiff
 	sci-libs/clapack
 	virtual/jpeg
diff --git a/media-gfx/digikam/files/digikam-2.9.0-mariadb55.patch b/media-gfx/digikam/files/digikam-2.9.0-mariadb55.patch
deleted file mode 100644
index 7b896fe7246e..000000000000
--- a/media-gfx/digikam/files/digikam-2.9.0-mariadb55.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN digikam-2.9.0.orig/core/CMakeLists.txt digikam-2.9.0/core/CMakeLists.txt
---- digikam-2.9.0.orig/core/CMakeLists.txt	2012-09-02 12:38:13.000000000 +0200
-+++ digikam-2.9.0/core/CMakeLists.txt	2012-11-10 14:20:11.000000000 +0100
-@@ -288,7 +288,7 @@
- #       under MACOS-X, through macports project, mysql_install_db PERL script is named "mysql_install_db5"
-     FIND_PROGRAM( INITCMD_MYSQL mysql_install_db mysql_install_db5 mysql_install_db.pl
-                   PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec
--                        /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin ${MYSQL_TOOLS_PATH}
-+                        /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin /usr/share/mysql/scripts ${MYSQL_TOOLS_PATH}
-                        ENV MYSQL_TOOLS_PATH )
-     MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}")
-     SET(DATABASESERVERDIR "${CMAKE_CURRENT_SOURCE_DIR}/databaseserver")