Version bump; remove old

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

7 files changed, 46 insertions, 140 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 064c37517b18..edd01068802d 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,15 @@
 # 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.189 2011/07/27 20:51:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.190 2011/07/29 19:28:45 dilfridge Exp $
+
+*digikam-2.0.0 (29 Jul 2011)
+
+  29 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -digikam-2.0.0_rc.ebuild, +digikam-2.0.0.ebuild,
+  -files/digikam-2.0.0_rc-officialpgf.patch,
+  -files/digikam-2.0.0_rc-officialpgf2.patch,
+  -files/digikam-2.0.0_rc-oldpgf.patch, metadata.xml:
+  Version bump; remove old
 
 *digikam-2.0.0_rc (27 Jul 2011)
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index bf06a4e02218..0df8cd273ec9 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -6,31 +6,28 @@ AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11b
 AUX digikam-1.9.0-newpgf.patch 3463 RMD160 4e5c506e81436aaafe5b789d79adcb1caee4407b SHA1 3bb97db282fbb0c50e03cd4ba6c5ac6821558620 SHA256 9ca068c87868b9709d75441795bfff2790d13957354b675a9aa94d5f3d55eca8
 AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c
 AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310a2 SHA1 e9383e730b81348656c3482700dec59a3ba5a499 SHA256 765338d842b39622428c068d9e190cf0f97933cd66845fea2ff0b5f79ed7b2cc
-AUX digikam-2.0.0_rc-officialpgf.patch 2351 RMD160 a3be56a7377b013bfa2a3539a8bbe7cfc9d3a75d SHA1 883b79dca41f7c624de3a8dc85b02f2dcae363a9 SHA256 bf40b21501bb944993017fcc0f05411e100b88708b1560ddd00e7ca203db3bda
-AUX digikam-2.0.0_rc-officialpgf2.patch 824 RMD160 54715604f3ca772253fee111f311028bc6dc9643 SHA1 8d170abfebddbf1d4f146d6c0b568f2a6262466a SHA256 0f3f010da6f7230ef865169db58f8595796354726b5599e975fde42af4fecbd5
-AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c
 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
-DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 564354c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691
+DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.9.0-r1.ebuild 3347 RMD160 3cdaf055dc0b801a3cd05ce5ebd91a7db10ff819 SHA1 29390bef0da866f1f914ba05e046f15f78297d4e SHA256 2b83becdcae58d502d977afe0551abf24b80365bb42be54144444b969d7342e2
 EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a342974c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75
