Version bump; remove old

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

4 files changed, 42 insertions, 23 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index a954f00ade14..8f545ecd8f31 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.96 2011/07/27 21:04:25 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.97 2011/07/29 19:20:02 dilfridge Exp $
+
+*kipi-plugins-2.0.0 (29 Jul 2011)
+
+  29 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kipi-plugins-2.0.0_rc.ebuild, +kipi-plugins-2.0.0.ebuild, metadata.xml:
+  Version bump; remove old
 
 *kipi-plugins-2.0.0_rc (27 Jul 2011)
 
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index e3756ab6bbf5..db0f63fefe2e 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -3,27 +3,27 @@ Hash: SHA512
 
 AUX kipi-plugins-1.7.0-expoblending.patch 570 RMD160 c08b628dceb39b4a2dbe15fd376256785dd8cacf SHA1 763aec7f286f4cd208aa38f5665c62986bcfaddb SHA256 31788bac46a0af39e2b8475bdd84e07710af5d6655efbdaa6939795eb8b7d7f0
 AUX kipi-plugins-1.9.0-tests.patch 1153 RMD160 40fdf55531219fbeebf7ed8ac60981e05222f2d1 SHA1 f8c3b30fbc9bbf0b95518acc3e86bfaa5581d6de SHA256 a675fa82a67f6e99d60f108d5c6479f39a2afb2c1a596c4468908ff51ae74c09
-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 kipi-plugins-1.9.0.tar.bz2 5775775 RMD160 9bc1ae309e556335fa770e20b31b2527ddc4856b SHA1 fc12c018f4f73f7a7d025d7af2af99d4ae2dedc5 SHA256 d52466586725492788514c1b8d7bbea02f95c9deb744a0814d221c99c34e934c
 DIST kipi-plugins-doc-1.5.0.tar.bz2 1689039 RMD160 f4342798caf14817b96afdb11959f53ab175ae1d SHA1 55a57e1fffbd291ed2f31dbbe840ccd85cb499cc SHA256 13dfda13a1f5e276020dbae3f7c2227f5cc1ac4264070250eeff0a3eb59b67cf
 EBUILD kipi-plugins-1.9.0.ebuild 2697 RMD160 b42df2225066d816b710a7e76ef615c57ddc6b01 SHA1 ed22d2c0cab6e53944de8f6b739f5926ccb30d29 SHA256 5b6cf08ba75620d9701a997e243d205e8543187e3c95fc65372089d50aed37be
