From: Ben de Groot <yngwin@gentoo.org>
Date: Thu, 25 Dec 2014 06:10:06 +0000 (+0000)
Subject: Version bump, bug #533154
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f3433644d5b3a62f935087bb912ab6b5ec7cf0fa;p=gentoo.git

Version bump, bug #533154

Package-Manager: portage-2.2.15/cvs/Linux x86_64
---

diff --git a/www-client/qupzilla/ChangeLog b/www-client/qupzilla/ChangeLog
index 53f7ae6dc0c1..5fa5bf83d4f4 100644
--- a/www-client/qupzilla/ChangeLog
+++ b/www-client/qupzilla/ChangeLog
@@ -1,6 +1,11 @@
 # 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.47 2014/11/08 08:54:04 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.48 2014/12/25 06:10:00 yngwin Exp $
+
+*qupzilla-1.8.5 (25 Dec 2014)
+
+  25 Dec 2014; Ben de Groot <yngwin@gentoo.org> +qupzilla-1.8.5.ebuild:
+  Version bump, bug #533154
 
 *qupzilla-1.8.4 (08 Nov 2014)
 
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index 841ca65f7e3d..572bc7043939 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX qupzilla-1.6.5-plugins-version-check-fix.patch 1277 SHA256 c9706895a5ae5114c8218764e208490b4b00d1ebbfe759a617c6e5b420292bbb SHA512 67d2a74287aaa6c24234ecac508e09a7cbcdbef5911f814c8c7655d45b2d495fe51ca595e6e75bb1ad093b80faeef880c94de6e190c24286a32d24febde6abb9 WHIRLPOOL 01168e455a80e35fe050ffc2bd653d62903312017b052ffbfcce5d81ea8b6aefac18d782960f36c1a3236cdb406776cd7ef6e4e91413f88b80ac7167e77c4971
 AUX qupzilla-1.6.6-plugins-version-check-fix.patch 1277 SHA256 8387f6a1d513e67087c1bb69b2cc53054138c32297d7d1c849e3c17ecf244dce SHA512 44542b49c0c9ca7f557d882bedd41cafc7cdd396a41481a9dcd978ee88b000d3474876a333b58eeff1f1b47d2f919112e0d11b3d2df267f4b6c36d4fa9c1efdd WHIRLPOOL 6832f27c1d3117d9b65abb356a61913b0950e4a98f64adee9f77aed3ea2cf3a99ee8869e539f9b684699b8a277c5fa0478ffa69792c9191fcba865250cc3edb1
 DIST QupZilla-1.4.4.tar.gz 3949537 SHA256 dc72d7b5d75e1348bf9c3c43267946a88a1fcc70045a0d50f6972cd679e5366b SHA512 79e855e63ae705f7dd692d899bf48c81f484753f8ec233d3a7a442bd5ede0e9aa1d8a8a35ee5db8b6cf7aa3c1feb4996265314fe948a5c995dc17ec70190445c WHIRLPOOL 958f9b81fd013d91233f5833daa8e1f8bbe98b595eae3a6ae0e2100b7b6777337c582b039b8c635849374dc80b4eef296071d959e0898762aa740d637909966d
+DIST QupZilla-1.8.5.tar.xz 3096640 SHA256 8ea7d3f9f9283e85b9ce0f7c86b4162a93c0cd68dfb3a7e70560dd7b8ded7d9c SHA512 1c8f1821caf1eccd88c7a3413b3c53e5730a09853855d5663cc63731ecca944174b7c929fdae3da291b991030942d9a73f78005cb960fbf1f8a70250b0145ea1 WHIRLPOOL 0686833ac04a284c8224d019d286644ed188b7899110ae8cdf55d13d965908cd1015d9e698e1764899910abca9be65050136ff128cd056f763e5ed5fe7f1bf4d
 DIST qupzilla-1.6.5.tar.gz 5011748 SHA256 48d9cc82ded8db5c089d60c0bf4a930ecad4fe9a5519b6d0fd8a81fcd90563a9 SHA512 e8d20b1ae616e8558c634af38dfcf6d8f704ae5e4a2c2e42dc995068bf4c5cd350830e795fb68c555738c9205d625430a2555a2c4d5c1b0c6917ca92a28568be WHIRLPOOL 32840c5320be2d73f7e47d74e608ed50a454a65181bbb8de1a3af4153a06e30b8abd537d29c3a3a43ab4033846050816d69d42eaec468d87fad8293084f88c02
 DIST qupzilla-1.6.6.tar.gz 5027059 SHA256 5cc14d8443917a4474bb42e2d57e5c04d57f3d62bbeb00e69c3d935c4047ef8a SHA512 e418d89412c1331bd35c897bf6d8f3c7c6f01dcd74e0232098b820ab334dc3c43a092b5dbad642ce930aafbe72e63445f437d763c8716e3a8a686751143f00b0 WHIRLPOOL aa028cec4049770801d6fc3b71f319690616fda7882238d9b8dfd9705bd1b380d8d78e6be8bd0f3db168329b9ac2c49d1a306b24049289312ff181816cda73d1
 DIST qupzilla-1.8.0.tar.gz 4526759 SHA256 414e97d752eaac64f48992957123612461f5fed109f056f5451465a1a1610929 SHA512 321014033acf6cc2e6c986b58cef65a1ef4f13783b2320280b6b7f9a6f03548997521dc538a5a5e13521d806375f370e8f015be526e46f64bb67a9094340985c WHIRLPOOL a683fc8c06f9cee2ef2d34d301cd4c63e8b32cb4a5ceca0884c3f5554bf59b813937c0c27d229653acde8adaa272cfc3a2663bcabab15b645d3cf6ad59dd93cc
