Version bump; remove old

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

3 files changed, 41 insertions, 30 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 9858b9d16204..206e1c871d80 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.215 2012/04/04 19:30:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.216 2012/04/08 19:54:28 dilfridge Exp $
+
+*digikam-2.6.0_beta3 (08 Apr 2012)
+
+  08 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> -digikam-2.3.0.ebuild,
+  +digikam-2.6.0_beta3.ebuild:
+  Version bump; remove old
 
   04 Apr 2012; Agostino Sarubbo <ago@gentoo.org> digikam-2.5.0.ebuild:
   Stable for amd64, wrt bug #409403
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 0b5946f573cb..473e1abefefe 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -3,22 +3,28 @@ Hash: SHA512
 
 AUX digikam-2.5.0-boost148.patch 4133 RMD160 033b19386db95818d8f1aa7ac8b1384be8ec7169 SHA1 095ea8de1e353120f47ed41c0cd15a36d468efcb SHA256 e9adb199ca4955f64275481231c6761c32b84cdcc8bfab9ddebab6864f0f4a9f
 AUX digikam-2.5.0-libkipi.patch 2670 RMD160 a82bf1c2797279ac5f195a3f296ece677a838583 SHA1 23268e63dcc39f9e4452aff6639489f16d2c462c SHA256 7652e7854998b03a6047779361801dc63aa42c1f0221ef2b5c0f0a25abf1e651
-DIST digikam-2.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33
 DIST digikam-2.4.1.tar.bz2 54531119 RMD160 2a07c061927e7cec7a0128a68e60f9d7c6d1e78b SHA1 2ec3a20225462d277d5f0c3aa17b1ecfbb61f98c SHA256 aca967a4cc5312923cb2340502eb10a571684c14cf63896a68a1796d0483de3b
 DIST digikam-2.5.0.tar.bz2 54976375 RMD160 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb SHA1 6cadb838669d1bdcbd6abb677889f7d68d696383 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a
-EBUILD digikam-2.3.0.ebuild 4045 RMD160 69f49da4f45b4338dab884fa09a1d03c728863cc SHA1 d8673baceb9692057a6811e23fc9d872eb50d332 SHA256 6f14cd55caba84399ab6ca0f5b5539f7d8a553477e28644e42160b3ea6a49e17
+DIST digikam-2.6.0-beta3.tar.bz2 55694232 RMD160 4337411d074a9f940270a8929293d5457cd283c9 SHA1 8ad5d6d482bbac582aaa2943c0d86272181e1565 SHA256 697ab7fdc0aff0a2a842df21608158f2abd1f7a4619cae9818749012267e6fec
 EBUILD digikam-2.4.1.ebuild 3779 RMD160 ae3417da8b3dd7720e8099458b1ab5cf2835b1a2 SHA1 c29f3d4c178699a85a045ce7fdf485b8afe9ca60 SHA256 67177511b82432bb24096be539428a8a7b0160aa513c69039ed6388fde790dae
 EBUILD digikam-2.5.0.ebuild 4197 RMD160 cd406b2bab0a40c52ed6a03aa36764b226406aa6 SHA1 cee756c8a06606acfd79379c085fc32e1c41789a SHA256 844f1cd90ed191aa990c483a76e8951d8968b0d3cab4c1f244ac114f861f21ac
-MISC ChangeLog 36207 RMD160 ef75d17abb68b6fea000dd43a4f338ae50380680 SHA1 12bdaf00c31316cd5b06067c7e5fe12bcea20c6c SHA256 0520c5bb9605a2996077f0ea4f0c9041eb300e5ffb9a09c0e56f8cb6cdae63d8
+EBUILD digikam-2.6.0_beta3.ebuild 4101 RMD160 58651a43737700a60249f76af739b72fcb619816 SHA1 3f010f82ecad0788485a4e7c3519e2a432efa628 SHA256 f095a084b1e9d6e42d408ce4cb095a77ad9cf31e7ede9e370b5b6b33db8bfd83
+MISC ChangeLog 36388 RMD160 19711b3e29c40fb00bfe3757739696a3af73e524 SHA1 689a6eb17bb6461245d42d37587b9eb5c0cfe3b9 SHA256 90aa47fcb720906fb54c0a979a148032f611a4b6356fc27894506852734adfe8
 MISC metadata.xml 648 RMD160 7694bc7a07e2b35c60e2ed22981007ba0680dd1f SHA1 15b78b8dee48c87b702a5705009b3eee46aa7ebd SHA256 fed8bb77a841bcbc558e06fbe5f729a616152051924fa17fed0e527237f09f8c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPfKF3AAoJEOTDgjZ80txdsjEH/i7k168VLj81Y6xH7cNo8KC5
