Add patch to remove hard mysql dependency, bug 366615

(Portage version: 2.1.9.48/cvs/Linux x86_64)

3 files changed, 196 insertions, 1 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 9052399cbf99..064c84feac11 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.182 2011/05/09 23:10:48 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.183 2011/05/10 21:00:02 dilfridge Exp $
+
+*digikam-1.9.0-r1 (10 May 2011)
+
+  10 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-nomysql.patch:
+  Add patch to remove hard mysql dependency, bug 366615
 
   09 May 2011; Markos Chandras <hwoarang@gentoo.org> digikam-1.9.0.ebuild:
   Stable on amd64 wrt bug #354033
diff --git a/media-gfx/digikam/digikam-1.9.0-r1.ebuild b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..c37abe0a4c38
--- /dev/null
+++ b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0-r1.ebuild,v 1.1 2011/05/10 21:00:02 dilfridge Exp $
+
+EAPI=3
+
+KDE_LINGUAS="ar be bg ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl he hi hne hr hu is it ja km
+ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW"
+KMNAME="extragear/graphics"
+
+# needed for sufficiently new libkdcraw
+KDE_MINIMAL="4.5"
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="A digital photo management application for KDE."
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )"
+
+LICENSE="GPL-2
+	handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="4"
+IUSE="addressbook debug doc geolocation gphoto2 handbook mysql semantic-desktop themedesigner +thumbnails video"
+
+CDEPEND="
+	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
+	>=kde-base/libkdcraw-${KDE_MINIMAL}
+	>=kde-base/libkexiv2-${KDE_MINIMAL}
+	>=kde-base/libkipi-${KDE_MINIMAL}
+	>=kde-base/solid-${KDE_MINIMAL}
+	media-libs/jasper
+	virtual/jpeg
+	media-libs/lcms:0
+	>=media-libs/lensfun-0.2.5
+	media-libs/liblqr
+	media-libs/libpng
+	media-libs/tiff
+	media-libs/libpgf
+	>=media-plugins/kipi-plugins-1.2.0-r1
+	>=sci-libs/clapack-3.2.1-r3
+	x11-libs/qt-gui[qt3support]
+	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
+	geolocation? ( >=kde-base/marble-${KDE_MINIMAL}[plasma] )
+	gphoto2? ( media-libs/libgphoto2 )
+	mysql? ( virtual/mysql )
+"
+RDEPEND="${CDEPEND}
+	>=kde-base/kreadconfig-${KDE_MINIMAL}
+	video? (
+		|| (
+			>=kde-base/mplayerthumbs-${KDE_MINIMAL}
+			>=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+		)
+	)
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+		"${FILESDIR}/${PN}"-1.9.0-docs.patch
+		"${FILESDIR}/${PN}"-1.8.0-tests.patch
+		"${FILESDIR}/${PN}"-1.9.0-nomysql.patch
+	)
+
+src_prepare() {
+	if use handbook; then
+		mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die
+	else
+		mkdir doc || die
+		echo > doc/CMakeLists.txt || die
+	fi
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	local backend
+
+	use semantic-desktop && backend="Nepomuk" || backend="None"
+	# LQR = only allows to choose between bundled/external
+	mycmakeargs=(
+		-DFORCED_UNBUNDLE=ON
+		-DWITH_LQR=ON
+		-DWITH_LENSFUN=ON
+		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
+		$(cmake-utils_use_with addressbook KdepimLibs)
+		$(cmake-utils_use_build doc)
+		$(cmake-utils_use_with geolocation MarbleWidget)
+		$(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 MYSQL)
+	)
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	kde4-base_src_install
+
+	if use doc; then
+		# install the api documentation
+		dodir /usr/share/doc/${PF}/html || die
+		insinto /usr/share/doc/${PF}/html
+		doins -r ${CMAKE_BUILD_DIR}/api/html/* || die
+	fi
+
+	if use handbook; then
+		dodoc readme-handbook.txt || die
+	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/files/digikam-1.9.0-nomysql.patch b/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch
new file mode 100644
index 000000000000..50dec5480869
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch
@@ -0,0 +1,60 @@
+--- digikam-1.9.0-vanilla/CMakeLists.txt	2011-02-28 02:16:18.000000000 +0600
++++ digikam-1.9.0-vanilla/CMakeLists.txt	2011-05-09 19:45:02.000000000 +0700
+@@ -2,6 +2,7 @@ 
+ 
+ OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=OFF)" OFF)
+ OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON)
++OPTION(ENABLE_MYSQL "Build digiKam with MySQL database support (default=ON)" ON)
+ 
+ # ==================================================================================================
+ # Information to update before to release this package.
+@@ -189,20 +190,22 @@ 
+     SET(KEXIV2_FOR_DIGIKAM TRUE)
+ ENDIF(NOT WIN32)
+ 
++IF (ENABLE_MYSQL)
+ # Check MySQL executables
+-FIND_PROGRAM( SERVERCMD_MYSQL mysqld
+-              PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/local/libexec
+-                    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin ${MYSQLD_PATH}
+-                    ENV MYSQLD_PATH )
+-MESSAGE(STATUS "Found MySQL server executable at: ${SERVERCMD_MYSQL}")
++	FIND_PROGRAM( SERVERCMD_MYSQL mysqld
++        	      PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/local/libexec
++                	    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin ${MYSQLD_PATH}
++	                    ENV MYSQLD_PATH )
++	MESSAGE(STATUS "Found MySQL server executable at: ${SERVERCMD_MYSQL}")
+ 
+ # NOTE: under windows, mysql_install_db PERL script is named "mysql_install_db.pl"
+ #       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}
+-                    ENV MYSQL_TOOLS_PATH )
+-MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}")
++	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}
++	                    ENV MYSQL_TOOLS_PATH )
++	MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}")
++ENDIF (ENABLE_MYSQL)
+ 
+ # ==================================================================================================
+ # Optional dependencies
+@@ -274,10 +277,12 @@ 
+ MESSAGE(STATUS "")
+ 
+ PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND)
+-PRINT_EXECUTABLE_STATUS("MySQL Server" mysqld MYSQLD_PATH SERVERCMD_MYSQL)
+-IF (NOT WIN32)
+-    PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MYSQL_TOOLS_PATH INITCMD_MYSQL)
+-ENDIF (NOT WIN32)
++IF (ENABLE_MYSQL)
++	PRINT_EXECUTABLE_STATUS("MySQL Server" mysqld MYSQLD_PATH SERVERCMD_MYSQL)
++	IF (NOT WIN32)
++	    PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MYSQL_TOOLS_PATH INITCMD_MYSQL)
++	ENDIF (NOT WIN32)
++ENDIF (ENABLE_MYSQL)
+ PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND)
+ PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND)
+ PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND)