Fixed webkit USE flag logic, bug 296424, thank Nikoli for report. Updated langpack, Slovenian (sl) translation is back, bug 295787 thank Jure Repinc for report.

Package-Manager: portage-2.2_rc56/cvs/Linux i686

3 files changed, 28 insertions, 10 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 7fb4739e9cac..ff88209aeac7 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/psi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.182 2009/12/11 07:12:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.183 2009/12/11 10:19:33 pva Exp $
+
+*psi-0.14-r1 (11 Dec 2009)
+
+  11 Dec 2009; Peter Volkov <pva@gentoo.org> -psi-0.14.ebuild,
+  +psi-0.14-r1.ebuild:
+  Fixed webkit USE flag logic, bug 296424, thank Nikoli for report. Updated
+  langpack, Slovenian (sl) translation is back, bug 295787 thank Jure Repinc
+  for report.
 
   11 Dec 2009; Jeroen Roovers <jer@gentoo.org> psi-0.14.ebuild:
   Marked ~hppa (bug #295631).
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 0bdb2212adb5..d7cd9f2ea4b1 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -6,6 +6,7 @@ DIST psi-0.12.1.tar.bz2 2112404 RMD160 a5fc850796b0078bc1a03f4ff93a03611ee11e80
 DIST psi-0.13-20090817_langpack_for_packagers.zip 2099303 RMD160 f2b683835233c803013a3b1af9e598974529dd4a SHA1 9ffe43d686660907bc3ccace74207118123bf12b SHA256 a991a816f3e989e6b7866e33fbf6963a7ac1eb51e21fbc1e50d53db3e8671f96
 DIST psi-0.13.tar.bz2 2180062 RMD160 7557aea37d837eede5f28ec481eaa74dcc7958f5 SHA1 36d9d058531b29a47f94418b6e8a8b75e5446adf SHA256 4e7771cd79b251656f3435d8d4f261ff367f8c69492576fd63ced03dcb87e070
 DIST psi-0.14.tar.bz2 2168801 RMD160 0c4a07726c2f9819da0f8aa8f1982e939f1fc20f SHA1 f5f8e1a427339a4e9113b5fa513b01a42ae1be4b SHA256 aa014a20d59beb23ce2e853fac3d1d70b4b029591627ae0f0a6a3b9f7150a4c0
+DIST psi-0.14_langpack_for_packagers_2009-12-02.zip 2553616 RMD160 4c3ea59043b91d607a3e30f3cec574e5787a0553 SHA1 6c9ce5717bd3a46a0d1f5eabb3b4756099590435 SHA256 27e5cec1847454c9ac3726122b204d923e87c11e1e37e8960c49c17fd4d74dc2
 DIST psi-extra-iconsets-r1428.tar.bz2 3214991 RMD160 5aba49e65ca39209a4791c6e5eb400a54c4a9341 SHA1 969d55207eb89a5000442b57819e98b0a44f37c0 SHA256 1c7cb4a6915c43e7728b96d8eadd4d1359561f40169f10f1051a2c63c3bfbe1c
 DIST psi-extra-iconsets-r807.tar.bz2 2846907 RMD160 fa8516ce37bf2936cdabe5f13b985fe368a0d906 SHA1 50f50ab951cc05a68da5a2b2547587d28ecf18ec SHA256 b10f398ffac34bc97476beedf7989fa77c45d259aacd9f0b761601d13b777b30
 DIST psi-extra-iconsets-r927.tar.bz2 3056366 RMD160 33f072e9db0c5430021963f0ad8fdbf9c4c8b0a4 SHA1 965efe6733bd61731238fcf24bbf4809ebef843d SHA256 292d64032c88b78169c455535c1496a306e8132265da1dfd65b9f7eaffbf4653
@@ -16,6 +17,6 @@ DIST psi-langs-20090217.tar.bz2 641414 RMD160 03e95fc690aa0e1ea49b7ac277ef0ecea9
 EBUILD psi-0.12.1.ebuild 2531 RMD160 92bcf1c9cc0ad9382643f7b4e560bfc6d408ecf9 SHA1 c4c42400d658e4f8391c36701922424f70933c34 SHA256 e64f6d5310a16a6629bbffb043dec0fbec0ab481fe3fb62b5f647cc058ee9668
 EBUILD psi-0.13-r1.ebuild 3870 RMD160 5f6d0c0582e026abaca9c6a73295154dfd0ff314 SHA1 2b3f3fe16b2dc41c17776c16f6d92b4d8b6b6fd8 SHA256 ce6792c640575ea1bd68c6bcfbe73cf2a681c69584da90fb23eb10c4c025c463
 EBUILD psi-0.13.ebuild 3630 RMD160 cc1a60f2962070547a2e511bc28ead8d6701326f SHA1 0118847016d220a4a0d13f400f70ee6d54032804 SHA256 0351a504993e0a925762259eeb530497ff0e56b441a4c496b709e4b55f3f5427
-EBUILD psi-0.14.ebuild 4357 RMD160 51c684b62049275f08db7a28050c38b255b3ba4a SHA1 37f6ea8c64cf172c6955724667c7e6ba9e46b939 SHA256 e923fb91b49a7a11d052da080a1ec2a67ebf8ded47ab7569327a8c85bbb0cb12
-MISC ChangeLog 26745 RMD160 9103d98846f9c031dddb7db03a724f536a26fff4 SHA1 2bf9c151e74304fa39757882af2178eeb0f8d807 SHA256 8bdcbcd32a62f9b2bfb529dc6bfac49482646a0c13ebf9a5713822c2befb2761
+EBUILD psi-0.14-r1.ebuild 4605 RMD160 c09b65794dd1dc3cac8d985401be9284b8b5bf6a SHA1 e70f434c2af7e2ccb8796204caa2c75e5c3a3ece SHA256 31418086b8a661b0a167faaccf9a96edfcf771813d8648aa7c16e28ef18cc122
+MISC ChangeLog 27027 RMD160 8d1e292bb361f358a21a13e531a492e297809640 SHA1 ff1f57fc970e86ac101cf26bb6a74a351a45d1a7 SHA256 ad95d92397ae931aba865194023a7c96f90e07ca9e9bc9e38519f07dcc453fcc
 MISC metadata.xml 441 RMD160 cc697432cfc0f0615516f1d3434e2cc7f7dde7d3 SHA1 1e2aa9526abc1c328dbf063f12b940dd98d629a8 SHA256 7e042d514e4b647c17d4c0d42da84e795b102a0b3b53c7badc6f59b7e63439d6
diff --git a/net-im/psi/psi-0.14.ebuild b/net-im/psi/psi-0.14-r1.ebuild
index af204f4c45ce..b85af27ac736 100644
--- a/net-im/psi/psi-0.14.ebuild
+++ b/net-im/psi/psi-0.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14.ebuild,v 1.3 2009/12/11 07:12:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r1.ebuild,v 1.1 2009/12/11 10:19:33 pva Exp $
 
 EAPI="2"
 
@@ -12,8 +12,9 @@ DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
 HOMEPAGE="http://psi-im.org/"
 # Langpack:
 # http://lists.affinix.com/pipermail/psi-devel-affinix.com/2009-August/008798.html
+# Later found his site: http://fs.scs-tsa.de/psi_l10n/
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	mirror://gentoo/${PN}-0.13-20090817_langpack_for_packagers.zip
+	http://fs.scs-tsa.de/psi_l10n/psi-0.14_langpack_for_packagers_2009-12-02.zip
 	extras? ( mirror://gentoo/${PN}-extra-patches-r1428.tar.bz2
 		mirror://gentoo/${PN}-extra-iconsets-r1428.tar.bz2 )"
 
@@ -23,7 +24,7 @@ KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
 IUSE="crypt dbus debug doc extras jingle spell ssl xscreensaver webkit"
 RESTRICT="test"
 
-LANGS="de es fr it mk pl pt_BR ru sv ur_PK zh_TW"
+LANGS="be cs de fr it ja pl pt_BR ru sl sv ur_PK zh_TW"
 for LNG in ${LANGS}; do
 	IUSE="${IUSE} linguas_${LNG}"
 	#SRC_URI="${SRC_URI} http://psi-im.org/download/lang/psi_${LNG/ur_PK/ur_pk}.qm"
@@ -61,9 +62,6 @@ src_prepare() {
 		ewarn "that fail too."
 		ebeep
 
-		echo "		755-psiplus-fix-application-info-defines.diff
-		9999-psiplus-application-info.diff"
-
 		EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE}
 			755-psiplus-fix-application-info-defines.diff
 			9999-psiplus-application-info.diff" \
@@ -96,7 +94,7 @@ src_configure() {
 			$(use spell || echo '--disable-aspell')
 			$(use spell || echo '--disable-enchant')
 			$(use xscreensaver || echo '--disable-xss')
-			$(use extras && { use webkit || echo '--enable-qtwebkit';} )"
+			$(use extras && { use webkit && echo '--enable-qtwebkit';} )"
 
 	echo ${confcmd}
 	${confcmd} || die "configure failed"
@@ -134,12 +132,23 @@ src_install() {
 	# install translations
 	cd "${WORKDIR}"
 	insinto /usr/share/${PN}/
+	local nolangs=true
 	for LNG in ${LANGS}; do
 		if use linguas_${LNG}; then
 			doins ${LNG}/${PN}_${LNG}.qm || die
+			newins ${LNG}/INFO INFO.${LNG} || die
+			nolangs=false
 		fi
 	done
 
+	# if linguas is empty install all translations
+	if ${nolangs}; then
+		for LNG in ${LANGS}; do
+			doins ${LNG}/${PN}_${LNG}.qm || die
+			newins ${LNG}/INFO INFO.${LNG} || die
+		done
+	fi
+
 	if use extras; then
 		cp -a "${WORKDIR}"/iconsets/* "${D}"/usr/share/${PN}/iconsets/ || die
 	fi