[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     06431e9a52b3bdc5c2a6e7b500150282cfb3885b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 20:01:00 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 20:01:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=06431e9a

www-client/qupzilla: sync

Package-Manager: portage-2.2.28

 www-client/qupzilla/metadata.xml         | 23 ++++++----
 www-client/qupzilla/qupzilla-9999.ebuild | 79 ++++++++++++++++++--------------
 2 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/www-client/qupzilla/metadata.xml b/www-client/qupzilla/metadata.xml
index e7eae86..5f0517c 100644
--- a/www-client/qupzilla/metadata.xml
+++ b/www-client/qupzilla/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<use>
-		<flag name="nonblockdialogs">Enable fancy non-blocking JavaScript dialogs
-			shown inside the page, not blocking the application window. When closing
-			browser windows with open dialogs, this can crash the application.
-		</flag>
-	</use>
+  <maintainer type="project">
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
+  <use>
+    <flag name="nonblockdialogs">Enable fancy non-blocking JavaScript dialogs
+      shown inside the page, not blocking the application window. When closing
+      browser windows with open dialogs, this can crash the application.
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">QupZilla/qupzilla</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/www-client/qupzilla/qupzilla-9999.ebuild b/www-client/qupzilla/qupzilla-9999.ebuild
index 388d308..f02ae4b 100644
--- a/www-client/qupzilla/qupzilla-9999.ebuild
+++ b/www-client/qupzilla/qupzilla-9999.ebuild
@@ -3,62 +3,71 @@
 # $Id$
 
 EAPI=6
-MY_PN="QupZilla"
-MY_P=${MY_PN}-${PV}
 
-if [[ ${PV} == *9999* ]]; then
-	VCS_ECLASS=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://github.com/${MY_PN}/${PN}.git"
-else
-	VCS_ECLASS=vcs-snapshot
-	SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK 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 lt 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"
+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='7b037cc326921cefbfc6b5e54e2091eb4191e73f'
 PLUGINS_VERSION='2015.10.02' # if there are no updates, we can use the older archive
 
-inherit eutils l10n multilib qmake-utils ${VCS_ECLASS}
+inherit l10n qmake-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/QupZilla/${PN}.git"
+else
+	MY_P=QupZilla-${PV}
+	SRC_URI="https://github.com/QupZilla/${PN}/releases/download/v${PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
 
-DESCRIPTION="A cross-platform web browser using Qt WebEngine"
+DESCRIPTION="A cross-platform web browser using QtWebEngine"
 HOMEPAGE="http://www.qupzilla.com/"
-SRC_URI+="https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
+SRC_URI+=" https://github.com/QupZilla/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="dbus debug gnome-keyring nonblockdialogs"
+IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs"
 
-RDEPEND="dev-libs/openssl:0
+RDEPEND="
 	>=dev-qt/qtconcurrent-5.6:5
 	>=dev-qt/qtcore-5.6:5
+	>=dev-qt/qtdeclarative-5.6:5[widgets]
 	>=dev-qt/qtgui-5.6:5
-	>=dev-qt/qtnetwork-5.6:5
+	>=dev-qt/qtnetwork-5.6:5[ssl]
 	>=dev-qt/qtprintsupport-5.6:5
 	>=dev-qt/qtsql-5.6:5[sqlite]
+	>=dev-qt/qtwebchannel-5.6:5
 	>=dev-qt/qtwebengine-5.6:5[widgets]
 	>=dev-qt/qtwidgets-5.6:5
-	x11-libs/libX11
+	>=dev-qt/qtx11extras-5.6:5
+	x11-libs/libxcb:=
 	dbus? ( >=dev-qt/qtdbus-5.6:5 )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	kde? ( kde-frameworks/kwallet:5 )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0 )
+"
 DEPEND="${RDEPEND}
 	>=dev-qt/linguist-tools-5.6:5
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS BUILDING CHANGELOG FAQ README.md )
 
 src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
+	if [[ ${PV} == *9999 ]]; then
 		git-r3_src_unpack
-		unpack ${A}
-	else
-		default
 	fi
+	default
 }
 
 src_prepare() {
+	# get extra plugins into qupzilla build tree
+	mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_HASH}/plugins/* "${S}"/src/plugins/ || die
+
 	rm_loc() {
 		# remove localizations the user has not specified
 		sed -i -e "/${1}.ts/d" translations/translations.pri || die
@@ -71,10 +80,7 @@ src_prepare() {
 	# remove empty locale
 	rm translations/empty.ts || die
 
-	# get extra plugins into qupzilla build tree
-	mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_HASH}/plugins/* "${S}"/src/plugins/ || die
-
-	l10n_find_plocales_changes "translations" "" ".ts"
+	l10n_find_plocales_changes translations '' .ts
 	l10n_for_each_disabled_locale_do rm_loc
 
 	default
@@ -83,12 +89,15 @@ src_prepare() {
 src_configure() {
 	# see BUILDING document for explanation of options
 	export \
-		QUPZILLA_PREFIX="${EPREFIX}/usr/" \
+		QUPZILLA_PREFIX="${EPREFIX}/usr" \
 		USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		DISABLE_DBUS=$(usex dbus '' 'true') \
-		NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '')
+		DEBUG_BUILD=$(usex debug true '') \
+		DISABLE_DBUS=$(usex dbus '' true) \
+		GNOME_INTEGRATION=$(usex gnome-keyring true '') \
+		KDE_INTEGRATION=$(usex kde true '') \
+		NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs true '')
 
-	eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
+	eqmake5
 }
 
 src_install() {