[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: ee3936647adbf6832dd4c9a485ca46b0e212c354
Author: Andreas Sturmlechner gmail com>
AuthorDate: Tue Jun 12 16:01:16 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jun 12 16:03:56 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ee393664
www-client/qupzilla: Remove package, no more development
Now known as Falkon, a KDE project.
www-client/qupzilla/Manifest | 1 -
www-client/qupzilla/metadata.xml | 18 --
www-client/qupzilla/qupzilla-.ebuild | 107 ---
3 files changed, 126 deletions(-)
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
deleted file mode 100644
index baa03ab5..
--- a/www-client/qupzilla/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qupzilla-plugins-2016.05.02.tar.gz 425314 SHA256
276491a89daf1b64d6eab861b54d313e85c815d322bf51d47491f00ad22f55bc SHA512
b294ecb2372b3267603a43bc7412ab75d2cd29a8c4667331f0d2c74e3b0b99d0c2a005b9e4854c6d777894522bba9fb3b1607e85e8da6dcbaa760c9ddc6288f2
WHIRLPOOL
471807dc70dd3ea072f1e429a6e67ea97ecd5eadc02ac19debdcddfca4f5cb8e1767ad754aed1ff8a557f0734460a87b4e2d5e01ea57d07c473f48b006e32ef1
diff --git a/www-client/qupzilla/metadata.xml b/www-client/qupzilla/metadata.xml
deleted file mode 100644
index b2c82f81..
--- a/www-client/qupzilla/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-
- q...@gentoo.org
- Gentoo Qt Project
-
-
- Enable encrypted storage of passwords with
kde-frameworks/kwallet
- 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.
-
-
-
- QupZilla/qupzilla
-
-
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
deleted file mode 100644
index 0fc69015..
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 is 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_HK zh_TW"
-
-PLUGINS_HASH='c332d306c0f6cf645c75eaf198d2fc5e12339e9e'
-PLUGINS_VERSION='2016.05.02' # if there are no updates, we can use the older
archive
-
-inherit l10n qmake-utils
-
-if [[ ${PV} == * ]]; 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 QtWebEngine"
-HOMEPAGE="https://www.qupzilla.com/;
-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 kwallet libressl nonblockdialogs"
-
-RDEPEND="
- >=dev-qt/qtcore-5.8:5
- >=dev-qt/qtdeclarative-5.8:5[widgets]
- >=dev-qt/qtgui-5.8:5
- >=dev-qt/qtnetwork-5.8:5[ssl]
- >=dev-qt/qtprintsupport-5.8:5
- >=dev-qt/qtsql-5.8:5[sqlite]
- >=dev-qt/qtwebchannel-5.8:5
- >=dev-qt/qtwebengine-5.8:5[widgets]
- >=dev-qt/qtwidgets-5.8:5
- >=dev-qt/qtx11extras-5.8:5
- x11-libs/libxcb:=
- dbus? ( >=dev-qt/qtdbus-5.8:5 )
- gnome-keyring? ( gnome-base/gnome-keyring )
- kwallet? ( kde-frameworks/kwallet:5 )
- libressl? ( dev-libs/libressl:= )
- !libressl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}
- >=dev-qt/linguist-tools-5.8:5
- >=dev-qt/qtconcurrent-5.8:5
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS BUILDING.md CHANGELOG FAQ README.md )
-
-src_unpack() {
- if [[ ${PV} == * ]]; then
- git-r3_src_unpack
- 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
- rm translations/${1}.ts || die
- }
-
- # remove outdated prebuilt localizations
- rm -rf bin/locale || die
-
- # remove empty locale
- rm translations/empty.ts || die
-
- l10n_find_plocales_changes translations '' .ts
-
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 79f540fd9be7bb24c35f2e1481be2d86fb96a47e
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sat Aug 26 14:50:03 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 26 14:50:03 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=79f540fd
www-client/qupzilla: Sync w/ tree - USE=kwallet, https, deps
Package-Manager: Portage-2.3.8, Repoman-2.3.3
www-client/qupzilla/metadata.xml | 27 ++-
www-client/qupzilla/qupzilla-.ebuild | 12 ++--
2 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/www-client/qupzilla/metadata.xml b/www-client/qupzilla/metadata.xml
index 5f0517cc..b2c82f81 100644
--- a/www-client/qupzilla/metadata.xml
+++ b/www-client/qupzilla/metadata.xml
@@ -1,17 +1,18 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
-q...@gentoo.org
-Gentoo Qt Project
-
-
-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.
-
-
-
-QupZilla/qupzilla
-
+
+ q...@gentoo.org
+ Gentoo Qt Project
+
+
+ Enable encrypted storage of passwords with
kde-frameworks/kwallet
+ 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.
+
+
+
+ QupZilla/qupzilla
+
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index ef2a574d..0fc69015 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -25,15 +25,14 @@ else
fi
DESCRIPTION="A cross-platform web browser using QtWebEngine"
-HOMEPAGE="http://www.qupzilla.com/;
+HOMEPAGE="https://www.qupzilla.com/;
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 kde libressl nonblockdialogs"
+IUSE="dbus debug gnome-keyring kwallet libressl nonblockdialogs"
RDEPEND="
- >=dev-qt/qtconcurrent-5.8:5
>=dev-qt/qtcore-5.8:5
>=dev-qt/qtdeclarative-5.8:5[widgets]
>=dev-qt/qtgui-5.8:5
@@ -47,12 +46,13 @@ RDEPEND="
x11-libs/libxcb:=
dbus? ( >=dev-qt/qtdbus-5.8:5 )
gnome-keyring? ( gnome-base/gnome-keyring )
- kde? ( kde-frameworks/kwallet:5 )
+ kwallet? ( kde-frameworks/kwallet:5 )
libressl? ( dev-libs/libressl:= )
- !libressl? ( dev-libs/openssl:0 )
+ !libressl? ( dev-libs/openssl:0= )
"
DEPEND="${RDEPEND}
>=dev-qt/linguist-tools-5.8:5
+ >=dev-qt/qtconcurrent-5.8:5
virtual/pkgconfig
"
@@ -95,7 +95,7 @@ src_configure() {
DEBUG_BUILD=$(usex debug true '') \
DISABLE_DBUS=$(usex dbus '' true) \
GNOME_INTEGRATION=$(usex gnome-keyring true '') \
- KDE_INTEGRATION=$(usex kde true '') \
+ KDE_INTEGRATION=$(usex kwallet true '') \
NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs true '')
eqmake5
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 4b10dabef17239fe9c818d57e3fe4e02c4ce35b4 Author: Jimi Huotari gentoo org> AuthorDate: Fri Feb 24 16:20:37 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Feb 25 10:44:04 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4b10dabe www-client/qupzilla: Update PLOCALES. Package-Manager: Portage-2.3.3, Repoman-2.3.1 www-client/qupzilla/qupzilla-.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www-client/qupzilla/qupzilla-.ebuild b/www-client/qupzilla/qupzilla-.ebuild index b0a39085..cac71977 100644 --- a/www-client/qupzilla/qupzilla-.ebuild +++ b/www-client/qupzilla/qupzilla-.ebuild @@ -5,10 +5,10 @@ EAPI=6 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 + fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID is 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" + zh_CN zh_HK zh_TW" PLUGINS_HASH='c332d306c0f6cf645c75eaf198d2fc5e12339e9e' PLUGINS_VERSION='2016.05.02' # if there are no updates, we can use the older archive
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 0756013c2d947d7dcef9c419f3a2b7048b855566
Author: Jimi Huotari gentoo org>
AuthorDate: Fri Feb 24 16:17:32 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Feb 25 10:44:03 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0756013c
www-client/qupzilla: Bump Qt requirement from 5.6 to 5.8.
Qt 5.8 is required since an upstream change made on 2017-02-06:
https://github.com/QupZilla/qupzilla/commit/13cba7a069f208dd1b03b3426911a40f882d7bf2
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-client/qupzilla/qupzilla-.ebuild | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index cceded26..b0a39085 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -34,26 +34,26 @@ SLOT="0"
IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs"
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[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
- >=dev-qt/qtx11extras-5.6:5
+ >=dev-qt/qtconcurrent-5.8:5
+ >=dev-qt/qtcore-5.8:5
+ >=dev-qt/qtdeclarative-5.8:5[widgets]
+ >=dev-qt/qtgui-5.8:5
+ >=dev-qt/qtnetwork-5.8:5[ssl]
+ >=dev-qt/qtprintsupport-5.8:5
+ >=dev-qt/qtsql-5.8:5[sqlite]
+ >=dev-qt/qtwebchannel-5.8:5
+ >=dev-qt/qtwebengine-5.8:5[widgets]
+ >=dev-qt/qtwidgets-5.8:5
+ >=dev-qt/qtx11extras-5.8:5
x11-libs/libxcb:=
- dbus? ( >=dev-qt/qtdbus-5.6:5 )
+ dbus? ( >=dev-qt/qtdbus-5.8:5 )
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
+ >=dev-qt/linguist-tools-5.8:5
virtual/pkgconfig
"
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 60923b86db5a2c6f1fbc43d1ab50a1c48b19f473 Author: Jimi Huotari gentoo org> AuthorDate: Fri May 20 13:47:16 2016 + Commit: Davide Pesavento gentoo org> CommitDate: Thu May 26 17:41:42 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=60923b86 www-client/qupzilla: Update PLOCALES. Package-Manager: portage-2.2.28 www-client/qupzilla/qupzilla-.ebuild | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/www-client/qupzilla/qupzilla-.ebuild b/www-client/qupzilla/qupzilla-.ebuild index 6d2a96f..512d0b9 100644 --- a/www-client/qupzilla/qupzilla-.ebuild +++ b/www-client/qupzilla/qupzilla-.ebuild @@ -4,10 +4,12 @@ EAPI=6 -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" +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" + PLUGINS_HASH='7b037cc326921cefbfc6b5e54e2091eb4191e73f' PLUGINS_VERSION='2015.10.02' # if there are no updates, we can use the older archive
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 4fe329e59a176c5663e41a29f01761b5d497e04a
Author: Jimi Huotari gentoo org>
AuthorDate: Fri May 20 13:41:52 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu May 26 17:41:42 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4fe329e5
www-client/qupzilla: Change 'BUILDING' to 'BUILDING.md'.
Rename the file to go along with an upstream change and fix install phase.
Package-Manager: portage-2.2.28
www-client/qupzilla/qupzilla-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index f02ae4b..6d2a96f 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -55,7 +55,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
-DOCS=( AUTHORS BUILDING CHANGELOG FAQ README.md )
+DOCS=( AUTHORS BUILDING.md CHANGELOG FAQ README.md )
src_unpack() {
if [[ ${PV} == * ]]; then
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: f45a6b6100a4f78a50a1d5572a49ec3f710f57de Author: Jimi Huotari gentoo org> AuthorDate: Fri May 20 13:47:50 2016 + Commit: Davide Pesavento gentoo org> CommitDate: Thu May 26 17:41:42 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f45a6b61 www-client/qupzilla: Update plugins. Package-Manager: portage-2.2.28 www-client/qupzilla/Manifest | 2 +- www-client/qupzilla/qupzilla-.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest index 0841865..baa03ab 100644 --- a/www-client/qupzilla/Manifest +++ b/www-client/qupzilla/Manifest @@ -1 +1 @@ -DIST qupzilla-plugins-2015.10.02.tar.gz 335649 SHA256 9e167a6f1234b0b51c26cbd4acc5bcdc83c760ef5c2ff8573f90aa64c3a40553 SHA512 de2208fec40a1412a1feb4bd995ae25ff04a1f3577449f7c90bc5d2f46b01c8cf33757db5a0fa69ddb5a1a27764a0230664a5b2adc89ebc2b43df5df5e2b4f31 WHIRLPOOL 8fc24f0891fbb7e8378aae900c25bc29604f13febd9b30594e2e25d55a02707d047835e2fef82482c632ef35b93046a7e2990a82d285c159de6cf603525d01d5 +DIST qupzilla-plugins-2016.05.02.tar.gz 425314 SHA256 276491a89daf1b64d6eab861b54d313e85c815d322bf51d47491f00ad22f55bc SHA512 b294ecb2372b3267603a43bc7412ab75d2cd29a8c4667331f0d2c74e3b0b99d0c2a005b9e4854c6d777894522bba9fb3b1607e85e8da6dcbaa760c9ddc6288f2 WHIRLPOOL 471807dc70dd3ea072f1e429a6e67ea97ecd5eadc02ac19debdcddfca4f5cb8e1767ad754aed1ff8a557f0734460a87b4e2d5e01ea57d07c473f48b006e32ef1 diff --git a/www-client/qupzilla/qupzilla-.ebuild b/www-client/qupzilla/qupzilla-.ebuild index 512d0b9..cceded2 100644 --- a/www-client/qupzilla/qupzilla-.ebuild +++ b/www-client/qupzilla/qupzilla-.ebuild @@ -10,8 +10,8 @@ PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_ES es_MX es_VE eu_ES 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 +PLUGINS_HASH='c332d306c0f6cf645c75eaf198d2fc5e12339e9e' +PLUGINS_VERSION='2016.05.02' # if there are no updates, we can use the older archive inherit l10n qmake-utils
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 06431e9a52b3bdc5c2a6e7b500150282cfb3885b
Author: Davide Pesavento gentoo org>
AuthorDate: Thu Apr 28 20:01:00 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Apr 28 20:01:00 2016 +
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-.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 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
- q...@gentoo.org
- Gentoo Qt Project
-
-
- 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.
-
-
+
+q...@gentoo.org
+Gentoo Qt Project
+
+
+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.
+
+
+
+QupZilla/qupzilla
+
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index 388d308..f02ae4b 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -3,62 +3,71 @@
# $Id$
EAPI=6
-MY_PN="QupZilla"
-MY_P=${MY_PN}-${PV}
-if [[ ${PV} == ** ]]; 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} == * ]]; 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} == ** ]]; then
+ if [[ ${PV} == * ]]; then
git-r3_src_unpack
- unpack ${A}
- else
- default
fi
+ default
}
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 723342f20ced0b4b69238caed0e8bffd99967676
Author: Jimi Huotari gentoo org>
AuthorDate: Tue Apr 26 20:45:37 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Apr 28 06:57:16 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=723342f2
www-client/qupzilla: Update PLOCALES.
Package-Manager: portage-2.2.28
www-client/qupzilla/qupzilla-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index 43e272e..0f7ffb7 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -17,7 +17,7 @@ else
S=${WORKDIR}/${MY_P}
fi
-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"
+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"
PLUGINS_HASH='7b037cc326921cefbfc6b5e54e2091eb4191e73f'
PLUGINS_VERSION='2015.10.02' # if there are no updates, we can use the older
archive
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/files/, www-client/qupzilla/
commit: b20acc01a86c9be6ddfc0ba4f23d4a16fa3f3325
Author: Jimi Huotari gentoo org>
AuthorDate: Tue Apr 26 20:48:08 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Apr 28 06:57:16 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b20acc01
www-client/qupzilla: Remove unneeded patch.
A fix for building with 5.5 has been implemented upstream:
https://github.com/QupZilla/qupzilla/
commit/05fcc3565800425d9dc1feb001839a77dc52753d
Package-Manager: portage-2.2.28
.../qupzilla/files/qtsingleapplication-QDataStream.patch | 10 --
www-client/qupzilla/qupzilla-.ebuild | 3 ---
2 files changed, 13 deletions(-)
diff --git a/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
b/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
deleted file mode 100644
index 25694af..000
--- a/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
+++ /dev/null
@@ -1,10 +0,0 @@
src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp.ORIG 2015-05-07
18:29:35.045402873 +0200
-+++ src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp 2015-05-07
18:33:04.942404927 +0200
-@@ -39,6 +39,7 @@
- /
-
-
-+#include
- #include "qtlocalpeer.h"
- #include
- #include
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index 0f7ffb7..d8d8631 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -65,9 +65,6 @@ src_prepare() {
rm translations/${1}.ts || die
}
- # patch bundled but changed QTSA for Qt-5.5, see bugs 548470 and 489142
- epatch "${FILESDIR}"/qtsingleapplication-QDataStream.patch
-
epatch_user
# remove outdated prebuilt localizations
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 0b8bfb5b38a4984566cf24381a8ba4b73db95d98
Author: Jimi Huotari gentoo org>
AuthorDate: Tue Apr 26 20:49:46 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Apr 28 06:57:16 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0b8bfb5b
www-client/qupzilla: Update description.
Package-Manager: portage-2.2.28
www-client/qupzilla/qupzilla-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index 10ccc6e..388d308 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -23,7 +23,7 @@ PLUGINS_VERSION='2015.10.02' # if there are no updates, we
can use the older arc
inherit eutils l10n multilib qmake-utils ${VCS_ECLASS}
-DESCRIPTION="Qt WebKit web browser"
+DESCRIPTION="A cross-platform web browser using Qt WebEngine"
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"
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: ffcc67fcc617e5d6cfef901b204e4dfcfe407424
Author: Jimi Huotari gentoo org>
AuthorDate: Tue Apr 26 20:48:49 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Apr 28 06:57:16 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ffcc67fc
www-client/qupzilla: Bump to EAPI 6.
Package-Manager: portage-2.2.28
www-client/qupzilla/qupzilla-.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index d8d8631..10ccc6e 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
MY_PN="QupZilla"
MY_P=${MY_PN}-${PV}
@@ -65,8 +65,6 @@ src_prepare() {
rm translations/${1}.ts || die
}
- epatch_user
-
# remove outdated prebuilt localizations
rm -rf bin/locale || die
@@ -78,6 +76,8 @@ src_prepare() {
l10n_find_plocales_changes "translations" "" ".ts"
l10n_for_each_disabled_locale_do rm_loc
+
+ default
}
src_configure() {
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: dd4a0061125ced4909a0c1767a39896335a1df86
Author: Michael Palimaka gentoo org>
AuthorDate: Sat Jan 16 12:46:51 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Jan 16 12:46:51 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dd4a0061
www-client/qupzilla: use newer plugins
Package-Manager: portage-2.2.26
www-client/qupzilla/Manifest | 2 +-
www-client/qupzilla/qupzilla-.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index d4ede65..0841865 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -1 +1 @@
-DIST qupzilla-plugins-2015.06.05.tar.gz 335627 SHA256
afc9589e54c3ed49f58c727c3ff7bd59d4467dfaf2ff78f57cd98afc4dfc1f7b SHA512
5f2a4b1796431c62580e569b57445b2a309b2314f59ceb0c99da2a1703a2ee23bd2d1cac8a1532be5f2161976b4dd5f439c08abe5c1826115e9adf636fc12522
WHIRLPOOL
10b53426888dc8868de783403463d0bbf83ee59fdf74f2409b78a725b4f90d08aa9698e622d3acfdedbca469397b2e3d4ed8f06d3112bd9cff6e76527b1611eb
+DIST qupzilla-plugins-2015.10.02.tar.gz 335649 SHA256
9e167a6f1234b0b51c26cbd4acc5bcdc83c760ef5c2ff8573f90aa64c3a40553 SHA512
de2208fec40a1412a1feb4bd995ae25ff04a1f3577449f7c90bc5d2f46b01c8cf33757db5a0fa69ddb5a1a27764a0230664a5b2adc89ebc2b43df5df5e2b4f31
WHIRLPOOL
8fc24f0891fbb7e8378aae900c25bc29604f13febd9b30594e2e25d55a02707d047835e2fef82482c632ef35b93046a7e2990a82d285c159de6cf603525d01d5
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index 4f8da83..43e272e 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -18,8 +18,8 @@ else
fi
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='7c66cb2efbd18eacbd04ba211162b1a042e5b759'
-PLUGINS_VERSION='2015.06.05' # if there are no updates, we can use the older
archive
+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}
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 81277184b9c4279a288b56c4038fb68055e841e8 Author: Michael Palimaka gentoo org> AuthorDate: Sat Jan 16 11:41:52 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Jan 16 11:41:52 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=81277184 www-client/qupzilla: remove unused dependency Upstream-commit: cbc83e81ba5e234a01985c01524b92221e842da4 Package-Manager: portage-2.2.26 www-client/qupzilla/qupzilla-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/www-client/qupzilla/qupzilla-.ebuild b/www-client/qupzilla/qupzilla-.ebuild index 83f2dae..5bfbc63 100644 --- a/www-client/qupzilla/qupzilla-.ebuild +++ b/www-client/qupzilla/qupzilla-.ebuild @@ -37,7 +37,6 @@ RDEPEND="dev-libs/openssl:0 >=dev-qt/qtgui-5.5:5 >=dev-qt/qtnetwork-5.5:5 >=dev-qt/qtprintsupport-5.5:5 - >=dev-qt/qtscript-5.5:5 >=dev-qt/qtsql-5.5:5[sqlite] >=dev-qt/qtwebengine-5.5:5[widgets] >=dev-qt/qtwidgets-5.5:5
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 242e365bc68bd1c2afea0e2c40e387e673744037
Author: Michael Palimaka gentoo org>
AuthorDate: Sat Jan 16 11:43:02 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Jan 16 11:43:02 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=242e365b
www-client/qupzilla: requires Qt 5.6
Upstream-commit: 07f828ddd51ded5d59d1fb997c8ed3b2318ad347
Package-Manager: portage-2.2.26
www-client/qupzilla/qupzilla-.ebuild | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index 5bfbc63..b9e361e 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -32,19 +32,19 @@ SLOT="0"
IUSE="dbus debug gnome-keyring nonblockdialogs"
RDEPEND="dev-libs/openssl:0
- >=dev-qt/qtconcurrent-5.5:5
- >=dev-qt/qtcore-5.5:5
- >=dev-qt/qtgui-5.5:5
- >=dev-qt/qtnetwork-5.5:5
- >=dev-qt/qtprintsupport-5.5:5
- >=dev-qt/qtsql-5.5:5[sqlite]
- >=dev-qt/qtwebengine-5.5:5[widgets]
- >=dev-qt/qtwidgets-5.5:5
+ >=dev-qt/qtconcurrent-5.6:5
+ >=dev-qt/qtcore-5.6:5
+ >=dev-qt/qtgui-5.6:5
+ >=dev-qt/qtnetwork-5.6:5
+ >=dev-qt/qtprintsupport-5.6:5
+ >=dev-qt/qtsql-5.6:5[sqlite]
+ >=dev-qt/qtwebengine-5.6:5[widgets]
+ >=dev-qt/qtwidgets-5.6:5
x11-libs/libX11
- dbus? ( >=dev-qt/qtdbus-5.5:5 )
+ dbus? ( >=dev-qt/qtdbus-5.6:5 )
gnome-keyring? ( gnome-base/gnome-keyring )"
DEPEND="${RDEPEND}
- >=dev-qt/linguist-tools-5.5:5
+ >=dev-qt/linguist-tools-5.6:5
virtual/pkgconfig"
DOCS=( AUTHORS BUILDING CHANGELOG FAQ README.md )
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 8dfafb59430b324c34379b70a5b13e9392181ce8
Author: Michael Palimaka gentoo org>
AuthorDate: Sat Jan 16 11:59:21 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Jan 16 11:59:55 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8dfafb59
www-client/qupzilla: remove adobe-flash warnings
Chromium no longer supports NPAPI.
Package-Manager: portage-2.2.26
www-client/qupzilla/qupzilla-.ebuild | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index b9e361e..4f8da83 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -98,10 +98,3 @@ 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
-}
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: e167a8a345ec803f719ea379cd84e48dab2ff4f4
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Oct 1 12:52:12 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Oct 1 13:00:08 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e167a8a3
www-client/qupzilla: sort deps
Package-Manager: portage-2.2.20.1
www-client/qupzilla/qupzilla-.ebuild | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index a78b64d..2067a57 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -32,19 +32,19 @@ SLOT="0"
IUSE="dbus debug gnome-keyring nonblockdialogs"
RDEPEND="dev-libs/openssl:0
- x11-libs/libX11
- gnome-keyring? ( gnome-base/gnome-keyring )
+ >=dev-qt/qtconcurrent-5.5:5
>=dev-qt/qtcore-5.5:5
>=dev-qt/qtgui-5.5:5
- >=dev-qt/qtconcurrent-5.5:5
>=dev-qt/qtprintsupport-5.5:5
>=dev-qt/qtscript-5.5:5
>=dev-qt/qtsql-5.5:5[sqlite]
>=dev-qt/qtwebengine-5.5:5[widgets]
- dbus? ( >=dev-qt/qtdbus-5.5:5 )"
+ x11-libs/libX11
+ dbus? ( >=dev-qt/qtdbus-5.5:5 )
+ gnome-keyring? ( gnome-base/gnome-keyring )"
DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=dev-qt/linguist-tools-5.5:5"
+ >=dev-qt/linguist-tools-5.5:5
+ virtual/pkgconfig"
DOCS=( AUTHORS BUILDING CHANGELOG FAQ README.md )
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 0d77ee651b15d2a2aa798f977788b157a699a56d Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 1 12:58:52 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 1 13:00:08 2015 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0d77ee65 www-client/qupzilla: add missing dependencies Package-Manager: portage-2.2.20.1 www-client/qupzilla/qupzilla-.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/www-client/qupzilla/qupzilla-.ebuild b/www-client/qupzilla/qupzilla-.ebuild index 2067a57..83f2dae 100644 --- a/www-client/qupzilla/qupzilla-.ebuild +++ b/www-client/qupzilla/qupzilla-.ebuild @@ -35,10 +35,12 @@ RDEPEND="dev-libs/openssl:0 >=dev-qt/qtconcurrent-5.5:5 >=dev-qt/qtcore-5.5:5 >=dev-qt/qtgui-5.5:5 + >=dev-qt/qtnetwork-5.5:5 >=dev-qt/qtprintsupport-5.5:5 >=dev-qt/qtscript-5.5:5 >=dev-qt/qtsql-5.5:5[sqlite] >=dev-qt/qtwebengine-5.5:5[widgets] + >=dev-qt/qtwidgets-5.5:5 x11-libs/libX11 dbus? ( >=dev-qt/qtdbus-5.5:5 ) gnome-keyring? ( gnome-base/gnome-keyring )"
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/files/, www-client/qupzilla/
commit: a92f17152735d22bf67656fb25c27f7bde2422c7
Author: Ben de Groot yngwin AT gentoo DOT org
AuthorDate: Sat Aug 22 09:21:48 2015 +
Commit: Ben de Groot yngwin AT gentoo DOT org
CommitDate: Sat Aug 22 09:21:48 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a92f1715
www-client/qupzilla: update live ebuild for Qt5
I have made the necessary updates, but upstream switched the master branch
(version 1.9.x) to use QtWebEngine, for which we have no ebuild yet.
Bug: 554380
Bug: 531284
Package-Manager: portage-2.2.20.1
www-client/qupzilla/Manifest | 1 +
.../files/qtsingleapplication-QDataStream.patch| 10 +++
www-client/qupzilla/qupzilla-.ebuild | 97 +++---
3 files changed, 76 insertions(+), 32 deletions(-)
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
new file mode 100644
index 000..d4ede65
--- /dev/null
+++ b/www-client/qupzilla/Manifest
@@ -0,0 +1 @@
+DIST qupzilla-plugins-2015.06.05.tar.gz 335627 SHA256
afc9589e54c3ed49f58c727c3ff7bd59d4467dfaf2ff78f57cd98afc4dfc1f7b SHA512
5f2a4b1796431c62580e569b57445b2a309b2314f59ceb0c99da2a1703a2ee23bd2d1cac8a1532be5f2161976b4dd5f439c08abe5c1826115e9adf636fc12522
WHIRLPOOL
10b53426888dc8868de783403463d0bbf83ee59fdf74f2409b78a725b4f90d08aa9698e622d3acfdedbca469397b2e3d4ed8f06d3112bd9cff6e76527b1611eb
diff --git a/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
b/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
new file mode 100644
index 000..25694af
--- /dev/null
+++ b/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
@@ -0,0 +1,10 @@
+--- src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp.ORIG 2015-05-07
18:29:35.045402873 +0200
src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp 2015-05-07
18:33:04.942404927 +0200
+@@ -39,6 +39,7 @@
+ /
+
+
++#include QDataStream
+ #include qtlocalpeer.h
+ #include QCoreApplication
+ #include QTime
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index 69fa35d..a78b64d 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -3,71 +3,104 @@
# $Id$
EAPI=5
+MY_PN=QupZilla
+MY_P=${MY_PN}-${PV}
-if [[ ${PV} == ]]; then
- VCS_ECLASS=git-2
- EGIT_REPO_URI=git://github.com/QupZilla/${PN}.git
- KEYWORDS=
+if [[ ${PV} == ** ]]; then
+ VCS_ECLASS=git-r3
+ EGIT_BRANCH=master
+ EGIT_REPO_URI=git://github.com/${MY_PN}/${PN}.git
else
VCS_ECLASS=vcs-snapshot
- MY_P=QupZilla-${PV}
- SRC_URI=mirror://github/QupZilla/${PN}/${MY_P}.tar.gz
- KEYWORDS=~amd64 ~x86
+
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 de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR
fi_FI fr_FR gl_ES he_IL 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@ijekavianlatin sr@ijekavian sr@latin sr 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='7c66cb2efbd18eacbd04ba211162b1a042e5b759'
+PLUGINS_VERSION='2015.06.05' # if there are no updates, we can use the older
archive
-inherit l10n multilib qt4-r2 ${VCS_ECLASS}
+inherit eutils l10n multilib qmake-utils ${VCS_ECLASS}
DESCRIPTION=Qt WebKit web browser
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
LICENSE=GPL-3
SLOT=0
-IUSE=dbus debug kde nonblockdialogs
+IUSE=dbus debug gnome-keyring nonblockdialogs
-DEPEND=
- =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 )
-RDEPEND=${DEPEND}
+RDEPEND=dev-libs/openssl:0
+ x11-libs/libX11
+ gnome-keyring? ( gnome-base/gnome-keyring )
+ =dev-qt/qtcore-5.5:5
+ =dev-qt/qtgui-5.5:5
+ =dev-qt/qtconcurrent-5.5:5
+ =dev-qt/qtprintsupport-5.5:5
+ =dev-qt/qtscript-5.5:5
+ =dev-qt/qtsql-5.5:5[sqlite]
+ =dev-qt/qtwebengine-5.5:5[widgets]
+ dbus? ( =dev-qt/qtdbus-5.5:5 )
+DEPEND=${RDEPEND}
+ virtual/pkgconfig
+ =dev-qt/linguist-tools-5.5:5
DOCS=( AUTHORS BUILDING CHANGELOG FAQ README.md )
+src_unpack() {
+ if [[ ${PV} == ** ]]; then
+ git-r3_src_unpack
+ unpack ${A}
+ else
+ default
+ fi
+}
+
src_prepare() {
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 03abe7db9731f9a6b803d4116258a874d043dd2a
Author: Ben de Groot yngwin AT gentoo DOT org
AuthorDate: Thu Oct 2 03:14:17 2014 +
Commit: Ben de Groot yngwin AT gentoo DOT org
CommitDate: Thu Oct 2 03:14:17 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=03abe7db
www-client/qupzilla: 1.8.0 moved to gx86
---
www-client/qupzilla/Manifest | 2 -
www-client/qupzilla/qupzilla-1.8.0.ebuild | 92 ---
2 files changed, 94 deletions(-)
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
deleted file mode 100644
index 56ef24c..000
--- a/www-client/qupzilla/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST qupzilla-1.8.0.tar.gz 4526759 SHA256
414e97d752eaac64f48992957123612461f5fed109f056f5451465a1a1610929 SHA512
321014033acf6cc2e6c986b58cef65a1ef4f13783b2320280b6b7f9a6f03548997521dc538a5a5e13521d806375f370e8f015be526e46f64bb67a9094340985c
WHIRLPOOL
a683fc8c06f9cee2ef2d34d301cd4c63e8b32cb4a5ceca0884c3f5554bf59b813937c0c27d229653acde8adaa272cfc3a2663bcabab15b645d3cf6ad59dd93cc
-DIST qupzilla-plugins-1.8.0.tar.gz 202290 SHA256
992066f55202c33b94fbb08507097d8588c31ec0a8a3142ff65f84d3090b832f SHA512
956e9301c297fce0d26fce5bbcda004f5c0ca5446e358c893e1c0f0811c4b33548e153755d067a9848138a2016936cc1974a196f8c0418203580651fbf1579d7
WHIRLPOOL
d573004bc97cab49bfe0d535d9bb2370342c67cf18fe5bf6aa2245defbaa7268cffa6092698935476cbbbab73d63dbe38a90c9a3713d605c7c3cdbc360086c48
diff --git a/www-client/qupzilla/qupzilla-1.8.0.ebuild
b/www-client/qupzilla/qupzilla-1.8.0.ebuild
deleted file mode 100644
index 9b22c99..000
--- a/www-client/qupzilla/qupzilla-1.8.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.6.ebuild,v
1.1 2014/05/28 09:45:47 pinkbyte 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='4e0c457e106ec6365c93851adc33fafced354e7a'
-PLUGINS_VERSION='1.8.0' # 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 that the user doesn't need
- 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
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 7a6dca6e6029eecbd7792b5f4b24db0784d66605
Author: Ben de Groot yngwin AT gentoo DOT org
AuthorDate: Wed Oct 1 03:02:40 2014 +
Commit: Ben de Groot yngwin AT gentoo DOT org
CommitDate: Wed Oct 1 03:02:40 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7a6dca6e
www-client/qupzilla: add ebuild for 1.8.0 WIP
---
www-client/qupzilla/Manifest | 2 +
www-client/qupzilla/qupzilla-1.8.0.ebuild | 92 +++
2 files changed, 94 insertions(+)
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
new file mode 100644
index 000..56ef24c
--- /dev/null
+++ b/www-client/qupzilla/Manifest
@@ -0,0 +1,2 @@
+DIST qupzilla-1.8.0.tar.gz 4526759 SHA256
414e97d752eaac64f48992957123612461f5fed109f056f5451465a1a1610929 SHA512
321014033acf6cc2e6c986b58cef65a1ef4f13783b2320280b6b7f9a6f03548997521dc538a5a5e13521d806375f370e8f015be526e46f64bb67a9094340985c
WHIRLPOOL
a683fc8c06f9cee2ef2d34d301cd4c63e8b32cb4a5ceca0884c3f5554bf59b813937c0c27d229653acde8adaa272cfc3a2663bcabab15b645d3cf6ad59dd93cc
+DIST qupzilla-plugins-1.8.0.tar.gz 202290 SHA256
992066f55202c33b94fbb08507097d8588c31ec0a8a3142ff65f84d3090b832f SHA512
956e9301c297fce0d26fce5bbcda004f5c0ca5446e358c893e1c0f0811c4b33548e153755d067a9848138a2016936cc1974a196f8c0418203580651fbf1579d7
WHIRLPOOL
d573004bc97cab49bfe0d535d9bb2370342c67cf18fe5bf6aa2245defbaa7268cffa6092698935476cbbbab73d63dbe38a90c9a3713d605c7c3cdbc360086c48
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 000..9b22c99
--- /dev/null
+++ b/www-client/qupzilla/qupzilla-1.8.0.ebuild
@@ -0,0 +1,92 @@
+# 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.6.ebuild,v
1.1 2014/05/28 09:45:47 pinkbyte 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='4e0c457e106ec6365c93851adc33fafced354e7a'
+PLUGINS_VERSION='1.8.0' # 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 that the user doesn't need
+ 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
+}
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: 38efc00695dd46364af0f99adce98af64bccad86
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Wed Jun 18 13:07:16 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Wed Jun 18 13:07:16 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=38efc006
[www-client/qupzilla] Remove linguas code that only controls installation of
small files. Fixes bug #513674.
Package-Manager: portage-2.2.10
---
www-client/qupzilla/qupzilla-.ebuild | 15 +--
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index e10f23a..be3a67d 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -16,11 +16,7 @@ else
S=${WORKDIR}/${MY_P}
fi
-PLOCALES=cs_CZ de_DE el_GR es_ES es_VE fa_IR fr_FR hu_HU id_ID it_IT ja_JP
-ka_GE nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr_BA sr_RS sv_SE uk_UA
-zh_CN zh_TW
-
-inherit l10n multilib qt4-r2 ${VCS_ECLASS}
+inherit multilib qt4-r2 ${VCS_ECLASS}
DESCRIPTION=Qt WebKit web browser
HOMEPAGE=http://www.qupzilla.com/;
@@ -59,12 +55,3 @@ src_configure() {
eqmake4
}
-
-src_install() {
- qt4-r2_src_install
- l10n_for_each_disabled_locale_do rm_loc
-}
-
-rm_loc() {
- rm ${D}/usr/share/${PN}/locale/${1}.qm || die
-}
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: a5aa3638e33111e0358fb93ec92f5c91855447a6
Author: Sergey Popov pinkbyte AT gentoo DOT org
AuthorDate: Wed Jun 18 19:10:21 2014 +
Commit: Sergey Popov pinkbyte AT gentoo DOT org
CommitDate: Wed Jun 18 19:10:21 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a5aa3638
Revert [www-client/qupzilla] Remove linguas code that only controls
installation of small files. Fixes bug #513674.
This reverts commit 38efc00695dd46364af0f99adce98af64bccad86.
Reverted because of policy violation on LINGUAS
---
www-client/qupzilla/qupzilla-.ebuild | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index be3a67d..e10f23a 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -16,7 +16,11 @@ else
S=${WORKDIR}/${MY_P}
fi
-inherit multilib qt4-r2 ${VCS_ECLASS}
+PLOCALES=cs_CZ de_DE el_GR es_ES es_VE fa_IR fr_FR hu_HU id_ID it_IT ja_JP
+ka_GE nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr_BA sr_RS sv_SE uk_UA
+zh_CN zh_TW
+
+inherit l10n multilib qt4-r2 ${VCS_ECLASS}
DESCRIPTION=Qt WebKit web browser
HOMEPAGE=http://www.qupzilla.com/;
@@ -55,3 +59,12 @@ src_configure() {
eqmake4
}
+
+src_install() {
+ qt4-r2_src_install
+ l10n_for_each_disabled_locale_do rm_loc
+}
+
+rm_loc() {
+ rm ${D}/usr/share/${PN}/locale/${1}.qm || die
+}
[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/
commit: e858e365d502c4719567badb170f9b95db00622e
Author: Sergey Popov pinkbyte AT gentoo DOT org
AuthorDate: Wed Jun 18 19:30:26 2014 +
Commit: Sergey Popov pinkbyte AT gentoo DOT org
CommitDate: Wed Jun 18 19:30:26 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e858e365
www-client/qupzilla: remove unnecessary locales properly, add check for
new/removed locales, fix bug #513674
Package-Manager: portage-2.2.10
---
www-client/qupzilla/qupzilla-.ebuild | 25 ++---
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/www-client/qupzilla/qupzilla-.ebuild
b/www-client/qupzilla/qupzilla-.ebuild
index e10f23a..33f4c69 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
if [[ ${PV} == ]]; then
VCS_ECLASS=git-2
@@ -16,9 +16,7 @@ else
S=${WORKDIR}/${MY_P}
fi
-PLOCALES=cs_CZ de_DE el_GR es_ES es_VE fa_IR fr_FR hu_HU id_ID it_IT ja_JP
-ka_GE nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr_BA sr_RS sv_SE uk_UA
-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 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@ijekavianlatin sr@ijekavian sr@latin sr sv_SE
tr_TR uk_UA uz@Latn zh_CN zh_TW
inherit l10n multilib qt4-r2 ${VCS_ECLASS}
@@ -38,11 +36,21 @@ DEPEND=
dbus? ( =dev-qt/qtdbus-4.7:4 )
RDEPEND=${DEPEND}
-DOCS=AUTHORS BUILDING CHANGELOG FAQ README.md
+DOCS=( AUTHORS BUILDING CHANGELOG FAQ README.md )
src_prepare() {
+ rm_loc() {
+ sed -i -e /${1}.ts/d translations/translations.pri || die
+ rm translations/${1}.ts || die
+ }
# remove outdated copies of localizations:
- rm -rf bin/locale || die
+ rm -r bin/locale || die
+ # remove empty locale
+ rm translations/empty.ts || die
+
+ l10n_find_plocales_changes translations .ts
+ l10n_for_each_disabled_locale_do rm_loc
+ qt4-r2_src_prepare
}
src_configure() {
@@ -62,9 +70,4 @@ src_configure() {
src_install() {
qt4-r2_src_install
- l10n_for_each_disabled_locale_do rm_loc
-}
-
-rm_loc() {
- rm ${D}/usr/share/${PN}/locale/${1}.qm || die
}
