3 files changed, 120 insertions, 10 deletions
diff --git a/www-client/qupzilla/ChangeLog b/www-client/qupzilla/ChangeLog
index c37cfb3c43b8..c9d8e0af3056 100644
--- a/www-client/qupzilla/ChangeLog
+++ b/www-client/qupzilla/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2014/05/28 09:45:47 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.45 2014/10/02 03:09:27 yngwin Exp $
+
+*qupzilla-1.8.0 (02 Oct 2014)
+
+  02 Oct 2014; Ben de Groot <yngwin@gentoo.org> +qupzilla-1.8.0.ebuild:
+  Version bump. Add qt5 support. Thanks to Alpha Bravo for ebuild improvements
+  in bug #522952.
 
 *qupzilla-1.6.6 (28 May 2014)
 
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index 2457205a300a..bf9c55dbd818 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -6,20 +6,31 @@ AUX qupzilla-1.6.6-plugins-version-check-fix.patch 1277 SHA256 8387f6a1d513e6708
 DIST QupZilla-1.4.4.tar.gz 3949537 SHA256 dc72d7b5d75e1348bf9c3c43267946a88a1fcc70045a0d50f6972cd679e5366b SHA512 79e855e63ae705f7dd692d899bf48c81f484753f8ec233d3a7a442bd5ede0e9aa1d8a8a35ee5db8b6cf7aa3c1feb4996265314fe948a5c995dc17ec70190445c WHIRLPOOL 958f9b81fd013d91233f5833daa8e1f8bbe98b595eae3a6ae0e2100b7b6777337c582b039b8c635849374dc80b4eef296071d959e0898762aa740d637909966d
 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
 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
 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
-MISC ChangeLog 6871 SHA256 abb9516ffe1b8c50661eb69a6f95b3b19031be6dd090047de2d0cb67a7cd4d34 SHA512 c53e0ce29494d895ffd3fd442fa18f2e699a112b2891f9a2b44a44ed4845599254398823aa47048a5aba87932960175b81e66e336a4dbee30a08a951dc8802a6 WHIRLPOOL 5602bb1525aded93edb6b971e391749c6bcdca580d34ab8ff8b6380c75616fdb60f1ac2a397802b2bc1c2dd8ed8864c17bc2c0671cd77595f34a32d754ccf48c
+EBUILD qupzilla-1.8.0.ebuild 2973 SHA256 933fc2da4096ffbc04db7c72e7401e49810258464185da01df9e8f5fd142ab52 SHA512 797168002e394a7364981158cbbbc604970dd1590e6321a5fa1a35fc23a3de1e509def26139b95102a255fbfc6daf41f5c849436e3f0762dbc2db346ed4bd1f7 WHIRLPOOL e19cf38b330323e3c3b37b0ed6cd7c46b7c1060cc592c7c6d334d9439f18b029ae7d8df8e7d2edb0711fcf3fbf84b804f4eef4588c114364e4a830d8d75a10a7
+MISC ChangeLog 7070 SHA256 b4e6d5cc6cf0fc8664840577ebaba2df6f932e3d54e437ed0f7bbebc2b2e0f02 SHA512 65b649415c38716920563ca48cc201ccd99b2929e86b1351d04d7f2827342f35ff2c077184ef3b6931041a32be939d12ddb7f6f1324fa64be708c836d2d5a907 WHIRLPOOL d2149c1b08b0c55c5e7f2725edadc3245b34aa909b751e3c3d5971b0fbf32c0f479ffda27b17534f242b6cce8328258bbb428e345d3225133939d3a7520217eb
 MISC metadata.xml 416 SHA256 1b51452eaf560d3cd580b3530bb739a415a34188f5ba555d2af9d36da646fe0b SHA512 4918aafacd22beb0817572692c198c99fb588c226abc469fc9a01c02ddcd685584bc756bc595a936f3e48c535f2203e2384f8dd6d96bffe5ad152f84c7812e56 WHIRLPOOL 17d97783743b7140be444e359e62da877ba30134b8abb83912c8f5633c9a5e94981d9db2a062f03467b4fb89b7ca6ef2d755e359a56d9c31dc26eae2eb7ccd1c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJThbBzAAoJECo/aRed9267at4H/RWnr8E30bxnQQe1oI9K1fkM
-L/7rYRnXsImH8z5lTKz3G8iOwa2m8TVbyKcQd+Ft7jEhlcn9uClI4WWIpqMT6JTd
-INe8mpSkWCKA6Tpg1aSS0fIIEKl+QM/MeVpDfvmsxctfLfK3fV945sxdW1BMj0ZQ
-MnVPBsX7W2Mm+oVcdF/cD4gOe18cqZe5ENzzWKJeRUj5zPBMvSgG1J9ALJY9xpXg
-xEjoHuQzc9Ga4Ut97CdBjqcPZs1uPbJcfXHWZYm5clm3eNwM8UKaediSSCLUaAll
-8s2gY1cEvrJF4B3rZ4dkFexk1dYs6/dNBT/wJ57BftwzW+JVZ/aBKn0Z6r2r1QE=
-=riwu
+iQJ8BAEBCABmBQJULMHtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw
+RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2VAMQAJabytYAySUkWKaME73NB37x
++xm8nj1a9QSsOTL1/x7PLNHTwNN55mIHvwCaxEf3vPucT7K/4o102eanQq+oPM1y
+GDT2746Pp6ZRRzYK86NxK1BEI+pC2uTnLoMVjigFqBU/ZM25A4l0JiOwZLFHffiQ
+Pt/twCLD/rhUVmO/dsHN4VfAqcILuA79Dyns4nhxQyMpm3I3PQLUjxHl8BM+0e5X
+y3HPwnUdDj6hCOVuc1kTKXxnz+wXq8JZwCUjUkq1jlVH8seCgIrlfRQwIpHXs++Y
+3vLdNPcK8DWrtIZ4pgEYdwN4h3ng1L5Ed6tQ88D3WwW47K9i0+WnNlOwbODFpsjI
+WtJYY/kRLDucKiF54QDi4Fc/QStwBdCCTtuglUDNuSKwNicwcm0Po7HtRqLHpM7q
+8tR+tMByPKkdo/PwJFMnCiu4kpAM/voMnSB4o/NV3REQPVNjnIoyEz7cmtL2eUG5
+qDKsGmdEz+jZ2oh5SNH2kwl0YypYIhcBnatWyeVbFXBsSUgOwH3tAZ88KMSvjA4F
+h0MThv5OfM1XyODCuQ91zB9IR+N7VAKmHzZZ3GweSinOZRBI4Nt18RXvMBDUkEMV
+SIYudHodocxJpdplWRP9P91ouv4C3Pvb8I8vjx7Jfdh39dP7twWfHte6OR0XflPJ
+aXkzat5f1QmG1EoM+i8O
+=WhuY
 -----END PGP SIGNATURE-----
diff --git a/www-client/qupzilla/qupzilla-1.8.0.ebuild b/www-client/qupzilla/qupzilla-1.8.0.ebuild
new file mode 100644
index 000000000000..04891f819f7c
--- /dev/null
+++ b/www-client/qupzilla/qupzilla-1.8.0.ebuild
@@ -0,0 +1,93 @@
+# 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.0.ebuild,v 1.1 2014/10/02 03:09:27 yngwin Exp $
+
+EAPI=5
+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='bb52c82eeedae50ac33a8d10943998193491230b'
+PLUGINS_VERSION='2014.10.02' # 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/QupZilla/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/QupZilla/${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 )
+
+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 most likely need to run"
+		ewarn "    \"paxctl-ng -m /usr/bin/qupzilla\""
+	fi
+}