-3BSNz0tf4DkvxUO5QsMCsbJZjRSddND7nroabIMEzm5MKeOIufHyiSEY7+ORI0Nz
-5QSK6JxSLJeApLNZTrJeFhgXGnmepD+NW/fph0lYoZFYqMHd/FvgaNT8V3Z4croV
-AR9euNcNieTBhvg7T+lXZYkaWmwXSBfdAzzUgjeiRoxFbEBrIMNbPeYHee4/sRuw
-tXo+vd0BAtNXcbpU3bgL3X7B3g7+fLeQJwaSzEQLTDyPQIvc6GTQzzsfvlkyVmga
-rKp+VXXfSsnMlSe7QqT4SpC+YKcoTgGiy2JWroiCMUfZYRMAkC8/yGo+3OZANUk=
-=+KUe
+iQIcBAEBCgAGBQJPgez9AAoJENwGBM22xffeE+8QAIw1CZzV/JFSMEik2NVQE9e9
+y54PPPwaBGDlZBlRWw5n0a0LI11K9so/8puWNP5SoI46i5Ct06mAJMtkxKpxDwny
+k3yjPbSCndVgwekr5IKNyE2Ff0AlTsK0yhKB9oMN5lP4vLQ97nd3CNgzuDFCPG/S
+921oiGHfa4RP+PedZh2PuwhuMMy/SvqkMAEdsPsDvNJAJsInwSlcnFb6SMgFDmsk
+tT3TiomlGyL9SCoB290fnehguIktBr6/eYEER8yvhZ58wWGXRsHYDElhYqjbDurx
+ddWQXegrs+JL3OICHbePQNmk5vDiPbfrbZ2EdvS9W6vMVBIDdMtIueQn/Ilg8QTC
+8Js9tPkeHXCGpSCyJdGPxz1rcnPGYQPnUHJikcg15/YNrD/5ab5RhNPGyLUaEzuC
+3GeMmOkeq8tgMMJX6jbEtwl3g5s0FPIxdn0DmJQq9rGZ39hrkwIGy52XRlZxpD3x
+be90Ku/hbNN8CDV4/bRg5RmkftBmPtdKJVBnzECbA45rfd0afP1M+imCIej4JpE9
+0X/DPVMq4f+ykDq1RMH88/h0I0m6irxkghg5aCX4b6KhHhJWJ7GsvjSYRPNdodho
+3hpVLiZ618xuDCrI0xhvSDa0BGLgjNosn/yk+7EcKEDdk9dEpYYrzJrB5NIrw1hD
+Z8q+eG4ttx9vLkNSCBRp
+=jlfI
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.3.0.ebuild b/media-gfx/digikam/digikam-2.6.0_beta3.ebuild
index 4b2a70616507..381434432c0f 100644
--- a/media-gfx/digikam/digikam-2.3.0.ebuild
+++ b/media-gfx/digikam/digikam-2.6.0_beta3.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.3.0.ebuild,v 1.5 2012/02/12 16:01:42 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.6.0_beta3.ebuild,v 1.1 2012/04/08 19:54:28 dilfridge Exp $
 
 EAPI=4
 
-KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo
-fr fy ga gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt
-nb nds ne nl nn nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss sv ta te tg
-th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
+KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
+hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
+rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
 
 KDE_HANDBOOK="optional"
 CMAKE_MIN_VERSION="2.8"
-KDE_MINIMAL="4.7"
+KDE_MINIMAL="4.8"
+
+KDE_DOC_DIRS="doc-digikam doc-showfoto"
 
 inherit kde4-base
 
@@ -23,12 +24,11 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
+KEYWORDS=""
 SLOT="4"
 IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
 
 CDEPEND="
-	!!=media-gfx/digikam-2.1.0-r1
 	$(add_kdebase_dep kdelibs 'semantic-desktop=')
 	$(add_kdebase_dep libkdcraw)
 	$(add_kdebase_dep libkexiv2)
@@ -38,8 +38,8 @@ CDEPEND="
 	media-libs/jasper
 	media-libs/lcms:0
 	>=media-libs/lensfun-0.2.5
-	>=media-libs/libkface-${PV}
-	>=media-libs/libkgeomap-${PV}
+	media-libs/libkface
+	media-libs/libkgeomap
 	media-libs/liblqr
 	>=media-libs/libpgf-6.11.28
 	media-libs/libpng
@@ -78,9 +78,12 @@ src_prepare() {
 	rm -rf "${WORKDIR}/${MY_P}/extra" || die
 
 	# prepare the handbook
-	mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
-	echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
-	echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
+	mkdir doc-digikam doc-showfoto || die
+	echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
+	mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
+	echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
+	mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
+	sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
 
 	# prepare the translations
 	mv "${WORKDIR}/${MY_P}/po" po || die
@@ -93,7 +96,8 @@ src_prepare() {
 	kde4-base_src_prepare
 
 	if use handbook; then
-		echo "add_subdirectory( doc )" >> CMakeLists.txt
+		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
+		echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
 	fi
 }
 
@@ -131,11 +135,6 @@ src_compile() {
 src_install() {
 	kde4-base_src_install
 
-	# someone had the great idea to install duplicate icons
-	einfo Removing duplicate icons
-	find "${ED}/usr/share/icons/oxygen" -name digikam.png -exec rm -v {} +
-	find "${ED}/usr/share/icons/oxygen" -name showfoto.png -exec rm -v {} +
-
 	if use doc; then
 		# install the api documentation
 		insinto /usr/share/doc/${PF}/html