Version bump; remove old

(Portage version: 2.1.10.7/cvs/Linux x86_64)

6 files changed, 29 insertions, 120 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/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>