Fix broken doc install, missing dependencies, make LINGUAS aware.

9 files changed, 104 insertions, 105 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 6b42254e6eee..4b500b2cc84d 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,15 @@
 # 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.42 2006/02/09 14:34:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.43 2006/02/15 15:39:09 carlo Exp $
+
+*digikam-0.8.1-r1 (15 Feb 2006)
+*digikam-0.7.4-r2 (15 Feb 2006)
+
+  15 Feb 2006; Carsten Lohrke <carlo@gentoo.org>
+  -files/digikam-0.8.0-gcc41.patch, -digikam-0.7.1.ebuild,
+  +digikam-0.7.4-r2.ebuild, -digikam-0.8.0-r1.ebuild, -digikam-0.8.1.ebuild,
+  +digikam-0.8.1-r1.ebuild:
+  Fix broken doc install, missing dependencies, make LINGUAS aware.
 
   09 Feb 2006; Aron Griffis <agriffis@gentoo.org> digikam-0.7.4-r1.ebuild:
   Mark 0.7.4-r1 stable on alpha
diff --git a/media-gfx/digikam/digikam-0.7.1.ebuild b/media-gfx/digikam/digikam-0.7.1.ebuild
deleted file mode 100644
index e4ba0b889e5e..000000000000
--- a/media-gfx/digikam/digikam-0.7.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.7.1.ebuild,v 1.4 2005/07/07 13:52:41 carlo Exp $
-
-inherit kde
-
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="digiKam is a digital photo management application for KDE."
-HOMEPAGE="http://digikam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc amd64"
-IUSE=""
-
-DEPEND=">=media-gfx/gphoto2-2.0-r1
-	media-libs/imlib2
-	>=media-libs/libkexif-0.2.1
-	media-libs/libkipi
-	sys-libs/gdbm"
-need-kde 3.2
diff --git a/media-gfx/digikam/digikam-0.8.1.ebuild b/media-gfx/digikam/digikam-0.7.4-r2.ebuild
index 89d6f7780a9a..b964f2b54138 100644
--- a/media-gfx/digikam/digikam-0.8.1.ebuild
+++ b/media-gfx/digikam/digikam-0.7.4-r2.ebuild
@@ -1,12 +1,12 @@
 # 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.8.1.ebuild,v 1.1 2006/02/01 09:22:26 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.7.4-r2.ebuild,v 1.1 2006/02/15 15:39:09 carlo Exp $
 
 inherit kde
 
-P_DOC="${PN}-doc-0.8.0"
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
+P_DOC="${PN}-doc-${PV}"
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A digital photo management application for KDE."
 HOMEPAGE="http://www.digikam.org/"
@@ -20,13 +20,13 @@ IUSE=""
 
 DEPEND=">=media-libs/libgphoto2-2
 	>=media-libs/libkexif-0.2.1
-	>=dev-db/sqlite-3
-	>=media-libs/libkipi-0.1.1
+	media-libs/libkipi
 	media-libs/imlib2
 	media-libs/tiff
 	sys-libs/gdbm
 	!media-plugins/digikamplugins"
