Version bump + fix of bug #153535.

(Portage version: 2.1.2_rc1-r1)

3 files changed, 136 insertions, 1 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 49adac44156c..64dc091dfeb2 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.63 2006/10/18 13:29:58 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.64 2006/10/31 18:15:05 deathwing00 Exp $
+
+*digikam-0.9.0_beta3 (31 Oct 2006)
+
+  31 Oct 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +digikam-0.9.0_beta3.ebuild:
+  Version bump. Restricted media-libs/libgphoto2 version to 2.1.6. See bug
+  #153535 for details.
 
   18 Oct 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
   digikam-0.8.2-r1.ebuild, digikam-0.9.0_beta2-r1.ebuild:
diff --git a/media-gfx/digikam/digikam-0.9.0_beta3.ebuild b/media-gfx/digikam/digikam-0.9.0_beta3.ebuild
new file mode 100644
index 000000000000..02c92c0d1903
--- /dev/null
+++ b/media-gfx/digikam/digikam-0.9.0_beta3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.0_beta3.ebuild,v 1.1 2006/10/31 18:15:05 deathwing00 Exp $
+
+inherit kde
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+P_DOC="${PN}-doc-0.8.2"
+S_DOC="${WORKDIR}/${P_DOC}"
+
+DESCRIPTION="A digital photo management application for KDE."
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI=""
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="nfs doc kdehiddenvisibility"
+
+DEPEND="=media-libs/libgphoto2-2.1.6*
+	>=dev-db/sqlite-3
+	>=media-libs/libkipi-0.1.1
+	media-libs/tiff
+	sys-libs/gdbm
+	media-gfx/dcraw
+	media-gfx/exiv2
+	media-libs/lcms"
+
+RDEPEND="${DEPEND}
+	|| ( ( kde-base/kgamma kde-base/kamera ) kde-base/kdegraphics )"
+
+need-kde 3.4
+
+LANGS="bg bn br ca cs cy da de el en_GB es et eu fi fr ga gl he hu is it ja km
+lt mk ms mt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tr uk vi zh_CN"
+
+LANGS_DOC="da de es et fr it nl pl pt pt_BR sv"
+
+for lang in ${LANGS}; do
+	IUSE="${IUSE} linguas_${lang}"
+done
+
+for lang in ${LANGS_DOC}; do
+	SRC_URI="${SRC_URI}
+	linguas_${lang}? ( http://gentoo-sunrise.org/svndump/peper/distfiles/${P_DOC}-${lang}.tar.bz2 )"
+done
+
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	doc? ( http://gentoo-sunrise.org/svndump/peper/distfiles/${P_DOC}-main.tar.bz2
+		${SRC_URI} )"
+
+pkg_setup(){
+	slot_rebuild "media-libs/libkipi" && die
+	kde_pkg_setup
+}
+
+src_unpack(){
+	kde_src_unpack
+	rm -f "${S}/configure" "${S_DOC}/configure"
+
+	local MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | tr '\n' ' ')
+	einfo "Enabling translations for: en ${MAKE_PO}"
+	sed -i -e "s:^SUBDIRS =.*:SUBDIRS = . ${MAKE_PO}:" "${S}/po/Makefile.am" || die "sed for locale failed"
+
+	if use doc; then
+		local MAKE_DOC=$(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d | tr '\n' ' ')
+		einfo "Enabling documentation for: en ${MAKE_DOC}"
+	fi
+}
+
+src_compile(){
+	local myconf
+
+	myconf="$(use_enable nfs nfs-hack)"
+	kde_src_compile
+	myconf=""
+	[[ -d "${S_DOC}" ]] && KDE_S="${S_DOC}" kde_src_compile
+}
+
+src_install(){
+	kde_src_install
+	[[ -d "${S_DOC}" ]] && KDE_S="${S_DOC}" kde_src_install
+
+	# Install the .desktop in FDO's suggested directory
+	dodir /usr/share/applications/kde
+	mv "${D}/usr/share/applnk/Graphics/digikam.desktop" \
+		"${D}/usr/share/applications/kde"
+}
+
diff --git a/media-gfx/digikam/files/digest-digikam-0.9.0_beta3 b/media-gfx/digikam/files/digest-digikam-0.9.0_beta3
new file mode 100644
index 000000000000..247d2aa0f4be
--- /dev/null
+++ b/media-gfx/digikam/files/digest-digikam-0.9.0_beta3
@@ -0,0 +1,39 @@
+MD5 4b6ecbe86ba258818b56257dbc851560 digikam-0.9.0-beta3.tar.bz2 6862909
+RMD160 9fbc77376517f972090b63afd7b13cc0d909fb47 digikam-0.9.0-beta3.tar.bz2 6862909
+SHA256 cf66c528564827dc262577b19d87b5b43ce6d7b857f66de368a12f333974a2b9 digikam-0.9.0-beta3.tar.bz2 6862909
+MD5 9576d0d2d9898d4d63964e572b35d8c9 digikam-doc-0.8.2-da.tar.bz2 50158
+RMD160 c78a62d17045e5a47d562acbc4a5cb3f1b62e558 digikam-doc-0.8.2-da.tar.bz2 50158
+SHA256 5b3301301dbbfae999d7398d7ee2651c6c4b94f4baa8566d5d1c9914b2bfe142 digikam-doc-0.8.2-da.tar.bz2 50158
+MD5 019088773c49c35dce874e136bbc0142 digikam-doc-0.8.2-de.tar.bz2 52448
+RMD160 2f48efc9a470da0f18e5b8028b40f15f5d133b19 digikam-doc-0.8.2-de.tar.bz2 52448
+SHA256 5968243bff59ef2a81482479a8b6c2b7570394c702fe6c41fb179411c12a58f1 digikam-doc-0.8.2-de.tar.bz2 52448
+MD5 d23a8bed1d17d69b8328f0cbb993197e digikam-doc-0.8.2-es.tar.bz2 1118456
+RMD160 05de655a818e1950d063f23873309136f6b0e9ff digikam-doc-0.8.2-es.tar.bz2 1118456
+SHA256 5b14782e77c9bc68d3432e026245cc70cd4fdc2e5194eb2368c79433402d4f1c digikam-doc-0.8.2-es.tar.bz2 1118456
+MD5 7d59456f5f5323695614497e8c0ece3b digikam-doc-0.8.2-et.tar.bz2 49932
+RMD160 bcecae36e125d5cdf31025e31ecb8b6c80c17929 digikam-doc-0.8.2-et.tar.bz2 49932
+SHA256 7c94a068d45e6c93ea54ab1ccdc053a0eb77b36050925b8beaec00f77efd2790 digikam-doc-0.8.2-et.tar.bz2 49932
+MD5 c48e2dd1f20f534a2821f5e3487c8fd1 digikam-doc-0.8.2-fr.tar.bz2 28805
+RMD160 a1910268db988269461822535accf375c533afcc digikam-doc-0.8.2-fr.tar.bz2 28805
+SHA256 054e9ec711251576d20d20323a1a1a2ce15026ebe7611b7934e7c163326fbf4c digikam-doc-0.8.2-fr.tar.bz2 28805
+MD5 ddd19f8e24bff10966e671edef9b0045 digikam-doc-0.8.2-it.tar.bz2 702534
+RMD160 44e5a1d0834cdba90bb7da3eb627945c8c79605e digikam-doc-0.8.2-it.tar.bz2 702534
+SHA256 881ca55f51c23ac12ab8487349b394a4931d9ee167a0454fcb01a344fb27d025 digikam-doc-0.8.2-it.tar.bz2 702534
+MD5 7c05ebee138e4ae8f7764e4f9cf42af6 digikam-doc-0.8.2-main.tar.bz2 8763651
+RMD160 e1668f5fe596d57e4da55aaa455429b70cd4ce55 digikam-doc-0.8.2-main.tar.bz2 8763651
+SHA256 87499ec384b825f57f651af033178802e5ec2e472712e3be4c03bcb93db01596 digikam-doc-0.8.2-main.tar.bz2 8763651
+MD5 71153e96278449704b392517af18931a digikam-doc-0.8.2-nl.tar.bz2 9763453
+RMD160 c71580f8e4cac77ffe424aad6a2cf97e2f2bb89b digikam-doc-0.8.2-nl.tar.bz2 9763453
+SHA256 11ec5f6fee836c5e8950f5774f3fc9797088109bb16fd53bf569a0dc89b470c5 digikam-doc-0.8.2-nl.tar.bz2 9763453
+MD5 5770704f6880d2bd1c81dfcab695c166 digikam-doc-0.8.2-pl.tar.bz2 53888
+RMD160 3c8511908647821edf37a7b5ef52f5967cd75895 digikam-doc-0.8.2-pl.tar.bz2 53888
+SHA256 eb0dc2d87f7427f7f930bd0c3b2e942fe2650c9165ecc6084df51da752fdee3f digikam-doc-0.8.2-pl.tar.bz2 53888
+MD5 2e96e470365d9ccf3a5991e67ab7f5ff digikam-doc-0.8.2-pt.tar.bz2 52447
+RMD160 2beb73e84520e8508ef67c9c72944f406f2acbff digikam-doc-0.8.2-pt.tar.bz2 52447
+SHA256 bdd974b2c903e999ace96a5fa771f4228b05173a963f9ce8859f16ae9aa558c9 digikam-doc-0.8.2-pt.tar.bz2 52447
+MD5 cf7b245c4f246edbe28c91f24ec4d3f3 digikam-doc-0.8.2-pt_BR.tar.bz2 1987997
+RMD160 521b7b1a2bcdfcd1282cbafaf8dad844838a08a4 digikam-doc-0.8.2-pt_BR.tar.bz2 1987997
+SHA256 1f557ef8cd8ca013027ccb6f4025f9a83280c8b0742c412a3f170fae580f38b8 digikam-doc-0.8.2-pt_BR.tar.bz2 1987997
+MD5 22ca04cb7c0f83879caebf8677e74474 digikam-doc-0.8.2-sv.tar.bz2 261002
+RMD160 9a1c2e3b7a6957a2597e08492a967634bc0744a9 digikam-doc-0.8.2-sv.tar.bz2 261002
+SHA256 c40087176d04f7dbd89458aa2e4ce21ef825633924347e7c0b62c9ad5fd72f67 digikam-doc-0.8.2-sv.tar.bz2 261002