Version bump, including some improvements from bug #496908

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x0F9C590B7FF324F6!

3 files changed, 81 insertions, 15 deletions

diff --git a/www-client/qupzilla/ChangeLog b/www-client/qupzilla/ChangeLog
index ec89d066086e..3b9667998e29 100644
--- a/www-client/qupzilla/ChangeLog
+++ b/www-client/qupzilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/qupzilla
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.34 2013/12/11 07:27:12 zlogene Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.35 2014/01/20 17:22:32 yngwin Exp $
+
+*qupzilla-1.6.0 (20 Jan 2014)
+
+  20 Jan 2014; Ben de Groot <yngwin@gentoo.org> +qupzilla-1.6.0.ebuild:
+  Version bump, including some improvements from bug #496908
 
   11 Dec 2013; Mikle Kolyada <zlogene@gentoo.org> qupzilla-1.4.4.ebuild:
   x86 stable wrt bug #488830
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index 1c37cdfb03c8..54c5fb43654e 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST QupZilla-1.4.3.tar.gz 3947912 SHA256 cf48574d981b912bb1b25e6a2370c8d0eea73baf8770f437b64e3d9d06a67b2a SHA512 8d586f7cd161c91a506e3634a279cbce7df1bd94720d019f228f0eb3f0edced6997d36ad8327e6e51d5231306748da8492b67a1ecc26340f680bd68259fad096 WHIRLPOOL 79481502dacc682e962f80c65458a5af76b1bedbe60403e8cef305e58d3148054dfc2834b9cc905d169782f2ae8c9683df0c41fd3c19b131b544050d2c69b222
 DIST QupZilla-1.4.4.tar.gz 3949537 SHA256 dc72d7b5d75e1348bf9c3c43267946a88a1fcc70045a0d50f6972cd679e5366b SHA512 79e855e63ae705f7dd692d899bf48c81f484753f8ec233d3a7a442bd5ede0e9aa1d8a8a35ee5db8b6cf7aa3c1feb4996265314fe948a5c995dc17ec70190445c WHIRLPOOL 958f9b81fd013d91233f5833daa8e1f8bbe98b595eae3a6ae0e2100b7b6777337c582b039b8c635849374dc80b4eef296071d959e0898762aa740d637909966d
+DIST QupZilla-1.6.0.tar.gz 4707758 SHA256 3fc45837f61f0958626101ec9369ba2a3c1fa23dcc6466fe342ee1b07a0d3f63 SHA512 f1a35c497fb937c854298571866b1b3ae0b4421fbc171afad0cf0d7005f50c042202b969537ac632beb7a5e1ef5e8557e53f3a38b0ecb7359c0ed5e61d67c311 WHIRLPOOL 6d9fb5e6b6d6846da04e035019aedbb166922d02f52fe8363174da76bdad5eb6dfc4cff26fe7e18b0ab72fff412550b1f03cc6331487e65b5c646b9adb91f235
+DIST ce262a05e0f5cea171650ed6589a12359358a732.zip 136784 SHA256 1f8a91e4e7137694348146c5eb7d27f9bbe23ad289caa858c76d59aa8239a943 SHA512 17a54f76b63a14783372380d16648b7421a81905ebd9998b29013e47a31c80ac613099bc040f45e85c8d2288df64d9d43d881ccced1b9715546730d9d5f19eed WHIRLPOOL 546d4e528a22dd34a2e6090c3eb14dadc9618b7b7247bda78a4f7d916eed0dfd226fd686e2d9e21bf7e6cfdc4215ad9680082fc16f1dd41e3230679f77a0c3bf
 EBUILD qupzilla-1.4.3.ebuild 1661 SHA256 0285368cb302ad6c95c8d01cacb272858b9af81f1d6ed52bd965ef0e40c03e40 SHA512 75bc0fb4a7c8518f6f06634145e798d5b0fb7edd43dfc47f6632140a7653939bcc5a7b42df1569e8ebc7b33096fce978aace7e625b9419abc2f7910d8d91a15c WHIRLPOOL 83554d16e10c438f2a1dbe0f7e45e5923c4a55ce909c7800b80576a9a649134cffeb1804b06e4a7099906e0a1dc9eb110e78b6e1bc7583f339a14f4ac5afcf6e
 EBUILD qupzilla-1.4.4.ebuild 1661 SHA256 d7d6681726e8178e9445de8e2eaf28d9ed012e47f9fdb791103b1050ec1e25ad SHA512 ca1f8fc62c2c371db29f2c738624b47de1615d5cc312b0ef85f2e351b3b0257aff56e300383e729be7e423fecc5610c4bfa0cf9107519fba9bad6406b135e179 WHIRLPOOL e9641606e16e89af1f61587a8dfdc7c95b6b596141a1e459e2a0bd11be4e96b4e29f34889763af5a2c33007244500574aeb2182ade39f611cc8772e05b6c4d81
