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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 127 insertions, 15 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/Manifest b/www-client/qupzilla/Manifest
index d195cb1f784d..76b230cdfca9 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -1,27 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX qupzilla-1.6.1-plugins-version-check-fix.patch 1283 SHA256 7509a27fc524f02966b110192e70ff40f68687d3e43901a52613549f22f765a1 SHA512 7591eea7992dfd3b0176cc87fbfd206a9ecfb292103b653c52ba31072fa1b5fbe7cb1a0a348229c93b43905e7cafe4d5d6afe7c0d860b0325f3c11e2c428dadf WHIRLPOOL c3818e92d7400c128b3b258238405ce2fbf14ca561b1997b7aafcff06c6ee6c05e65a68af017f84f141cec3a11e685fd84e99147bb1eb98156446e3170852138
 DIST QupZilla-1.4.4.tar.gz 3949537 SHA256 dc72d7b5d75e1348bf9c3c43267946a88a1fcc70045a0d50f6972cd679e5366b SHA512 79e855e63ae705f7dd692d899bf48c81f484753f8ec233d3a7a442bd5ede0e9aa1d8a8a35ee5db8b6cf7aa3c1feb4996265314fe948a5c995dc17ec70190445c WHIRLPOOL 958f9b81fd013d91233f5833daa8e1f8bbe98b595eae3a6ae0e2100b7b6777337c582b039b8c635849374dc80b4eef296071d959e0898762aa740d637909966d
 DIST qupzilla-1.6.0.tar.gz 4715143 SHA256 67a12326c55de32434b3381f0574bf1be5858ca9f20eaa513feb720fd8f67dc4 SHA512 4a30a9be9bdd6b2fd131bc19e92c86f751562d5ffa0179e8381ace0820746039d59e0ad58b2f9c50b546e983fb5f7b206eaef4140a03d1c3f140209bc62f4a6b WHIRLPOOL 8e35a174211843498fedbad0f1da02700aa529884cb8deece51fc73cd95e0b8d45ffb93e91b5c4a2b81c44a192f8291ec6fad4a861e3e4f9560f375f2b60e890
+DIST qupzilla-1.6.1.tar.gz 4653244 SHA256 ab484ccf524ee5fc9341cd5adea746e8769821859037a7d81c606f81184610fd SHA512 30bc06aefdd3d92b6890f69f954c7ec4e0663fe832819f5c3b6bfc9ee6adc2cfbb585ec7b473ecf0efb3521b5c7527a928646667e3a411328b64eb2ac5977a38 WHIRLPOOL 1b9d5834705bfa2d3b1994769efb57bdc0f88bec7995765bc883bc1875f4a201eaa94d0f80379054b432464d761dec93bc18068ec386b1e90e6461380345bd74
 DIST qupzilla-plugins-1.6.0.tar.gz 89683 SHA256 f68969bf2eb6519cd2e39b485395b2d9a0c694c95dfaeda70aaff385f111f267 SHA512 81669997ba1e0e2cd9480f882f7fafef5318797fb340e73a9a308c176c0fb3351841a8ab2f27d7b957b2860f0dd762fe68f4ab4f374dbff8b46ac69835c666e3 WHIRLPOOL e3f80235ca97aea47d62937404f7e8ab88e79ace166f82cd131d583e678ad1db979ec50cb1af29afe997d3065b996e43587267d1bc4ad8bc2f8830fd06c38b97
+DIST qupzilla-plugins-1.6.1.tar.gz 89683 SHA256 f68969bf2eb6519cd2e39b485395b2d9a0c694c95dfaeda70aaff385f111f267 SHA512 81669997ba1e0e2cd9480f882f7fafef5318797fb340e73a9a308c176c0fb3351841a8ab2f27d7b957b2860f0dd762fe68f4ab4f374dbff8b46ac69835c666e3 WHIRLPOOL e3f80235ca97aea47d62937404f7e8ab88e79ace166f82cd131d583e678ad1db979ec50cb1af29afe997d3065b996e43587267d1bc4ad8bc2f8830fd06c38b97
 EBUILD qupzilla-1.4.4.ebuild 1661 SHA256 d7d6681726e8178e9445de8e2eaf28d9ed012e47f9fdb791103b1050ec1e25ad SHA512 ca1f8fc62c2c371db29f2c738624b47de1615d5cc312b0ef85f2e351b3b0257aff56e300383e729be7e423fecc5610c4bfa0cf9107519fba9bad6406b135e179 WHIRLPOOL e9641606e16e89af1f61587a8dfdc7c95b6b596141a1e459e2a0bd11be4e96b4e29f34889763af5a2c33007244500574aeb2182ade39f611cc8772e05b6c4d81
 EBUILD qupzilla-1.6.0-r1.ebuild 2112 SHA256 76c8cbafcd73e44fff05c4370f5b2519c465535abe31185cef37b20580a6e54d SHA512 3a1ae5977136d7e5781fa71ef728f2118f91fd34bdb3acb1bbdd16f5228c29ab6692f8687a4695c88b9266edee80ad9f731ffa0844bd11ffb0649962e52cb3cc WHIRLPOOL d8419ae2981f20a652e152a20e2ec61b036ac74c943cc062228b62f1d1d16cf4f2bd75436b8e6ae926ea322ae3a8f6e84da8885feddbd744041ac0a93bbc01f5
