Use l10n.eclass for handling locales. Bump eapi to 4.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 21 insertions, 37 deletions

diff --git a/app-text/goldendict/ChangeLog b/app-text/goldendict/ChangeLog
index d393d8fe7b83..980a8582d7a1 100644
--- a/app-text/goldendict/ChangeLog
+++ b/app-text/goldendict/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/goldendict
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/goldendict/ChangeLog,v 1.8 2012/07/19 17:36:12 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/goldendict/ChangeLog,v 1.9 2012/07/26 07:04:22 yngwin Exp $
+
+  26 Jul 2012; Ben de Groot <yngwin@gentoo.org> goldendict-1.0.1.ebuild:
+  Use l10n.eclass for handling locales. Bump eapi to 4.
 
   19 Jul 2012; Michael Palimaka <kensington@gentoo.org>
   +files/goldendict-1.0.1-gcc-4.7.patch, goldendict-1.0.1.ebuild:
diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest
index 205bea04def0..0c1946b674bf 100644
--- a/app-text/goldendict/Manifest
+++ b/app-text/goldendict/Manifest
@@ -1,19 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX goldendict-1.0.1-gcc-4.7.patch 1051 SHA256 d61d95f464e82ed83493cbb5ded3ecc59a34eb879eb9c7140d801ee6e0c4454e SHA512 72dfb5c32cd77eb55251d59861206f6705ab43afabefb17cd4e8d51321bd2b343bbbc88906f0d915fc89df5e53c0d3577b625fff9411b0291f28ff505a595327 WHIRLPOOL 0be27abba1ffc552a4eb4b146fd3745bcc669b2bfa50fd488af71d96b1ad441f4c86a71e473e2fdc3af9e41f4527ce2df3a21814304cb82f45f7c6c311db1a10
 DIST goldendict-1.0.1-src.tar.bz2 2705932 SHA256 b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6 SHA512 6c35f804063e14ffc9fe9fbd86e710582c550d10fcabb83e7fb0f65ccad1e18eaa31578a96f0aea67276453239b8035f5a694c7d081f9a6f7a822d2b75ebce55 WHIRLPOOL f642692c5ac921d031e89a4512ac63eb665d5b3d02f2a4aea911566131188f877c173d4624eef073e3580e30d8291c1f0196d870738daf2be469783838305c4c
-EBUILD goldendict-1.0.1.ebuild 1511 SHA256 4bfe34b9777a309a481840fbd6b34c74209c2122ecfa37627a57753dcae08527 SHA512 eb5015dac341ab64a57ebb9b79483033e6e5bc1b72f04905b4582d636ee85e1d4d7532904e6d75874600f6078263b104e517c9e3e962cfab85d7bb70ef8d02dd WHIRLPOOL e8bc0a99c121e1e9c066af44c56457bcf1d9884a35b02b536810393732485f8f2af645e5ca79ac58fc179ae6c724284929d32bdc5209018dc5c541bd7d5c5881
-MISC ChangeLog 2209 SHA256 46d9769412b8476980a4c212f9a79f30cebf6cdaabe0faee7c4f415889a2cdf0 SHA512 8a9d3426f56e5d7c97d755acf8a89afbb25341a16b69ae0d736f43422fdb4463347c121f3454822c725d2ebb944924dd4e5f89a334d17eec154736d28d259074 WHIRLPOOL a1014e8579e830db5148cea98ed4645951873a387e8e1214a24c7ae451a11b0ba98725ae9c345c90b5aae49c69d6743231298b4672e15459a2728b0c301bace4
+EBUILD goldendict-1.0.1.ebuild 1417 SHA256 e435baabf23ddcd8ecbcd71e9c61b7d4c40297fdb422b1fcd222409007688700 SHA512 cf1035248152d5ee6ff51bfe49ddf814112131acaad37527fc58779dd5a6fc9e86e677c9ad87c2ceea93932344cdd08dd6b98123a270444e8fb4a3d80c8968ce WHIRLPOOL 5215b486becc45353f4820aeaf1a159e84c8bf14be32f3a9182a9cbb92154b109dfb86eace647b1fa37110c0edc47081b55a78fedbfb6d32aea6ffb51dee306b
+MISC ChangeLog 2335 SHA256 bbee4b3d7f8a74bac69a1ee0827a1d64f4723a885e695b5986291c2554012305 SHA512 bd1d4d4b9eaa2b0c3520bb076882034efca14c862edef606f81a26a2ddcd511654a1059c5ddaca8c1f4adeb55478985068b7e35c9e31ded94d099b1b3fe58e89 WHIRLPOOL 0ea227fdd557b01975a7e8c1ba293373b06cd9038e0b4c5bf67c44a77777164f4ed64b94e433d4a416ff71b1a3b6bff9656f1fd0a9eddb388cd0ae5316470fc6
 MISC metadata.xml 333 SHA256 51f817463269cbc905626ddf39748b9ad5f1cae136b4f758623389211325bbc4 SHA512 ae94cd908509eb7d4e102e58d2643aaf4e0163c1acb7f8d06c1d96e705935eaaa437b025418ea2bb08ef8c0d9de11974f2960a08b12c7c5b1895f1e651ffb7d1 WHIRLPOOL 2a687755a147944891b3887987ba757500811ef65b0128011e895ff405d7b79904dbc27da8fde85207043ae9370e1ead9208b47251dca94240236a708f9a7d0a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQCEWFAAoJEMbwO6tnXQ0snxkIAKsRP6mG7jv0+69BO778WL3w
