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.

(Portage version: 2.2_rc56/cvs/Linux i686)

2 files changed, 25 insertions, 8 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/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