Version bump, closes bug 98425.

Package-Manager: portage-2.0.52-r1

6 files changed, 76 insertions, 40 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 4dfb8c7555b9..46cd1ffb2486 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.26 2005/08/26 23:28:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.27 2005/09/16 19:50:42 cryos Exp $
+
+*digikam-0.7.4 (16 Sep 2005)
+
+  16 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> -digikam-0.7.ebuild,
+  +digikam-0.7.4.ebuild:
+  Version bump, I added in support for separately downloading the docs. Closes
+  bug 98425, thanks to Carsten Lohrke <carlo@gentoo.org> for the slot rebuild
+  function.
 
   26 Aug 2005; Aron Griffis <agriffis@gentoo.org> digikam-0.7.3.ebuild:
   add ~alpha ~ia64
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 1e0961429636..64caea30be7c 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,12 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 917dcba85aa295dcb0f67216c3d0d45c digikam-0.7.3.ebuild 657
+MD5 39e9ad6bec1d265882709b6b27cea5ba digikam-0.6.2.ebuild 862
 MD5 0470205e8c3f24bc2c27cc8e3e5d345b digikam-0.7.2.ebuild 602
-MD5 8ff127446138f30080170bb500661422 digikam-0.7.1.ebuild 633
+MD5 a80d2afba49fe4302b0d7e5561488288 digikam-0.7.4.ebuild 1159
+MD5 d9116ac0d3fcc8f5794a59fd77b996dc ChangeLog 3521
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 e587791e31dd813f59b854424d0add8e ChangeLog 3226
-MD5 3f52c257bc75d4604efab639e6561267 digikam-0.7.ebuild 804
-MD5 39e9ad6bec1d265882709b6b27cea5ba digikam-0.6.2.ebuild 862
-MD5 917dcba85aa295dcb0f67216c3d0d45c digikam-0.7.3.ebuild 657
-MD5 072474cfde157191cee4b2e8777cff40 files/digest-digikam-0.7 65
+MD5 8ff127446138f30080170bb500661422 digikam-0.7.1.ebuild 633
 MD5 c667eee90a321ac954e6300a88de1ebe files/digest-digikam-0.6.2 67
 MD5 65d75029c28dfdaa673c86aa6366ddd2 files/digest-digikam-0.7.1 67
 MD5 030583179af0e65f1ac5e7d96db0e09c files/digest-digikam-0.7.2 68
 MD5 b5fd7a796c5c3a9ec2095c2e71555eeb files/digest-digikam-0.7.3 68
+MD5 55bccecf6ae17fe2365bc62da5ab1640 files/digest-digikam-0.7.4 139
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDKyI0ntT9W3vfTuoRArfIAJ91Rr37oUVH4hFmbyvhzv25LGItlgCZAeDA
+bBaYfuOISWCmJXwGnAezAjE=
+=H1yk
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-0.7.4.ebuild b/media-gfx/digikam/digikam-0.7.4.ebuild
new file mode 100644
index 000000000000..3bbd70157741
--- /dev/null
+++ b/media-gfx/digikam/digikam-0.7.4.ebuild
@@ -0,0 +1,49 @@
+# 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.4.ebuild,v 1.1 2005/09/16 19:50:42 cryos Exp $
+
+inherit kde
+
+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
+	doc? ( mirror://sourceforge/digikam/${PN}-doc-${PV}.tar.bz2 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+IUSE="doc"
+
+DEPEND=">=media-libs/libgphoto2-2
+	>=media-libs/libkexif-0.2.1
+	media-libs/libkipi
+	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_compile(){
+	kde_src_compile
+	if use doc; then
+		cd ${WORKDIR}/${PN}-doc-${PV}
+		econf $(use_with arts) || die "econf failed for docs."
+		emake || die "emake failed for docs."
+	fi
+}
+
+src_install(){
+	kde_src_install
+	if use doc; then
+		cd ${WORKDIR}/${PN}-doc-${PV}
+		make install DESTDIR=${D} || "make install failed for docs."
+	fi
+}
diff --git a/media-gfx/digikam/digikam-0.7.ebuild b/media-gfx/digikam/digikam-0.7.ebuild
deleted file mode 100644
index ab3902eaa83b..000000000000
--- a/media-gfx/digikam/digikam-0.7.ebuild
+++ /dev/null
@@ -1,32 +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.ebuild,v 1.4 2005/01/04 22:12:13 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/imlib
-	media-libs/imlib2
-	media-libs/libkexif
-	media-libs/libkipi
-	sys-libs/gdbm
-	!media-plugins/digikamplugins"
-RDEPEND=">=media-gfx/gphoto2-2.0-r1
-	media-libs/imlib
-	media-libs/imlib2
-	media-libs/libkexif
-	media-libs/libkipi
-	sys-libs/gdbm"
-need-kde 3.2
diff --git a/media-gfx/digikam/files/digest-digikam-0.7 b/media-gfx/digikam/files/digest-digikam-0.7
deleted file mode 100644
index 8f242f516a9e..000000000000
--- a/media-gfx/digikam/files/digest-digikam-0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 73472790ce00de424451dc89ec20e57d digikam-0.7.tar.bz2 5348175
diff --git a/media-gfx/digikam/files/digest-digikam-0.7.4 b/media-gfx/digikam/files/digest-digikam-0.7.4
new file mode 100644
index 000000000000..d5b15dc7618b
--- /dev/null
+++ b/media-gfx/digikam/files/digest-digikam-0.7.4
@@ -0,0 +1,2 @@
+MD5 3df53700ff78caca60cab4ea4116c7c5 digikam-0.7.4.tar.bz2 2322119
+MD5 05b7ac518f482ad5689cbf5dea562d34 digikam-doc-0.7.4.tar.bz2 22977314