-n2UCHxqSkus2usyYY/aD7qDb0/lSZkDATm7TjmqjsJFKVsTrIyrRYo/+GdKaAsmv
-JBMa4bdi/RDdKfLwCHZxKGqva9BQ99dbOG8E/EUrC6i30YNCJjhOJDDzR+fayQzO
-FsNPLJqIsi/KWjnSbUlt/k/DaVhwpeFt1RU/VzGA1KBTvPDler9YF7XK+JXOflpe
-VTO0wv2MfMkSO5Jo2N6LzidrTCbPBpBha45f7Lr8/tvrvvIQz97X5Y1ubfVNTZl4
-KRDciqnVCwZ3Nf0Yrlm98N0zxHay21d3t82HIJsXx9i7LRCuCRXISpKHlRa2ZA8=
-=uB6/
------END PGP SIGNATURE-----
diff --git a/app-text/goldendict/goldendict-1.0.1.ebuild b/app-text/goldendict/goldendict-1.0.1.ebuild
index d7e273be4b85..31e5df7cf3bc 100644
--- a/app-text/goldendict/goldendict-1.0.1.ebuild
+++ b/app-text/goldendict/goldendict-1.0.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/goldendict/goldendict-1.0.1.ebuild,v 1.7 2012/07/19 17:36:12 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/goldendict/goldendict-1.0.1.ebuild,v 1.8 2012/07/26 07:04:22 yngwin Exp $
 
-EAPI=3
-LANGSLONG="ar_SA bg_BG cs_CZ de_DE el_GR it_IT lt_LT ru_RU uk_UA vi_VN zh_CN"
+EAPI=4
+PLOCALES="ar_SA bg_BG cs_CZ de_DE el_GR it_IT lt_LT ru_RU uk_UA vi_VN zh_CN"
 
-inherit qt4-r2
+inherit l10n qt4-r2
 
 DESCRIPTION="Feature-rich dictionary lookup program"
-HOMEPAGE="http://goldendict.org"
+HOMEPAGE="http://goldendict.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
@@ -42,17 +42,10 @@ PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )
 src_prepare() {
 	qt4-r2_src_prepare
 
-	# linguas
-	for x in ${LANGSLONG}; do
-		if use !linguas_${x%_*}; then
-			sed -e "s,locale/${x}.ts,," \
-				-i ${PN}.pro || die
-		fi
-	done
+	l10n_for_each_disabled_locale_do editpro
 
 	# do not install duplicates
-	sed -e '/[icon,desktop]s2/d' \
-		-i ${PN}.pro || die
+	sed -e '/[icon,desktop]s2/d' -i ${PN}.pro || die
 }
 
 src_configure() {
@@ -61,12 +54,14 @@ src_configure() {
 
 src_install() {
 	qt4-r2_src_install
+	l10n_for_each_locale_do insqm
+}
+
+editpro() {
+	sed -e "s;locale/${1}.ts;;" -i ${PN}.pro || die
+}
 
-	# install translations
+insqm() {
 	insinto /usr/share/apps/${PN}/locale
-	for x in ${LANGSLONG}; do
-		if use linguas_${x%_*}; then
-			doins locale/${x}.qm || die
-		fi
-	done
+	doins locale/${1}.qm
 }