-EBUILD kipi-plugins-2.0.0_rc.ebuild 2577 RMD160 15f531fc4a8c83e4991171ec068f7f38935c05fb SHA1 4fc190b713c5bc8c0f6215a199a2f05aff399910 SHA256 9d4f82f32d972b931f1e6a9566c9a4c65d165c98250c54b558b42bcf710e3da9
-MISC ChangeLog 16385 RMD160 fed3cf173b34fecb89e7ed04d604fed9b3bea0ea SHA1 46f2f50100715f1c4f69983ff55f47ab2a16a7ca SHA256 7d714867be0ce72f96bf7df218b2cf50c4fc41156d68ecff198c4d58ef64acf3
-MISC metadata.xml 442 RMD160 3ebeb3175e61f59febadca1633f0f7dbb60dc011 SHA1 cc18d6adaa318b095bdd00b3c37e59fb7f621055 SHA256 41b0a7ff3057182bd5d434dbe6643a95714f54c75ffc0a33625725fa0a8bd57b
+EBUILD kipi-plugins-2.0.0.ebuild 2805 RMD160 0069280a1ffd1c3cc411e2a31d68b727e479d274 SHA1 848a7ba55e05b4dcad5c12ae426565a95f3759d5 SHA256 3668bb9de49b6c21b90927adf744015ad3d6d49b213292b77e7199a4adb9631f
+MISC ChangeLog 16580 RMD160 2c6f795f69c53941db28334804bfc837b773021a SHA1 2ae5252059f4919cdadf93361e00701e1eee4689 SHA256 6bc81dcf4ed14be6a8608aa4bd814b127591381fcbc8c552d13e98286030bffc
+MISC metadata.xml 644 RMD160 499650f4488659bf84448f0340f5dd3c4ba18d4d SHA1 f5e75eea5094beca7742e90c2c05310d4c528db7 SHA256 98dcaecafb89eaed0a0c8a1ca9e8e09cf671d5a640fff72200432b97d0f5f2d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOMH1fAAoJENwGBM22xffeO7IP/3h0RyNrPiiMM/FIdmtXQ+hz
-oiixWkUfI3w9dAYFWG5aqOYu7QAkIwbIUmR4U0duO2+6EX3Jmf9/VQ1QJ+JiAEvP
-s58hHVoQxdQFJ6Zr9k+g1kaPLErdZGeBCbio1OwjUM72aVVszhxjU9TWuZua1EPf
-QHmNl0tdzhC+28BUiyTCuOaRM+T/MTOx2QkOWefYnr5cZq5/trZdddaZiiWJoS7O
-VAj+9uQuXrOt39sjgKFgCWi6tQItbqXic+35zEo/mz+zp0+rCPBChfQmof+FqAwM
-deoXQZAF9jV+N1yentuk39Cr4PHmiVkFku4P6Nre/Rp+DFVrjvQh/wVOgGZ5NMuT
-6SaJNZI0j53NdxlWgw8eK7Po1B9G5z6j71oB+XFmoAU7ujEnTQixaIYpOO9iF7c5
-ThcfdrYg2jzyAMOwAFeWNOfcI6ZPbNpZYhhO4HaLXbqbJKSX3Vf6+l4OIXkNfFPd
-UgfUTWgwuMQyQl87vlN7dZeL7sq64UgplUWsyvZwwEErJucpB5so2bXL4SxgYvzt
-VKmYT4WDfoNwkSzJM/9nlL+uzwFdXt7tazIlTLqj8yz7Eu9x7pQAJnvcNv0Xrbnh
-sH+wOK6ZfOBGlpJTbZ8hFN/vKKci0JV4VJycAsZlIQ3AhV1DTPM+62+Rrrfycapu
-furGgqQob3cs8zXw0TsJ
-=94CE
+iQIcBAEBCgAGBQJOMwfqAAoJENwGBM22xffeDxUQAJuivk2vUZnWd3H17c6KEEjt
+k0JDgj3Sdrm+BrJU0dfhv++09Yj8sBB0KxIzPrhjkKQvvY0J8wkcTZi+GYbUyCv6
+FFBL0BcJrcb9aA3VryXeeOYMf/AdNC7WxvB9wRb7oWuJseXZP6AHzIV2co9eQjYs
+R4+z+n50T6Ie99xIpiLCtnN/Xaq74r3ER0to9eVXFngMUv3obyzxkPEioa4KXZGR
+i17nN6tqSg5rZzWgb4oqETYnhLPChrGiahmmMZYjSa+zjN/dH9vJppEMI0IO87qt
+bCXlmmGkLuXrUUGnZR6639bK586pm0LxOmgqw2di7XTZmTEuxMGdM2qmbFqR/XoQ
+MCkMyB860K6BFr3EiXkGntNoZc1N1fwd2qq2QwGGk8LG9gWBc/rIt26mdEwnzzVu
+hK3JXyPkvZXXTZ0sD4uL9LYR+ckI5ztEotv8kaBHYQlN81gNpP5AnEe6Ne0d6r0Z
+h20ymmeS2T9PIFFnrA/9+vAimRVYIj3aDSTKLwlywrrSc00XekbuWL2kcdzMp8Y4
+ro/653XReViyrXN0P8OiSPDMPV4YTreknTrY7VMP4soN/dxjAAfX93aHOIKXcw4w
+FOdvtljsoiw03GwrnRv8AIRjXpkTUQLMYKkibO43gDkNTsqs7px936NwX7eNpbm3
+LKUQvu0zVVjZIDpKtkY4
+=7pJV
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.0.0_rc.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild
index c9f4a6fc109e..b7ec39d88d28 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-2.0.0_rc.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.0.0_rc.ebuild,v 1.1 2011/07/27 21:04:25 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild,v 1.1 2011/07/29 19:20:02 dilfridge Exp $
 
 EAPI=4
 
 OPENGL_REQUIRED="optional"
-# KDE_LINGUAS="ar ast be bg ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl he hi hne hr hu is it ja km ko
-# lt lv mai ms nb nds nl nn oc pa pl pt pt_BR ro ru se sk sv th tr uk zh_CN zh_TW"
-# the release candidate has no internationalization
 
 KDE_MINIMAL="4.7"
 
+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"
+
 inherit flag-o-matic kde4-base
 
 MY_P="digikam-${PV/_/-}"
@@ -33,7 +35,7 @@ DEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-libs/qjson
-	>=media-libs/libkmap-${PV}
+	>=media-libs/libkgeomap-${PV}
 	>=media-libs/libmediawiki-${PV}
 	media-libs/libpng
 	media-libs/tiff
@@ -62,10 +64,17 @@ S=${WORKDIR}/${MY_P}/extra/${PN}
 PATCHES=( "${FILESDIR}/${PN}-1.7.0-expoblending.patch" )
 
 src_prepare() {
+	# prepare the handbook
 	mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
 	if use handbook; then
 		echo "add_subdirectory( doc )" >> CMakeLists.txt
 	fi
+
+	# prepare the translations
+	mv "${WORKDIR}/${MY_P}/po" po || die
+	find po -name "digikam.po" -exec rm {} +
+	echo "add_subdirectory( po )" >> CMakeLists.txt
+
 	kde4-base_src_prepare
 }
 
diff --git a/media-plugins/kipi-plugins/metadata.xml b/media-plugins/kipi-plugins/metadata.xml
index 01b064cc1d00..9ff79a0b6c80 100644
--- a/media-plugins/kipi-plugins/metadata.xml
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -9,5 +9,9 @@
 		<flag name="expoblending">Build the expoblending plugin, which requires media-gfx/hugin</flag>
 		<flag name="mjpeg">Add mjpeg suppport</flag>
 		<flag name="redeyes">Add redeyes removal suppport</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>