Remove old; fix libpng slot dependency

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

5 files changed, 10 insertions, 173 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/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")