@@ -11,30 +9,13 @@ DIST qupzilla-1.8.3.tar.gz 4533696 SHA256 05e2eec0892d119c01f285012ea5401b5d3e74
 DIST qupzilla-1.8.4.tar.gz 4534193 SHA256 25ed8d0cad0bec7eef3da70e6197b95ae8dee304a2396ed73a66bbab576e73ba SHA512 944b46d05a416da13abb01a41b40f6e93658cc77e3ab9f9d4c69b034b109871f745745207fb0e93be515c5b6c14f763fdab718876a0d5f16ec8852dd6aff329e WHIRLPOOL 71f89bceb2229770038f4b5c4b0c404caeae5b0caf489f1f9ce78ee0af0bb1a17cdab54a0234a02d08b10a6056fa3007be12cc14a70534dbd1fb4c9f54c1a100
 DIST qupzilla-plugins-1.6.3.tar.gz 113013 SHA256 a68b303058f5e404b6e47947f4a68e5db8fe048c81d390e9158b2bd6a62eca68 SHA512 b847efef0a1a55ec495ee684370c76857b297a5aff07d3af9cb5089cd62a4a13cea29b5fb3b8ff92d09d0849e3aa6db3cb546d0d4c3db64c6abee3f83aa5e78e WHIRLPOOL ac7a1bc13649d292555b4d030a0a3a6007a5f9d62cbca83c2f37b91c94378e9ea66ab7eec59f347e914b4b37853b49020874f6a0562bbfeb46e2a6e246d6ca93
 DIST qupzilla-plugins-2014.10.02.tar.gz 202285 SHA256 e02044bd7202b937b37275a34774f33c476f8e66f6ec409165787cd526c25315 SHA512 f22ee86d9fc91257eb8a1296afb558628209b680ed6f728c9e6584785d390f22cc5c5651c9d4c8f16a786fa69d40a80647f2e60569fe44967f4447d720c506d9 WHIRLPOOL 569db0fbc74b18b8712f98c90bf5a244ca889dbb1e9ba1e68279b4336d04a6fe3b046ddbcbbfcda0d49c58dde316c237cffa3e5625e46c1c484d8defc1eb5d9d
+DIST qupzilla-plugins-2014.12.17.tar.gz 254732 SHA256 f613cdf5e6b669bf996f48e5812f2c24d8e3e7939b37f5e6382fb4a231e93da5 SHA512 652e45da59760d6cd8794ccc13f0446f8a9f07ebba1674205417a30bd65dfc14f84da6c67726d744a17a65c6de70b4e65ead7a6e0eee5515fe9f4b553f8cfd60 WHIRLPOOL ef213f96524afe8283be6dba559edd6787782621919c3100e4a40c67df560dc1c457b4d9e4b4082223b1692361383c30261057b3a30582c3f3903f4b2da6f0c5
 EBUILD qupzilla-1.4.4.ebuild 1661 SHA256 d7d6681726e8178e9445de8e2eaf28d9ed012e47f9fdb791103b1050ec1e25ad SHA512 ca1f8fc62c2c371db29f2c738624b47de1615d5cc312b0ef85f2e351b3b0257aff56e300383e729be7e423fecc5610c4bfa0cf9107519fba9bad6406b135e179 WHIRLPOOL e9641606e16e89af1f61587a8dfdc7c95b6b596141a1e459e2a0bd11be4e96b4e29f34889763af5a2c33007244500574aeb2182ade39f611cc8772e05b6c4d81
 EBUILD qupzilla-1.6.5.ebuild 2530 SHA256 779d1876cd6e56a0ea654fec6107f1525d65dcf587a9cd5c19c606c7893e88cf SHA512 35794aea7c2c0c6cd077c9b8f17539fd4e17ac2bd00f350a24949371202ba934f8340c656d47577552f49b09112e5eec912f4edb145448d3134d8c2b54f9349d WHIRLPOOL f503ae3cc280a6a1c1c5a6fd76ee0c9a0065e98d31cc8e1b58f346ba6ee1d858b4429b42e0b39d01744b4585502d4b6a016f1d76419d30d54406f8729498631a
 EBUILD qupzilla-1.6.6.ebuild 2552 SHA256 f98bcd2e76231b28da16d2047a3411ccb6f2b8e7174935ddf96cbf3146cf15e5 SHA512 c5dd31dec3ea62fc58a6631a0489c37d246e5665b5f5dce726de5afb7f3d0c06026619701e6c32fc75bd1c27ccb7d006a13bd5126da66c13e8f022679d993b0f WHIRLPOOL d161c5a5bcf0e056cb9c0385bf9a6ea3c065dd92f9d3b259be5d6938e0cce1fa1bc2c1222ad368e21c6f0028fe8a54bfae5c571081cd0ca413f423e77fd09dca
 EBUILD qupzilla-1.8.0.ebuild 2973 SHA256 933fc2da4096ffbc04db7c72e7401e49810258464185da01df9e8f5fd142ab52 SHA512 797168002e394a7364981158cbbbc604970dd1590e6321a5fa1a35fc23a3de1e509def26139b95102a255fbfc6daf41f5c849436e3f0762dbc2db346ed4bd1f7 WHIRLPOOL e19cf38b330323e3c3b37b0ed6cd7c46b7c1060cc592c7c6d334d9439f18b029ae7d8df8e7d2edb0711fcf3fbf84b804f4eef4588c114364e4a830d8d75a10a7
 EBUILD qupzilla-1.8.3.ebuild 2973 SHA256 49dc2cc54f44c3e0e120eefe5449d283f6e2e91598340923d40f5edab30fedcc SHA512 41a58d2a013b33d3a55cbd4274700f2ceab835c0325f494c5004e282923a6a34ea6eda1ec2ffe9087fd56e60db0c8d5942c15cbcfb265a52f11383aa04d3ec17 WHIRLPOOL 60893dd22dd7ae24b64b6da16b96f18a5127bad38748ceadb86bc44845ba6a606aeeeaa5b5e4814e1bd062e38c7ec8ae15494a85392d5933f71eb0796951c209
 EBUILD qupzilla-1.8.4.ebuild 2973 SHA256 f105d2b906c52689fb5cd6ebb5216750cace91ebba44c627446c3a100dc6aa9e SHA512 dfbfb8d34ca540dd68a57cb102ed8bd95c9ebca2ebc4b46ba50ea2a0a140904059df15970a6a16121145f7bbfbcb193116c3dba0651753dc3e789effd894657a WHIRLPOOL b36d6120d9d1b264af1f924c5478b31db44880c2e3db20d88ebb52aed0c26d01de6a88779daba8358048106f5823af414784a9a127e47345823b33dee67568e0
-MISC ChangeLog 7321 SHA256 d52fc609a1d245b43ab65f18d83813370815cbfa577a83185bb90986a38192c6 SHA512 e763898cdceb9772eb1439c61a98d37151bb55c0c5bdd8a56536c8bbe6b410b5bd244bdd78517869e6322766679bcf618bfef768818c94d27213536d96d7f6bb WHIRLPOOL 0066fca48e801125c930614f6e935cf5954a7c229bfb5d255ef94e60f3b2690c645a3b41f4c1426c84b5c532b1292004017a5cbeeb6a16456f839070921f4126
+EBUILD qupzilla-1.8.5.ebuild 3026 SHA256 02f64525e892aa5fd14c7489cba4612b98798e9032619f7ab9d2b528561fc953 SHA512 7a88c53d8282ea6ef18c0386fc7ab00ed24ca3c14632df9dd78d0018304eb9de83463de74e7869f017a9d8650ad572c2d9abb64cd08445f8cdbcf3370edff56a WHIRLPOOL 3968d967d0873af09a1841d411b84d85163d5515d133b063df03b21c9765f8c95e224ad614f41a5a7d44e7603a537daccd1bb6bbda42c3c4d4268db8c1261689
+MISC ChangeLog 7453 SHA256 3f9673fe8ea6944ece9284c34673aaeac6541fc2cb8762e26ca4b96f871ab29c SHA512 8f24c8eafa73843eb72612e4375c264324ccd72780e72973fa3c38fd45f30e5d5c05166fd1adb58636362325b156be3f15b7a7843a836ce2364784532740b7d1 WHIRLPOOL 3aa2346352815e63e391a84a93511e59ae71fa480a3a284b06716fd6e240601e4907ae7feebd95e20e9a14ad57137d3622c325391b9a93f3359232b3c521c659
 MISC metadata.xml 416 SHA256 1b51452eaf560d3cd580b3530bb739a415a34188f5ba555d2af9d36da646fe0b SHA512 4918aafacd22beb0817572692c198c99fb588c226abc469fc9a01c02ddcd685584bc756bc595a936f3e48c535f2203e2384f8dd6d96bffe5ad152f84c7812e56 WHIRLPOOL 17d97783743b7140be444e359e62da877ba30134b8abb83912c8f5633c9a5e94981d9db2a062f03467b4fb89b7ca6ef2d755e359a56d9c31dc26eae2eb7ccd1c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCABmBQJUXdoyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw
-RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2nUoQAKEd4xbM5dk9bto52MDTJg8J
-cSspuAy56mwgSwFSzWcGyLzkrOjCHtcl+Ol/y4GDDfQ28Cf0jPRaUqWcNoK+SQ6d
-COFxZq1RSzm27VHDU8v/Ev9tm69wk/3bSNTBlBkHFvYj48gejQ2L/UR8tOSRpmD8
-BhxzSq9maY6iXiV1YFczHQYyZevKCPJoy8cJTuPn6XJMYlO1NJ9QzsNEsTr0u9TM
-u7HELUW+Tka25AYT/BpAxpxN68OYsZqNaqRGHeiyq6ehsSk68UxB4NDU/nb32HsR
-otI4zwCQUez0aML3dbOxBidHrEPZM3ARwVo5D/T2MtcWkYg/TlxbF7bxwZ+AGQ1t
-jQndmXVpkzUSCFnlZ4jGVWZzoveHWIjNrIKT/aH8YQ1u9HuYf8uBcMZl77b+jZDF
-Q2A62ghuNPF6YKRgCztRGQNhGWXjknUA77B+SmVrmq4h+1SLUay0XCcDFbDApadh
-lXZHuHFhgOEFqBYdbAsSVMyJtZaoQQzyjm4LMjq5WsU+2wgoD5tdzr3D33HAMlFb
-bi0KXchnJgWsQodMudm2Pq/XWhsV1thPvx2fBOM5BbOB5/tFA0SYWrGZ4ZvsXJa4
-JIOKEglQ/2ojvhZgl+GcKTEtXhb+Az3FFH0h+dtWQ7nAwHTrtGZBgVF1vdgXPjmN
-pr2QtsUkJ4g4Lg4783nO
-=XwqN
------END PGP SIGNATURE-----
diff --git a/www-client/qupzilla/qupzilla-1.8.5.ebuild b/www-client/qupzilla/qupzilla-1.8.5.ebuild
new file mode 100644
index 000000000000..abb715564a97
--- /dev/null
+++ b/www-client/qupzilla/qupzilla-1.8.5.ebuild
@@ -0,0 +1,96 @@
+# 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.8.5.ebuild,v 1.1 2014/12/25 06:10:00 yngwin Exp $
+
+EAPI=5
+MY_PN="QupZilla"
+MY_P=${MY_PN}-${PV}
+PLOCALES="ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW"
+PLUGINS_HASH='83cc6f26e10291bf2dafd40212649c06d1d7635c'
+PLUGINS_VERSION='2014.12.17' # if there are no updates, we can use the older archive
+
+inherit eutils l10n multilib qmake-utils vcs-snapshot
+
+DESCRIPTION="Qt WebKit web browser"
+HOMEPAGE="http://www.qupzilla.com/"
+SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz
+	https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="dbus debug gnome-keyring kde nonblockdialogs +qt4 qt5"
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="dev-libs/openssl:0
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	kde? ( kde-base/kwalletd:4 )
+	qt4? ( >=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 ) )
+	qt5? ( dev-qt/linguist-tools:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtscript:5
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwebkit:5
+		dbus? ( dev-qt/qtdbus:5 ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS CHANGELOG FAQ README.md )
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm_loc() {
+		# remove localizations the user has not specified
+		sed -i -e "/${1}.ts/d" translations/translations.pri || die
+		rm translations/${1}.ts || die
+	}
+
+	# remove outdated prebuilt localizations
+	rm -rf bin/locale || die
+
+	# remove empty locale
+	rm translations/empty.ts || die
+
+	# get extra plugins into qupzilla build tree
+	mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_VERSION}/plugins/* "${S}"/src/plugins/ || die
+
+	l10n_find_plocales_changes "translations" "" ".ts"
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+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' '')
+
+	if use qt4 ; then
+		eqmake4 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
+	else
+		eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	if has_version www-plugins/adobe-flash; then
+		ewarn "For using adobe flash plugin you may need to run"
+		ewarn "    \"paxctl-ng -m /usr/bin/qupzilla\""
+	fi
+}