-
+RDEPEND="${DEPEND}
+	|| ( kde-base/kgamma kde-base/kdegraphics )"
 need-kde 3.2
 
 pkg_setup(){
@@ -34,13 +34,21 @@ pkg_setup(){
 }
 
 src_compile(){
+	myconf="$(use_enable nfs nfs-hack)"
 	kde_src_compile
-	cd ${WORKDIR}/${P_POC}
+	myconf=""
+	_S=${S}
+	S=${WORKDIR}/${P_DOC}
+	cd ${S}
 	kde_src_compile
+	S=${_S}
 }
 
 src_install(){
 	kde_src_install
-	cd ${WORKDIR}/${P_DOC}
+	_S=${S}
+	S=${WORKDIR}/${P_DOC}
+	cd ${S}
 	kde_src_install
+	S=${_S}
 }
diff --git a/media-gfx/digikam/digikam-0.8.0-r1.ebuild b/media-gfx/digikam/digikam-0.8.0-r1.ebuild
deleted file mode 100644
index e584a4ec0486..000000000000
--- a/media-gfx/digikam/digikam-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.8.0-r1.ebuild,v 1.1 2005/12/03 20:10:00 carlo Exp $
-
-inherit kde
-
-P_DOC="${PN}-doc-${PV}"
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A digital photo management application for KDE."
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2
-	mirror://sourceforge/digikam/${P_DOC}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libgphoto2-2
-	>=media-libs/libkexif-0.2.1
-	>=dev-db/sqlite-3
-	>=media-libs/libkipi-0.1.1
-	media-libs/imlib2
-	media-libs/tiff
-	sys-libs/gdbm
-	!media-plugins/digikamplugins"
-
-need-kde 3.2
-
-pkg_setup(){
-	slot_rebuild "media-libs/libkipi media-libs/libkexif" && die
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/digikam-0.8.0-gcc41.patch
-}
-
-src_compile(){
-	kde_src_compile
-	cd ${WORKDIR}/${P_POC}
-	kde_src_compile
-}
-
-src_install(){
-	kde_src_install
-	cd ${WORKDIR}/${P_DOC}
-	kde_src_install
-}
diff --git a/media-gfx/digikam/digikam-0.8.1-r1.ebuild b/media-gfx/digikam/digikam-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..f9616cbaa122
--- /dev/null
+++ b/media-gfx/digikam/digikam-0.8.1-r1.ebuild
@@ -0,0 +1,77 @@
+# 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.8.1-r1.ebuild,v 1.1 2006/02/15 15:39:09 carlo Exp $
+
+inherit kde
+
+P_DOC="${PN}-doc-0.8.0"
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A digital photo management application for KDE."
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2
+	mirror://sourceforge/digikam/${P_DOC}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+IUSE="nfs"
+
+DEPEND=">=media-libs/libgphoto2-2
+	>=media-libs/libkexif-0.2.1
+	>=dev-db/sqlite-3
+	>=media-libs/libkipi-0.1.1
+	media-libs/imlib2
+	media-libs/tiff
+	sys-libs/gdbm"
+RDEPEND="${DEPEND}
+	|| ( ( kde-base/kgamma kde-base/kamera ) kde-base/kde-graphics )"
+
+need-kde 3.4
+
+LANGS="bg br ca cs cy da de el en_GB es et fi fr ga gl he hu is it ja lt mk mt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tr zh_CN"
+LANGS_DOC_DC="da es et it nl pt_BR pt sv"
+LANGS_DOC_SF="da et it nl pt sv"
+
+pkg_setup(){
+	slot_rebuild "media-libs/libkipi media-libs/libkexif" && die
+}
+
+src_unpack(){
+	kde_src_unpack
+
+	local MAKE_PO=$(echo $(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d))
+	einfo "Enabling translations for: ${MAKE_PO}"
+
+	local MAKE_DOC_DC=$(echo $(echo "${LINGUAS} ${LANGS_DOC_DC}" | fmt -w 1 | sort | uniq -d))
+	local MAKE_DOC_SF=$(echo $(echo "${LINGUAS} ${LANGS_DOC_SF}" | fmt -w 1 | sort | uniq -d))
+	einfo "Enabling documentation for: $(echo $(echo "${MAKE_DOC_DC} ${MAKE_DOC_SF}" | fmt -w 1 | sort -u))"
+
+	local MAKE_DOC
+	for i in ${MAKE_DOC_DC} ; do MAKE_DOC="${MAKE_DOC} ${i}_digikam" ; done
+	for i in ${MAKE_DOC_SF} ; do MAKE_DOC="${MAKE_DOC} ${i}_showfoto" ; done
+
+	sed -i -e "s:^SUBDIRS =.*:SUBDIRS = . ${MAKE_PO}:" ${S}/po/Makefile.am || die "sed for locale failed"
+	sed -i -e "s:^SUBDIRS =.*:SUBDIRS = ${MAKE_DOC} ${PN}:" ${WORKDIR}/${P_DOC}/doc/Makefile.am || die "sed for locale failed"
+}
+
+src_compile(){
+	myconf="$(use_enable nfs nfs-hack)"
+	kde_src_compile
+	myconf=""
+	_S=${S}
+	S=${WORKDIR}/${P_DOC}
+	cd ${S}
+	kde_src_compile
+	S=${_S}
+}
+
+src_install(){
+	kde_src_install
+	_S=${S}
+	S=${WORKDIR}/${P_DOC}
+	cd ${S}
+	kde_src_install
+	S=${_S}
+}
diff --git a/media-gfx/digikam/files/digest-digikam-0.7.1 b/media-gfx/digikam/files/digest-digikam-0.7.1
deleted file mode 100644
index 053cfb7fbae3..000000000000
--- a/media-gfx/digikam/files/digest-digikam-0.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 46ff47fd3757d53263891eb5fbd72fc6 digikam-0.7.1.tar.bz2 8152192
diff --git a/media-gfx/digikam/files/digest-digikam-0.8.0-r1 b/media-gfx/digikam/files/digest-digikam-0.8.0-r1
deleted file mode 100644
index 60f9d2645e36..000000000000
--- a/media-gfx/digikam/files/digest-digikam-0.8.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9a0eaf4cb8e10d082b54b920a6244890 digikam-0.8.0.tar.bz2 2300095
-MD5 b958495f3830949bc9c2cd6fd1cd53e6 digikam-doc-0.8.0.tar.bz2 43156836
diff --git a/media-gfx/digikam/files/digest-digikam-0.8.1 b/media-gfx/digikam/files/digest-digikam-0.8.1
deleted file mode 100644
index 7f84a1dc8c62..000000000000
--- a/media-gfx/digikam/files/digest-digikam-0.8.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 2672c510a78256a034a666f0e237eb3f digikam-0.8.1.tar.bz2 3783559
-RMD160 36e034cf1ddc783d7c8f9e28899862e1dce6ef0d digikam-0.8.1.tar.bz2 3783559
-SHA256 4f0ad787fe8a4bf651cb1db7b896024fbb6abfd47527a64cb712b18e5ea4d87f digikam-0.8.1.tar.bz2 3783559
-MD5 b958495f3830949bc9c2cd6fd1cd53e6 digikam-doc-0.8.0.tar.bz2 43156836
-RMD160 94d6abb1e58ba8ed91b11a86608d5dce8c9ba3a2 digikam-doc-0.8.0.tar.bz2 43156836
-SHA256 9aa84a94187e0f40939373b264de7ce73e73be44b976f8b890538a68aa1f3f22 digikam-doc-0.8.0.tar.bz2 43156836
diff --git a/media-gfx/digikam/files/digikam-0.8.0-gcc41.patch b/media-gfx/digikam/files/digikam-0.8.0-gcc41.patch
deleted file mode 100644
index 5993fe41fcfb..000000000000
--- a/media-gfx/digikam/files/digikam-0.8.0-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- digikam-0.8.0/digikam/digikam/albumdb.h	2005-11-21 20:14:05.000000000 +0100
-+++ digikam-0.8.0-gcc41/digikam/digikam/albumdb.h	2005-11-29 22:36:31.048370000 +0100
-@@ -436,7 +436,7 @@
-      * @param albumID the id of the albumdb
-      * @return the url of the albumdb
-      */
--    QString AlbumDB::getAlbumURL(int albumID);
-+    QString getAlbumURL(int albumID);
- 
-     /**
-      * Returns the average date of all images for that album.