Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/qupzilla/
Date: Sat, 08 Oct 2016 16:40:01
Message-Id: 1475944788.e3b9553843f20adf56e66101a9ae3abea9af4ccd.kensington@gentoo
1 commit: e3b9553843f20adf56e66101a9ae3abea9af4ccd
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 8 16:39:40 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 8 16:39:48 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b95538
7
8 www-client/qupzilla: remove old
9
10 Package-Manager: portage-2.3.1
11
12 www-client/qupzilla/Manifest | 4 --
13 www-client/qupzilla/qupzilla-1.8.9.ebuild | 113 ------------------------------
14 www-client/qupzilla/qupzilla-2.0.0.ebuild | 106 ----------------------------
15 3 files changed, 223 deletions(-)
16
17 diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
18 index 4d47310..054114a 100644
19 --- a/www-client/qupzilla/Manifest
20 +++ b/www-client/qupzilla/Manifest
21 @@ -1,6 +1,2 @@
22 -DIST QupZilla-1.8.9.tar.xz 3004644 SHA256 620ffb10a3f6b3f596c2c38a84d9c320cb66dd2d5e6701e8e31945e26308fcac SHA512 64ee064aa55f4aa1c56ca3a925dbec66612d522eec570a96448d940d52239cb74dfb08b89610008b3ee669cfb4b287393020b8070162697e991aa8c04c57c448 WHIRLPOOL 4f5864c35d008b64292afbfb615cbb33a9e327446d637cbcd1bf41d0e4ffa7a3cf6a529d1eda14cba6bf28664aa40ee743f812b165698ba997a90cb2285cbc0d
23 -DIST QupZilla-2.0.0.tar.xz 2787692 SHA256 b357e2d3de91ec833a34f958c6eb649d86113235ee27a519722d8cae58bc8c78 SHA512 d7075017d0feabf6632540343ddef77e75fd693e859a34863f9d515545ac70a87b340fc50fef32569b67bbc93c3c3e360c3c124503279367c6f70316795107f5 WHIRLPOOL d0647f779577c7f4c8e2c9971b962e02fd8f6e475070a4fbd272b8f732838c4b941e50695a6264cf9ce6b38e4245ce17c3f5903ffe57f90d1d75d248562fee43
24 DIST QupZilla-2.0.1.tar.xz 2700184 SHA256 38b89d00ad235687ca1ad327f7f108aee2d85cdc047a78b6811dedff0d07850d SHA512 5da50378f0129269ee322c8b8517797cc29abd272c65b39b96762dfd62c3ec1ac158d8b44deaf8158336d41f111fcda466ffa56511f6b56ab964e1ba36575b45 WHIRLPOOL 341e453733a69a3c298bc7fdb2bb0f67887c8a1fbda7ab64f6c9b8d8008b7577be261f9178c9b91cfbb8abb239f9c0e7cba295d3aad8b304e3aafb3f98dc737c
25 -DIST qupzilla-plugins-2015.06.05.tar.gz 335627 SHA256 afc9589e54c3ed49f58c727c3ff7bd59d4467dfaf2ff78f57cd98afc4dfc1f7b SHA512 5f2a4b1796431c62580e569b57445b2a309b2314f59ceb0c99da2a1703a2ee23bd2d1cac8a1532be5f2161976b4dd5f439c08abe5c1826115e9adf636fc12522 WHIRLPOOL 10b53426888dc8868de783403463d0bbf83ee59fdf74f2409b78a725b4f90d08aa9698e622d3acfdedbca469397b2e3d4ed8f06d3112bd9cff6e76527b1611eb
26 -DIST qupzilla-plugins-2015.10.02.tar.gz 335649 SHA256 9e167a6f1234b0b51c26cbd4acc5bcdc83c760ef5c2ff8573f90aa64c3a40553 SHA512 de2208fec40a1412a1feb4bd995ae25ff04a1f3577449f7c90bc5d2f46b01c8cf33757db5a0fa69ddb5a1a27764a0230664a5b2adc89ebc2b43df5df5e2b4f31 WHIRLPOOL 8fc24f0891fbb7e8378aae900c25bc29604f13febd9b30594e2e25d55a02707d047835e2fef82482c632ef35b93046a7e2990a82d285c159de6cf603525d01d5
27 DIST qupzilla-plugins-2016.05.02.tar.gz 425314 SHA256 276491a89daf1b64d6eab861b54d313e85c815d322bf51d47491f00ad22f55bc SHA512 b294ecb2372b3267603a43bc7412ab75d2cd29a8c4667331f0d2c74e3b0b99d0c2a005b9e4854c6d777894522bba9fb3b1607e85e8da6dcbaa760c9ddc6288f2 WHIRLPOOL 471807dc70dd3ea072f1e429a6e67ea97ecd5eadc02ac19debdcddfca4f5cb8e1767ad754aed1ff8a557f0734460a87b4e2d5e01ea57d07c473f48b006e32ef1
28
29 diff --git a/www-client/qupzilla/qupzilla-1.8.9.ebuild b/www-client/qupzilla/qupzilla-1.8.9.ebuild
30 deleted file mode 100644
31 index 301c37b..00000000
32 --- a/www-client/qupzilla/qupzilla-1.8.9.ebuild
33 +++ /dev/null
34 @@ -1,113 +0,0 @@
35 -# Copyright 1999-2016 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Id$
38 -
39 -EAPI=5
40 -MY_PN="QupZilla"
41 -MY_P=${MY_PN}-${PV}
42 -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"
43 -PLUGINS_HASH="7c66cb2efbd18eacbd04ba211162b1a042e5b759"
44 -PLUGINS_VERSION="2015.06.05" # if there are no updates, we can use the older archive
45 -
46 -inherit eutils l10n multilib qmake-utils vcs-snapshot
47 -
48 -DESCRIPTION="Qt WebKit web browser"
49 -HOMEPAGE="http://www.qupzilla.com/"
50 -SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz
51 - https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
52 -
53 -LICENSE="GPL-3"
54 -SLOT="0"
55 -KEYWORDS="amd64 arm ~ppc64 x86"
56 -IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs +qt4 qt5"
57 -REQUIRED_USE="^^ ( qt4 qt5 )
58 - kde? ( qt4 )"
59 -
60 -RDEPEND="
61 - x11-libs/libX11
62 - gnome-keyring? ( gnome-base/gnome-keyring )
63 - kde? (
64 - kde-base/kdelibs:4
65 - kde-apps/kwalletd:4
66 - )
67 - libressl? ( dev-libs/libressl )
68 - !libressl? ( dev-libs/openssl:0 )
69 - qt4? (
70 - >=dev-qt/qtcore-4.8:4
71 - >=dev-qt/qtgui-4.8:4
72 - >=dev-qt/qtscript-4.8:4
73 - >=dev-qt/qtsql-4.8:4[sqlite]
74 - >=dev-qt/qtwebkit-4.8:4
75 - dbus? ( >=dev-qt/qtdbus-4.8:4 )
76 - )
77 - qt5? (
78 - dev-qt/qtcore:5
79 - dev-qt/qtgui:5
80 - dev-qt/qtconcurrent:5
81 - dev-qt/qtnetwork:5[ssl]
82 - dev-qt/qtprintsupport:5
83 - dev-qt/qtscript:5
84 - dev-qt/qtsql:5[sqlite]
85 - dev-qt/qtwebkit:5
86 - dev-qt/qtwidgets:5
87 - dev-qt/qtx11extras:5
88 - dbus? ( dev-qt/qtdbus:5 )
89 - )
90 -"
91 -DEPEND="${RDEPEND}
92 - virtual/pkgconfig
93 - qt5? ( dev-qt/linguist-tools:5 )"
94 -
95 -DOCS=( AUTHORS CHANGELOG FAQ README.md )
96 -S=${WORKDIR}/${MY_P}
97 -
98 -src_prepare() {
99 - rm_loc() {
100 - # remove localizations the user has not specified
101 - sed -i -e "/${1}.ts/d" translations/translations.pri || die
102 - rm translations/${1}.ts || die
103 - }
104 -
105 - epatch_user
106 -
107 - # remove outdated prebuilt localizations
108 - rm -rf bin/locale || die
109 -
110 - # remove empty locale
111 - rm translations/empty.ts || die
112 -
113 - # get extra plugins into qupzilla build tree
114 - mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_VERSION}/plugins/* "${S}"/src/plugins/ || die
115 -
116 - l10n_find_plocales_changes "translations" "" ".ts"
117 - l10n_for_each_disabled_locale_do rm_loc
118 -}
119 -
120 -src_configure() {
121 - # see BUILDING document for explanation of options
122 - export \
123 - QUPZILLA_PREFIX="${EPREFIX}/usr/" \
124 - USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
125 - USE_QTWEBKIT_2_2=true \
126 - DISABLE_DBUS=$(usex dbus '' 'true') \
127 - KDE_INTEGRATION=$(usex kde 'true' '') \
128 - NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '')
129 -
130 - if use qt4 ; then
131 - eqmake4 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
132 - else
133 - eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION")
134 - fi
135 -}
136 -
137 -src_install() {
138 - emake INSTALL_ROOT="${D}" install
139 - einstalldocs
140 -}
141 -
142 -pkg_postinst() {
143 - if has_version www-plugins/adobe-flash; then
144 - ewarn "For using adobe flash plugin you may need to run"
145 - ewarn " \"paxctl-ng -m /usr/bin/qupzilla\""
146 - fi
147 -}
148
149 diff --git a/www-client/qupzilla/qupzilla-2.0.0.ebuild b/www-client/qupzilla/qupzilla-2.0.0.ebuild
150 deleted file mode 100644
151 index f02ae4b..00000000
152 --- a/www-client/qupzilla/qupzilla-2.0.0.ebuild
153 +++ /dev/null
154 @@ -1,106 +0,0 @@
155 -# Copyright 1999-2016 Gentoo Foundation
156 -# Distributed under the terms of the GNU General Public License v2
157 -# $Id$
158 -
159 -EAPI=6
160 -
161 -PLOCALES="ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR
162 - fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg lv_LV
163 - nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr sr@ijekavian
164 - sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW"
165 -PLUGINS_HASH='7b037cc326921cefbfc6b5e54e2091eb4191e73f'
166 -PLUGINS_VERSION='2015.10.02' # if there are no updates, we can use the older archive
167 -
168 -inherit l10n qmake-utils
169 -
170 -if [[ ${PV} == *9999 ]]; then
171 - inherit git-r3
172 - EGIT_REPO_URI="https://github.com/QupZilla/${PN}.git"
173 -else
174 - MY_P=QupZilla-${PV}
175 - SRC_URI="https://github.com/QupZilla/${PN}/releases/download/v${PV}/${MY_P}.tar.xz"
176 - KEYWORDS="~amd64 ~x86"
177 - S=${WORKDIR}/${MY_P}
178 -fi
179 -
180 -DESCRIPTION="A cross-platform web browser using QtWebEngine"
181 -HOMEPAGE="http://www.qupzilla.com/"
182 -SRC_URI+=" https://github.com/QupZilla/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
183 -
184 -LICENSE="GPL-3"
185 -SLOT="0"
186 -IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs"
187 -
188 -RDEPEND="
189 - >=dev-qt/qtconcurrent-5.6:5
190 - >=dev-qt/qtcore-5.6:5
191 - >=dev-qt/qtdeclarative-5.6:5[widgets]
192 - >=dev-qt/qtgui-5.6:5
193 - >=dev-qt/qtnetwork-5.6:5[ssl]
194 - >=dev-qt/qtprintsupport-5.6:5
195 - >=dev-qt/qtsql-5.6:5[sqlite]
196 - >=dev-qt/qtwebchannel-5.6:5
197 - >=dev-qt/qtwebengine-5.6:5[widgets]
198 - >=dev-qt/qtwidgets-5.6:5
199 - >=dev-qt/qtx11extras-5.6:5
200 - x11-libs/libxcb:=
201 - dbus? ( >=dev-qt/qtdbus-5.6:5 )
202 - gnome-keyring? ( gnome-base/gnome-keyring )
203 - kde? ( kde-frameworks/kwallet:5 )
204 - libressl? ( dev-libs/libressl:= )
205 - !libressl? ( dev-libs/openssl:0 )
206 -"
207 -DEPEND="${RDEPEND}
208 - >=dev-qt/linguist-tools-5.6:5
209 - virtual/pkgconfig
210 -"
211 -
212 -DOCS=( AUTHORS BUILDING CHANGELOG FAQ README.md )
213 -
214 -src_unpack() {
215 - if [[ ${PV} == *9999 ]]; then
216 - git-r3_src_unpack
217 - fi
218 - default
219 -}
220 -
221 -src_prepare() {
222 - # get extra plugins into qupzilla build tree
223 - mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_HASH}/plugins/* "${S}"/src/plugins/ || die
224 -
225 - rm_loc() {
226 - # remove localizations the user has not specified
227 - sed -i -e "/${1}.ts/d" translations/translations.pri || die
228 - rm translations/${1}.ts || die
229 - }
230 -
231 - # remove outdated prebuilt localizations
232 - rm -rf bin/locale || die
233 -
234 - # remove empty locale
235 - rm translations/empty.ts || die
236 -
237 - l10n_find_plocales_changes translations '' .ts
238 - l10n_for_each_disabled_locale_do rm_loc
239 -
240 - default
241 -}
242 -
243 -src_configure() {
244 - # see BUILDING document for explanation of options
245 - export \
246 - QUPZILLA_PREFIX="${EPREFIX}/usr" \
247 - USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
248 - DEBUG_BUILD=$(usex debug true '') \
249 - DISABLE_DBUS=$(usex dbus '' true) \
250 - GNOME_INTEGRATION=$(usex gnome-keyring true '') \
251 - KDE_INTEGRATION=$(usex kde true '') \
252 - NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs true '')
253 -
254 - eqmake5
255 -}
256 -
257 -src_install() {
258 - emake INSTALL_ROOT="${D}" install
259 - einstalldocs
260 -}