Refactor translations logic. Drop qml use flag

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 15 insertions, 33 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 821fbfe37114..b53b500efbc0 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/qt-creator
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.48 2010/06/19 00:45:29 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.49 2010/06/22 11:09:57 hwoarang Exp $
+
+*qt-creator-1.3.1-r1 (22 Jun 2010)
+
+  22 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+  -qt-creator-1.3.1.ebuild, +qt-creator-1.3.1-r1.ebuild:
+  Refactor translations logic. Drop qml use flag
 
   19 Jun 2010; Jonathan Callen <abcd@gentoo.org> qt-creator-1.3.1.ebuild:
   Moving dev-util/cvs* to dev-vcs/cvs*
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index 99f287e84014..f9c166220e04 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -1,27 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX docs_gen.patch 603 RMD160 9711ddb1c59e8ddd1ad17ba34f89c8e4c89b4504 SHA1 83cd745baabd1545a1079c59edef6279b254074a SHA256 7428155e6f09201d60f308c3934153aa5fa5b25296a96d86dad80354dc8e3b93
 DIST qt-creator-1.2.1-src.zip 8631249 RMD160 6aea12a39bd5827422afa6e02cfcad2174dc6582 SHA1 41d10717a83d3b7de7bc5218a35a38f25408a8d6 SHA256 9b955421050c1a9dacefa1ed888a971bffa86258a18598a1a1b297e5d8d23cbf
 DIST qt-creator-1.3.1-src.tar.gz 10623442 RMD160 37bebc4566cfef85d5a7901c1efd8b917b3a0584 SHA1 49b61c3e8010d94d6d595fef38d3da737b26cd80 SHA256 b738a327b64276c5d8c0a01cbb840e316a657635514bc8e41c6cfa1c77e691ed
 EBUILD qt-creator-1.2.1.ebuild 2880 RMD160 5daf5847372757c2c542a2c8f243192442b2a378 SHA1 6b4a509d2e17e5113d49e4cf54018c5f89687ae9 SHA256 624ecf91ce79efea45b11782b4129e44ae6ab6c9c8e37fc973ed0ccfc58b32a4
-EBUILD qt-creator-1.3.1.ebuild 3431 RMD160 8cce15be076ebb6b0c9dfcedabe5a54d5db0a79c SHA1 490177f362515070b473bb902ef9410ec82f16bf SHA256 27eaf7a2052d6a1681e6a40444d9e17d5eb919f8bf6ffe9e9f7c23cf1b9cef21
-MISC ChangeLog 6920 RMD160 339c9aaff510d6fba37fa3bd7978a53b7033c1ae SHA1 d9524615191b8be4c5e5b7705a73b243aa7b96c7 SHA256 efa4b63b3296e7f24566dc2d0a52dec9acf35462508d337be809e9e095aabd75
+EBUILD qt-creator-1.3.1-r1.ebuild 3337 RMD160 aa96dabf42735ecf23ffd44ec77550f901bcdef5 SHA1 8c0f540106634196a144a001c194914a37112990 SHA256 ece9b599e4e8b2d3fb5af5afc5d7bfebb17fd8a53c96a8b69f3fbfdc30086795
+MISC ChangeLog 7120 RMD160 64abcece2297576e9fa4b75d3672724d3a31e86c SHA1 955818340a92751f3e48030ea5787debab0bef07 SHA256 750ad9f1a190a2ecf95fa767ebaa2e4a3c933dbc8659facf4bc4b4f48eafa5a3
 MISC metadata.xml 1034 RMD160 ff0e30c74188440729f8a7eb6ac4edb78a58261e SHA1 96e28085ccb41904e21e54ef0a3e160bf13d0acc SHA256 9fad95b6ee7de9a1136b6e780084f2185d3fe5ce111f5d605cea5e0292da7878
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQIcBAEBCAAGBQJMHBMvAAoJELHSF2kinlg4h54P/1le7xNTNfHsYm+tVSm7Y4UZ
-aYaMn9lsXGps2CK8Jqx70f2UTGf1FjsoLSWJjZELzWhahT/APrCMRUvPw2VDJG1o
-8oQziKcSEzR8Tir8r8h8CDKjvVpch5cx0hteH9YoKlmDaDoZRAHgaT/18wn1AOQ8
-wu52e4E/WfRYW8E42RxfYpJrqzNoiR95Fvyu6cgFf7k77EDBEOMNKWobzG0KTZZl
-nUQBZKlwqBMiBlcsIzlRcPLuQFUUPVW9HtKa/bbN25yziYBWQ8vl4Cw59d5oRgzj
-kOdToqqytUpyd2F2kcwjnn7tN6so+8owBoQJ6qCr7bZzK7wKiQFX5ztFzshE3waS
-Co5tt/b0lgku9tR/VBGlzDKBMmCamWo5mKEmcWWt1lp95CPx2YScG8qhXCNt2WUv
-/6tcTqgxXrczEShLarUCakEy5IEPld2JAKruOmHk6c8WdhtiL3fKUYLJta7iZuyp
-FwbuCUI218iuvuJVEnnCvoPaMrtKw7uEkndd5nJqMgUtRsGUkda6hAOAH0bydprH
-DYEK3GHeDIu6aZULyLL72LKEsyPRmzWN6REA1X7qaywxJ3Ek/7IgQ8JRohZIYtbH
-WoDvLs2OfYSO2z2fcQnHAG2+j7XwnSbcItEuc6qiXuubO2GUKADJl/nOy8PAm5tl
-zO4mBeVtRAVneuljXqYe
-=EPCP
------END PGP SIGNATURE-----
diff --git a/dev-util/qt-creator/qt-creator-1.3.1.ebuild b/dev-util/qt-creator/qt-creator-1.3.1-r1.ebuild
index a1f3c4f8a7d6..78f7b8286207 100644
--- a/dev-util/qt-creator/qt-creator-1.3.1.ebuild
+++ b/dev-util/qt-creator/qt-creator-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-1.3.1.ebuild,v 1.11 2010/06/19 00:45:29 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-1.3.1-r1.ebuild,v 1.1 2010/06/22 11:09:57 hwoarang Exp $
 
 EAPI="2"
 LANGS="de es fr it ja pl ru sl"
@@ -34,7 +34,6 @@ RDEPEND="${DEPEND}
 	examples? ( >=x11-libs/qt-demo-4.6.1:4 )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
-	qml? ( >=x11-libs/qt-declarative-4.6.0:4 )
 	qtscript? ( >=x11-libs/qt-script-4.6.1:4 )
 	subversion? ( dev-util/subversion )"
 
@@ -98,13 +97,10 @@ src_install() {
 		'Qt;Development;IDE' || die "make_desktop_entry failed"
 
 	# install translations
-	insinto /usr/share/${MY_PN}/translations/
-	for x in ${LINGUAS};do
-		for lang in ${LANGS};do
-			if [[ ${x} == ${lang} ]];then
-				doins share/${MY_PN}/translations/${MY_PN}_${x}.qm \
-					|| die "failed to install translations"
-			fi
-		done
+	for lang in ${LANGS};do
+		if ! hasq ${lang} ${LINGUAS}; then
+			rm "${D}"/usr/share/${MY_PN}/translations/${MY_PN}_${lang}.qm \
+					|| die "failed to remove ${lang} translation"
+		fi
 	done
 }