-MISC ChangeLog 4912 SHA256 cc19b353960cc0893eebfdb2f50612204d167c475b37409acf69bdc28d93327e SHA512 bc8784d2d1040a89df1679bd40b9af3c3ee1dba488d850ccf0bd32cc1e2eb46af130170d8a915fea2eb80aa922f0a1adcf42b844d9f0208e2add98cefe00219c WHIRLPOOL 655a679df78c689e220a8189f709a8175655fa0dfcd34b80d64420cce0b192de82167797f437ba7207a1d8c473a29220694f6e514122588a2aa634e4404b945b
+EBUILD qupzilla-1.6.0.ebuild 2088 SHA256 de022c4c2c7d1e99d4357a820769b56c81c74a82122d7395a17d54da1b05bb2f SHA512 1125cd053b9c27f05676cb4ecf11c404152728bf7575a2a0a007907168227ff8ae8d8c906f587c5489e697a2f233534bf48b856537e099118c2739b4c621a76b WHIRLPOOL cfb08baefa019445819c1790ecca0374386ceff82a228ecbdbbbfa14c98ece83c27a500e0ed2a38d44e5cd1b75333a47a445c75ef296df686cb63496fc7a7db5
+MISC ChangeLog 5076 SHA256 80b10e70fae275b71eca764fc6ce8e898489cd7ab0309af194b13913439132bf SHA512 43f946cb08256b3b73498beefea525f0ee7234000c1c6af1f3571921f9426c4f172241f0a567b2195adb1d135f7caafce166e0009ceca47f8c5830d4261e8bf6 WHIRLPOOL d09f64a8b49b13d98d452f77c661da00283f562582fe5afc29d6387cebdda6ca280714e8b3c55516993d411b8d54a334560484792946562323564bde5bb8a588
 MISC metadata.xml 416 SHA256 1b51452eaf560d3cd580b3530bb739a415a34188f5ba555d2af9d36da646fe0b SHA512 4918aafacd22beb0817572692c198c99fb588c226abc469fc9a01c02ddcd685584bc756bc595a936f3e48c535f2203e2384f8dd6d96bffe5ad152f84c7812e56 WHIRLPOOL 17d97783743b7140be444e359e62da877ba30134b8abb83912c8f5633c9a5e94981d9db2a062f03467b4fb89b7ca6ef2d755e359a56d9c31dc26eae2eb7ccd1c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iJwEAQEIAAYFAlKoFR8ACgkQG9wOWsQutdaYuAQAvqTNtej6eTBWuXx+D0JuVdnC
-JuC5XXu51rL8Q+0XsUTlYQ4HnGM6RNplgn4IcpDTI+zc/4dfyb12GZ9ZvXENoWME
-Wnnrs5jc8PqbPAQZE9LXYv19nHz4EkkzeqivMTcHInEvpzBBEPwbrNwcm1ZTSS43
-8rC6ITGMZN0wRCbl784=
-=vrSf
------END PGP SIGNATURE-----
diff --git a/www-client/qupzilla/qupzilla-1.6.0.ebuild b/www-client/qupzilla/qupzilla-1.6.0.ebuild
new file mode 100644
index 000000000000..7936bcca40f2
--- /dev/null
+++ b/www-client/qupzilla/qupzilla-1.6.0.ebuild
@@ -0,0 +1,70 @@
+# 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.0.ebuild,v 1.1 2014/01/20 17:22:32 yngwin Exp $
+
+EAPI=5
+PLOCALES="ar_SA bg_BG bo_CN ca_ES cs_CZ da_DK de_DE el_GR es_AR es_ES es_VE
+fa_IR fr_FR gl_ES he_IL hu_HU id_ID it_IT ja_JP ka_GE lg my_MM nb_NO 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
+
+MY_P="QupZilla-${PV}"
+
+DESCRIPTION="Qt WebKit web browser"
+HOMEPAGE="http://www.qupzilla.com/"
+SRC_URI="http://www.qupzilla.com/uploads/${MY_P}.tar.gz
+	https://github.com/QupZilla/qupzilla-plugins/archive/ce262a05e0f5cea171650ed6589a12359358a732.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus debug kde nonblockdialogs"
+
+RDEPEND="dev-libs/openssl:0
+	>=dev-qt/qtcore-4.7:4
+	>=dev-qt/qtgui-4.7:4
+	>=dev-qt/qtscript-4.7:4
+	>=dev-qt/qtsql-4.7:4
+	>=dev-qt/qtwebkit-4.7:4
+	dbus? ( >=dev-qt/qtdbus-4.7:4 )
+	kde? ( kde-base/kdelibs:4
+		kde-base/kwalletd:4 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS BUILDING CHANGELOG FAQ README.md"
+
+src_prepare() {
+	# remove outdated copies of localizations:
+	rm -rf bin/locale || die
+
+	cp -r "${WORKDIR}/qupzilla-plugins-*/plugins/*" "${S}"/src/plugins/
+	cp -r "${WORKDIR}/qupzilla-plugins-*/themes/*" "${S}"/bin/themes/
+
+	epatch_user
+}
+
+src_configure() {
+	# see BUILDING document for explanation of options
+	export QUPZILLA_PREFIX="${EPREFIX}/usr/"
+	export USE_LIBPATH="${QUPZILLA_PREFIX}$(get_libdir)/"
+	export DISABLE_DBUS=$(use dbus && echo false || echo true)
+	export KDE_INTEGRATION=$(use kde && echo false || echo true)
+	export NONBLOCK_JS_DIALOGS=$(use nonblockdialogs && echo true || echo false)
+	has_version '>=dev-qt/qtwebkit-4.8.0:4' && export USE_QTWEBKIT_2_2=true
+
+	eqmake4
+}
+
+src_install() {
+	qt4-r2_src_install
+	l10n_for_each_disabled_locale_do rm_loc
+	pax-mark m "${ED}"/usr/bin/qupzilla
+}
+
+rm_loc() {
+	rm "${D}"/usr/share/${PN}/locale/${1}.qm || die
+}