Add patch to remove hard mysql dependency, bug 366615

Package-Manager: portage-2.1.9.48/cvs/Linux x86_64

4 files changed, 212 insertions, 15 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/Manifest b/media-gfx/digikam/Manifest
index 440e398294f4..31051143b884 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -7,27 +7,29 @@ AUX digikam-1.2.0-libpgf-r3.patch 6824 RMD160 cf771745da65673a6783a3ed9d6d2a0e74
 AUX digikam-1.2.0-ratingwidget.patch 413 RMD160 b7e86997019fa16590a565b8e18fb43c287c7e88 SHA1 aa90381903000f28c105677e12f4b6813363659a SHA256 48cf828b847cd4346b9f5512fa1a010565680d31996bf2492c7bf256caf04231
 AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c
 AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a931af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af
+AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c
 DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
+EBUILD digikam-1.9.0-r1.ebuild 3351 RMD160 9a3da4b9de8fa9868d7fc922af8e5f04eeab6c0d SHA1 da9d1c54b08b42db52056a2edd5b047e2aaf5a59 SHA256 c02b152f72826bcefaaed94a07928d68c767784e707aa507b52d6abee843ec25
 EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
-MISC ChangeLog 30323 RMD160 6d37f61c52be0dcc8d8c1431138b26613d54df20 SHA1 e431ca05353251dff593ea9d24aca74fcdce1ae5 SHA256 87bb9b922e863848b38f2f5fa2cd9eba422cf3f247d875e5aaa7b1c3a1c3ab57
+MISC ChangeLog 30535 RMD160 ef5eab39403381936668182166b576734183d265 SHA1 e3ce89205a27112091c80e333139a52f742c87ac SHA256 86cd80f5ede418e249df6ff111735498346a474a4673d904d66b9f20b0276c93
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNyHSGAAoJEPqDWhW0r/LCE8IQAI1gxKSDo6at0cvbcxF1prPm
-nnELiZqoD8Nf2rwQI4utQFgCc8b91MqTkfKyqmyQD6ItyOXyRk9TR23N1F7x5ofh
-JtTpuzaGfi01FRI56kQHJ5ILEFcY9JQwdP8ie+ld4fzzw+HzNJxlNwFrNMJ0kRwN
-fW04HeGJeOekyyynd6YaPotpZAqEflZFXmZP/MlO3UBoBqU29Pi1ucAuAR/KHyfF
-Fz/qB+u+jgUEtBBqGDtF5jyQcjfYykYQTy1Ilbqqt6eMiBW98lsWYR3/l+S4NSe0
-uhlyLAxWEfm6N9ti0bRP/F6I3a10YuxgWn97sBLFAwsKmPksk7I5iKyQKP8IkV0m
-nnIeK9XQabR5R1XgKKfAUeSQ1JiR2ifmKpzrS3t80wIBfSHwwRFHPJxvoL8PCgdF
-vWxr15t7iBbLcKvEokH3gwhdFUfmvqU0SHeZXlyTb7Y1gFwdbG91wmmwjJa/7C11
-oi2QNViNvNyOh5r5h7Mtqn2JDqsNXEn6hpom7zK34yRqN99TizqXgBDtXD4ykmNz
-Kp1wDaEOXUpkWoZKqa+AnKixyqTBSb7U/uniuuQAP1iXwrMa9U9Rr/prCMDyFZM0
-6Yq0tiAqhaPKSkcHOl9S06oON1MyhKt7//VSj4FgbSk2nDXfcCPw+bq01vOHzy3z
-SvG6I6niRNr4Uw2eOcbz
-=JIUU
+iQIcBAEBCgAGBQJNyaxHAAoJENwGBM22xffetq0P/1bchhXTs2plTEikgcw0cYRL
++EFhQG/7Hnf2K3I82FklEeDZErsPwr9rSYp03IieLtN40zyMwzIDtZQuKJx41LOD
++q63OOmaMt0+V82iYyS7vzIlmGs0XvhTfx7DVTfxAwkFvxFuxKcEyBgZTWk2FFn1
+UdZkYBNa2/90YJsJ5mBvhtMswSi/KnZfOgWosF+1KL/njnrlFsJqKcdAtIocyKe8
+OWVEEWAH+faA9PpqauN9S7N0yT5kOLwqUiZR/VzW+EEMAeywhKb3UShW18QZ/FSG
+OTcVugmk7AQPYQnlDbB2RdsME+MUI6RWMNjCYkzXecKdRdDPZZUyphKJfL/Rsy4z
+LRFWcwnzqyyFoBMi3/+Pel0DtKHTrekQyOuTHY6rRxQl8x73brjEoinT+KgR3YBa
+85XvUSHx/F3TX3GgGuPo4EbWY3qDuAlBztyrbkigTrf7ykLG7dwdFFPZdGeRcUqQ
++y+aO0XQvbDDKh+5XF4s0Unmpr0mldcvFCpdHvXAjhoK0ycPaRMJ0zfdOpXbp783
+VQD0bRrbIQ+M3H1U4iaGyQ/iAw1P6fCUjvAA17jkZ40Oe6cnq74LOb2Lt19kH0SN
+A95tbSIclJjvcDXpRBTypQy9VL1nF1mKQOoB861SHiI1jfj6XucY27gtfi9hZPdP
+9ABbBK6Vztdd4CLFjuAa
+=kiSN
 -----END PGP SIGNATURE-----
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)