-EBUILD digikam-2.0.0_rc.ebuild 3500 RMD160 34a75d9a7b3aea4e5065cfc94d1674672a9a5ce3 SHA1 17abcd6e5996cc57a83fee9f9b0088aeaf1f4054 SHA256 2254955af12fb79aebdaec5dbaa6c3fe8e747ce47c42c22f2067ddddbf37f89a
-MISC ChangeLog 31679 RMD160 a84de3e0b6314ae2c661965580c9ef6f67875360 SHA1 97ae54bdbace08d81db446e44a4e81e332bb32f7 SHA256 0ddc033e7ef45cdc2555adf2007741df5badb9a19e69347e67daa1aa43f5e1e5
-MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
+EBUILD digikam-2.0.0.ebuild 3613 RMD160 6bd78e6877402a39bcb4e4a578ae23633c8afce2 SHA1 2130c990f18079cda92f078e07df39af759b41cf SHA256 22d3411ccf4e4fe75956d565516556862b926a6f92fac2d958b6ff9c254ccb9b
+MISC ChangeLog 31990 RMD160 ad94204b78a268b97b2d76d06e7579c5549d9560 SHA1 044b78493eb66c2d999a8ade4d72e36b6c13b992 SHA256 77f89b15401eb4b9d6bde0670bf38beea3bd29c0d482eee0f10b9fea8b433e4a
+MISC metadata.xml 751 RMD160 b65e7816a03a284f440d296c1853aa913105129a SHA1 c6bf2cf0d471e4d4ffdbb5185889a0e9cd65af39 SHA256 4b8eced4b0649dc935acffac97119bb70862bebd51a686b32778745b407eb0cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOMHpyAAoJENwGBM22xffeq8AP/12ngKs4atdD7FN2sDIU9Jc/
-IIbhM1Wv378SppZAfh7h9GmqUax+uG3eRRtuA5M0FAP71XlGrSxchvnYMUjZcTyi
-wXjpMDgbL1JxiWphYco3nxh1N9q/r2/GJNQaTWEijnRhN2ebFzbzP8kP5yl90XuM
-4wag+SWujHQnvx/Tl50azxwEoISgyQeY81mGgipAPvs7kK20zqJalfqxlQfzKPyH
-928D2+bcboCOBA9pswKfyFOGF13J8CgvIKHNgsQEsj7N0VxDjzLqckcBLa0WYS1a
-JlS81+4VdD72mnt+fYmzbvIQlZeIj8DJo9A6gWg9tJTW4x9cU4htLEUadQ8I6mRd
-aVK9U6ACBaC1i75hBawNz5WBncZITj2lj97ljGBaFvH9WHftVdzDS1dCjQfTSUb5
-/3TBHtEk5ZVC6RbVbUn+Tbz05U5S2cSsbU50stgcMmexboRe3SuD00jpZ5TCAa6x
-wDTVNHhtR5geBKKT6T/V7C5nBHGhPKrO8CZb+JcoqsjW1V/oSM/m01mDOweGgpU5
-Mvq/YktTpgqcEpFCMkz7FIxPy0XChw9P8Frx8qBqh5okYxzKfiN+3a04GfGE8675
-+JL6gW1q4ojEwIrSSdUWHk7B57e05NhzHfK0k0+U/sjAMNG+x59dibTnDkBLcsIX
-a+M9KB79Pw8AqFy6ba1E
-=AjRC
+iQIcBAEBCgAGBQJOMwn2AAoJENwGBM22xffeDf4P+gIb6Z5bZBaCzzt3DzKb7Avi
+3MnpIsiDTVWfaSJ+LtQGjFIzwilessjyX3/1M9Vr+aWdB81WMIT0KbztWdC10hgV
+vL11Lzj2elB1cwDdZZC9cRzW9JuZ/NFwfMYf1V5DqYw7vrTN/b7nCZrNjNm3staC
+jwO/HhWKzLu7npcy/+gijcvNWlZh/uRlsB0qLNdFn7cwgNJwBEHUNnWmCa8z87K0
+EmEaUdfyd67299O3rfYLGp/yYpRXmFka5wZyh7wKM+WwvQN1GbCZFP8AiahhkoEw
+seKVVdy+0/2E7HC+0oSMLNDuwFddaClOB4tiTSVgQHm2Eb1LIKIXCxzM4gPrhs3Y
+t1Xs1awFj/5s0xEcuOQqWcURlbVGlnzvvecJBP20dYws/O3MS4PoP1BIicSjD1fE
+R6Z8Xi22XGjvxZ6JFU5XSrxFFFRaSdnY54IfNG8GFjjN6hwFDfwB865Oz051XcmA
+qi1PU67WMvDMYqVLu3P5cfTixJQIvDgBXTB9QcQorqFKCqb4g2KZz8+y3DdeNsb9
+dUlgv/1MHdb6MIw+MmI8rFhOQCc0+KyXxPc7WmU4f7C5LYS+DTEmh78gNOe9m9Sz
+R06zBSAk1k261gh0qp22IoKZSgzzpge3HH3BuszjP8DV4y9UxEKo/L5G3/YwsimI
+1iGW+iPfFLXQGS+fwpjS
+=nKsG
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0.ebuild
index 706304cb7e5b..1cae284751fd 100644
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0.ebuild
@@ -1,13 +1,13 @@
 # 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-2.0.0_rc.ebuild,v 1.1 2011/07/27 20:51:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0.ebuild,v 1.1 2011/07/29 19:28:45 dilfridge Exp $
 
 EAPI=4
 
-KDE_LINGUAS=""
-#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
-#	ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
-#the release candidate has no internationalization
+KDE_LINGUAS="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 ss sv ta te tg th tr tt uk uz ven vi wa xh
+zh_CN zh_HK zh_TW zu"
 
 KDE_HANDBOOK="optional"
 CMAKE_MIN_VERSION="2.8"