-MISC ChangeLog 5395 SHA256 4ce4ee6f5e313c8f2b58fc0ac754295a7aa0840580aa6e9d7e95090c16629d50 SHA512 de60cac90bb5a504a8437ecdf505e8e94460c983a467c42324503945e2d894c9209f6f3bbaef2fd732ac9e063cd50751fe541429f806efb0ddb86859e959e2d2 WHIRLPOOL 2985e4cfd4437d3e4703e2af139c18f010b87932b608d01ee57acde73f409af54f21d9486e7555746c8fe094c93b1ce97c46d72aa741ab773c1dfcf90653f7ca
+EBUILD qupzilla-1.6.1.ebuild 2258 SHA256 8a9b4ed5d8bcad5236385644eb32f1368e9d4b0be5f8d818e03d9a090999cd6e SHA512 396ca7b3981c614ef4c7b9f6125cc03be3040f300ea0e6886ea3f9da8284955de4847a0326cf4a459db093aa3b1cac5d40550f74f64efb3d3dee0c7a6af256e5 WHIRLPOOL f007dfe89de92977b89badbb4d9b8dc2067bf50ab0a2cf396691e844abab67693bebf1921cd9c77fe52e5253d71e9fe7bc865334ca662bdf0d67b23a16b0d7fe
+MISC ChangeLog 5706 SHA256 473b7ff88c8dab72df77ab609ee8fca68467726b8bcf87d97bcc39cf65cb0a35 SHA512 68c1b793fdceedd91ddabfe39a6365185499a7158dae0c0199d778ed4a546403ac9a6cedc25c86a139eed1a8b2c648baed086e300ec8182c051a77ada9af1f05 WHIRLPOOL 94422af97807090821bc87bacc9da5900961e4bf59ca320c265e71ca77d1cc537fb1bc5c024f64bf9492c15a9a4f01e538c9676a030992b35db1a73d8fe316c3
 MISC metadata.xml 416 SHA256 1b51452eaf560d3cd580b3530bb739a415a34188f5ba555d2af9d36da646fe0b SHA512 4918aafacd22beb0817572692c198c99fb588c226abc469fc9a01c02ddcd685584bc756bc595a936f3e48c535f2203e2384f8dd6d96bffe5ad152f84c7812e56 WHIRLPOOL 17d97783743b7140be444e359e62da877ba30134b8abb83912c8f5633c9a5e94981d9db2a062f03467b4fb89b7ca6ef2d755e359a56d9c31dc26eae2eb7ccd1c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS5bZOAAoJENXLsxwXqFxyPcEP/3+p5NForSiJmweD9+TRG1v+
-2pa+UybueJAqjaKorQt/tYvcybgxgHy5DTSX7nTrX/FGcEnmt6yOm5M0LVwn+3az
-FfYyveNm3rA3h1nM+20Tw5fI2xIS3AWC+ne/OQ/7jl8GglpPp3BXEBOvU6tHcx7E
-pWUWBRW71WPmvMgcRlhiRJ2GyPAanaIXMbY0/Kxt96X5k6wsNBaHesC0pRthuQEu
-h4H7v2SnLyw41QRKko/cO9aL/cvZrtWqyXjaYx9/A1MJJfmljsEauNoBKAdmUpMb
-kPoxqxEbHDvXUJlMTBuQ7PQrSuzOxFHppAOJfsuFDumALZ2HyCtYUoHT7vnGg3GM
-YRn7/CMC3cvcNYUjGubUjmlE298DIGsa+o2CujzHc/6Nl0R4EXyI8CJaS2lMFQaa
-BuRwi/+gZTCbhkvWc3EpnY++iIhtTHCFcEhClORmFJiqpIYG47yfGz4DVwSFPXWn
-j7L3lBZCvTGSWIT+HNOs78SvMhrqubSs5cdj5U+2QUbSI6hCCIH/yIj7Et43SEfb
-gtUFxATbavM7k/FcyuNDYyonrgMs5NG519qpKvjJYygWfjuE+wimJeu//xs3fstx
-dehN91/5qn2+ouYZaHaXvVo6uTImu9nyLOvu1WIEqd2K4z827uKX3EeZDA2gno8E
-Fg540hccbv4Yr1/C7jRZ
-=SMRN
+iQEcBAEBCAAGBQJS6WQ6AAoJECo/aRed9267/MkIAJgnV9PriP9s0t06IbiSypbP
+hdchvoiZStQoSIbXLDyB8N2OhekwNKzWxzB9hiDlLnMo3ZkRedp4+0GN4au6eOvS
+/gD56zlnJ/8EjCmnfJHcQbUnuJcq6qNZ3RWOuHPx4miUaSAagGocWPbIuKzsDr7S
+4/ptux6+TYLUgxkg+YHsNP3v0t4W0a6hvsemFOr5lr51clPe04Gv1+ET8nuxOPAy
+obAq8EYgubdJQdFB7+Pzz9g0JGWUfuvF7XtyrX4VPNTilM3hDswPte0Yxkqtnij/
+EI+sXgqhTCyBl/aLGPZdNLxJBtEV5iliP5COCRNcXZPRlBWRo7EsPNyKeaxk/VM=
+=pIqk
 -----END PGP SIGNATURE-----
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
+}