Version bump, wrt bug #499536. Fix version check in some plugins, partially fix locales list, add check for new locales through l10n eclass

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

3 files changed, 115 insertions, 1 deletions

diff --git a/www-client/qupzilla/ChangeLog b/www-client/qupzilla/ChangeLog
index f43973f6090f..7924237955a0 100644
--- a/www-client/qupzilla/ChangeLog
+++ b/www-client/qupzilla/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/qupzilla
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.37 2014/01/27 01:28:28 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.38 2014/01/29 20:27:33 pinkbyte Exp $
+
+*qupzilla-1.6.1 (29 Jan 2014)
+
+  29 Jan 2014; Sergey Popov <pinkbyte@gentoo.org> +qupzilla-1.6.1.ebuild,
+  +files/qupzilla-1.6.1-plugins-version-check-fix.patch:
+  Version bump, wrt bug #499536. Fix version check in some plugins, partially
+  fix locales list, add check for new locales through l10n eclass
 
 *qupzilla-1.6.0-r1 (27 Jan 2014)
 
diff --git a/www-client/qupzilla/files/qupzilla-1.6.1-plugins-version-check-fix.patch b/www-client/qupzilla/files/qupzilla-1.6.1-plugins-version-check-fix.patch
new file mode 100644
index 000000000000..10e86465442c
--- /dev/null
+++ b/www-client/qupzilla/files/qupzilla-1.6.1-plugins-version-check-fix.patch
@@ -0,0 +1,33 @@
+--- src/plugins/CopyTitle/copytitle.cpp.orig	2014-01-29 21:43:11.073465642 +0400
++++ src/plugins/CopyTitle/copytitle.cpp	2014-01-29 21:43:33.079464399 +0400
+@@ -61,7 +61,7 @@
+ 
+ bool CopyTitle::testPlugin()
+ {
+-    return (QupZilla::VERSION == QLatin1String("1.6.0"));
++    return (QupZilla::VERSION == QLatin1String("1.6.1"));
+ }
+ 
+ QTranslator* CopyTitle::getTranslator(const QString &locale)
+--- src/plugins/MailHandle/mailhandle_plugin.cpp.orig	2014-01-29 21:45:27.312457943 +0400
++++ src/plugins/MailHandle/mailhandle_plugin.cpp	2014-01-29 21:45:37.127457388 +0400
+@@ -66,7 +66,7 @@
+ {
+     // Let's be sure, require latest version of QupZilla
+ 
+-    return (QupZilla::VERSION == QLatin1String("1.6.0"));
++    return (QupZilla::VERSION == QLatin1String("1.6.1"));
+ }
+ 
+ QTranslator* MailHandle_Plugin::getTranslator(const QString &locale)
+--- src/plugins/Videoner/videoner_plugin.cpp.orig	2014-01-29 21:44:59.552459512 +0400
++++ src/plugins/Videoner/videoner_plugin.cpp	2014-01-29 21:45:07.055459088 +0400
+@@ -62,7 +62,7 @@
+ {
+     // Let's be sure, require latest version of QupZilla
+ 
+-    return (QupZilla::VERSION == QLatin1String("1.6.0"));
++    return (QupZilla::VERSION == QLatin1String("1.6.1"));
+ }
+ 
+ QTranslator* Videoner_Plugin::getTranslator(const QString &locale)
diff --git a/www-client/qupzilla/qupzilla-1.6.1.ebuild b/www-client/qupzilla/qupzilla-1.6.1.ebuild
new file mode 100644
index 000000000000..79ca82afe8d8
--- /dev/null
+++ b/www-client/qupzilla/qupzilla-1.6.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/qupzilla-1.6.1.ebuild,v 1.1 2014/01/29 20:27:33 pinkbyte Exp $
+
+EAPI=5
+
+PLOCALES="ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_VE eu_ES fa_IR fr_FR gl_ES he_IL hu_HU id_ID it_IT ja_JP ka_GE lg nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr_BA@latin sr_BA sr_RS@latin sr_RS sv_SE uk_UA zh_CN zh_TW"
+
+inherit l10n multilib pax-utils qt4-r2 vcs-snapshot
+
+DESCRIPTION="Qt WebKit web browser"
+HOMEPAGE="http://www.qupzilla.com/"
+SRC_URI="https://github.com/QupZilla/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/QupZilla/${PN}-plugins/archive/ce262a05e0f5cea171650ed6589a12359358a732.tar.gz -> ${PN}-plugins-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus debug gnome-keyring kde nonblockdialogs"
+
+RDEPEND="
+	dev-libs/openssl:0
+	>=dev-qt/qtcore-4.8:4
+	>=dev-qt/qtgui-4.8:4
+	>=dev-qt/qtscript-4.8:4
+	>=dev-qt/qtsql-4.8:4[sqlite]
+	>=dev-qt/qtwebkit-4.8:4
+	dbus? ( >=dev-qt/qtdbus-4.8:4 )
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	kde? ( kde-base/kwalletd:4 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CHANGELOG FAQ README.md )
+PATCHES=( "${FILESDIR}/${P}-plugins-version-check-fix.patch" )
+
+src_prepare() {
+	# remove outdated prebuilt localizations
+	rm -rf bin/locale || die
+
+	# remove empty locale
+	rm translations/empty.ts || die
+
+	mv "${WORKDIR}"/${PN}-plugins-${PV}/plugins/* "${S}"/src/plugins/ || die
+	mv "${WORKDIR}"/${PN}-plugins-${PV}/themes/* "${S}"/bin/themes/ || die
+
+	l10n_find_plocales_changes "translations" "" ".ts"
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	# see BUILDING document for explanation of options
+	export \
+		QUPZILLA_PREFIX="${EPREFIX}/usr/" \
+		USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
+		USE_QTWEBKIT_2_2=true \
+		DISABLE_DBUS=$(usex dbus '' 'true') \
+		KDE_INTEGRATION=$(usex kde 'true' '') \
+		NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '')
+
+	eqmake4 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
+}
+
+src_install() {
+	qt4-r2_src_install
+	l10n_for_each_disabled_locale_do rm_loc
+	pax-mark m "${ED}"/usr/bin/qupzilla
+}
+
+rm_loc() {
+	rm -f "${ED}"/usr/share/${PN}/locale/${1}.qm || die
+}