@@ -38,12 +38,11 @@ CDEPEND="
 	media-libs/lcms:0
 	>=media-libs/lensfun-0.2.5
 	>=media-libs/libkface-${PV}
-	>=media-libs/libkmap-${PV}
+	>=media-libs/libkgeomap-${PV}
 	media-libs/liblqr
-	>=media-libs/libpgf-6.11.24
+	>=media-libs/libpgf-6.11.28
 	media-libs/libpng
 	media-libs/tiff
-	media-plugins/kipi-plugins
 	virtual/jpeg
 	x11-libs/qt-gui[qt3support]
 	|| ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
@@ -54,6 +53,7 @@ CDEPEND="
 "
 RDEPEND="${CDEPEND}
 	$(add_kdebase_dep kreadconfig)
+	media-plugins/kipi-plugins
 	video? (
 		|| (
 			$(add_kdebase_dep mplayerthumbs)
@@ -66,22 +66,23 @@ DEPEND="${CDEPEND}
 	doc? ( app-doc/doxygen )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0_rc-oldpgf.patch"
-	"${FILESDIR}/${PN}-2.0.0_rc-officialpgf.patch"
-	"${FILESDIR}/${PN}-2.0.0_rc-officialpgf2.patch"
-)
-
 S="${WORKDIR}/${MY_P}/core"
 
 src_prepare() {
 	# just to make absolutely sure
 	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
 
+	# prepare the translations
+	mv "${WORKDIR}/${MY_P}/po" po || die
+	find po -name "kipiplugin_*.po" -exec rm {} +
+
+	echo "add_subdirectory( po )" >> CMakeLists.txt
+
 	kde4-base_src_prepare
 
 	if use handbook; then
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch
deleted file mode 100644
index 78f777053347..000000000000
--- a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -ruN digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake
---- digikam-2.0.0-rc.orig/core/cmake/modules/FindPGF.cmake	2011-06-28 16:38:50.000000000 +0200
-+++ digikam-2.0.0-rc/core/cmake/modules/FindPGF.cmake	2011-07-04 15:32:50.000000000 +0200
-@@ -1,9 +1,10 @@
- # - Try to find libpgf
- # Once done this will define
- #
--#  PGF_FOUND - system has libgf
--#  PGF_INCLUDE_DIRS - the libpgf include directory
--#  PGF_LIBRARIES - Link these to use libpgf
-+#  PGF_FOUND            - system has libgf
-+#  PGF_INCLUDE_DIRS     - the libpgf include directory
-+#  PGF_LIBRARIES        - Link these to use libpgf
-+#  PGF_CODEC_VERSION_ID - PGF codec version ID.
- 
- # PKG-CONFIG is required.
- INCLUDE(FindPkgConfig REQUIRED)
-@@ -12,4 +13,15 @@
- 	INCLUDE(FindPkgConfig)
- 
- 	PKG_CHECK_MODULES(PGF libpgf)
-+
-+	MESSAGE(STATUS "PGF_INCLUDE_DIRS     = ${PGF_INCLUDE_DIRS}")
-+	MESSAGE(STATUS "PGF_INCLUDEDIR       = ${PGF_INCLUDEDIR}")
-+	MESSAGE(STATUS "PGF_LIBRARIES        = ${PGF_LIBRARIES}")
-+	MESSAGE(STATUS "PGF_LDFLAGS          = ${PGF_LDFLAGS}")
-+	MESSAGE(STATUS "PGF_CFLAGS           = ${PGF_CFLAGS}")
-+	MESSAGE(STATUS "PGF_VERSION          = ${PGF_VERSION}")
-+
-+	STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}")
-+	MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}")
-+
- ENDIF(PKG_CONFIG_FOUND)
-diff -ruN digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake
---- digikam-2.0.0-rc.orig/core/digikam/utils/config-digikam.h.cmake	2011-06-28 16:38:50.000000000 +0200
-+++ digikam-2.0.0-rc/core/digikam/utils/config-digikam.h.cmake	2011-07-04 15:29:24.000000000 +0200
-@@ -57,6 +57,8 @@
- /* Define to 1 if we know how to start mysqld */
- #cmakedefine HAVE_INTERNALMYSQL 1
- 
-+#define PGFCodecVersionID 0x${PGF_CODEC_VERSION_ID}
-+
- #define LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}"
- 
- /*
-diff -ruN digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp
---- digikam-2.0.0-rc.orig/core/libs/threadimageio/pgfutils.cpp	2011-06-28 16:38:44.000000000 +0200
-+++ digikam-2.0.0-rc/core/libs/threadimageio/pgfutils.cpp	2011-07-04 15:29:24.000000000 +0200
-@@ -46,6 +46,7 @@
- // LibPGF includes
- 
- #include "PGFimage.h"
-+#include "config-digikam.h"
- 
- namespace Digikam
- {
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch
deleted file mode 100644
index 184360d9972c..000000000000
--- a/media-gfx/digikam/files/digikam-2.0.0_rc-officialpgf2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruN digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp
---- digikam-2.0.0-rc.orig/core/libs/dimg/loaders/pgfloader.cpp	2011-06-28 16:38:45.000000000 +0200
-+++ digikam-2.0.0-rc/core/libs/dimg/loaders/pgfloader.cpp	2011-07-05 13:50:20.036746353 +0200
-@@ -29,6 +29,7 @@
- //#define ENABLE_DEBUG_MESSAGES
- 
- #include "pgfloader.h"
-+#include "config-digikam.h"
- 
- // C Ansi includes
- 
-@@ -435,10 +436,8 @@
-                          CallbackForLibPGF, this);
- 
-         UINT32 nWrittenBytes = 0;
--#ifdef PGFCodecVersionID
--#   if PGFCodecVersionID >= 0x061124
-+#if PGFCodecVersionID >= 0x061124
-         pgf.Write(&stream, &nWrittenBytes, CallbackForLibPGF, this);
--#   endif
- #else
-         pgf.Write(&stream, 0, CallbackForLibPGF, &nWrittenBytes, this);
- #endif
diff --git a/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch b/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch
deleted file mode 100644
index c60a7e30b06a..000000000000
--- a/media-gfx/digikam/files/digikam-2.0.0_rc-oldpgf.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 1f80f35b68702136ebd3d315fe4baf7d75b3c142
-Author: Gilles Caulier <caulier.gilles@gmail.com>
-Date:   Sun Jul 3 10:57:21 2011 +0200
-
-    compile with libpgf 6.09.44
-    BUGS: 276969
-
-diff --git a/libs/threadimageio/pgfutils.cpp b/libs/threadimageio/pgfutils.cpp
-index 2b5829f..758f12c 100644
---- a/libs/threadimageio/pgfutils.cpp
-+++ b/libs/threadimageio/pgfutils.cpp
-@@ -151,7 +151,14 @@ bool writePGFImageData(const QImage& img, QByteArray& data, int quality)
-         // TODO : optimize memory allocation...
-         CPGFMemoryStream stream(256000);
-         UINT32 nWrittenBytes = 0;
-+
-+#ifdef PGFCodecVersionID
-+#   if PGFCodecVersionID >= 0x061124
-         pgfImg.Write(&stream, &nWrittenBytes);
-+#   endif
-+#else
-+        pgfImg.Write(&stream, 0, 0, &nWrittenBytes);
-+#endif
- 
-         data = QByteArray((const char*)stream.GetBuffer(), nWrittenBytes);
- 
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 65589fb262bf..032404f527dc 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -9,5 +9,9 @@
 	<flag name="themedesigner">Build the digikam theme designer</flag>
 	<flag name="thumbnails">Enable thumbnails database support</flag>
 	<flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag>
+	<flag name="linguas_ha">Hausa translation</flag>
+	<flag name="linguas_mi">Maori translation</flag>
+	<flag name="linguas_tt">?? translation</flag>
+	<flag name="linguas_ven">Venda translation</flag>
 </use>
 </pkgmetadata>