Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
Date: Fri, 25 Sep 2015 09:51:24
Message-Id: 1443174671.cb9767c5059d7d6348ea0fdf62241be99e9862e5.polynomial-c@gentoo
1 commit: cb9767c5059d7d6348ea0fdf62241be99e9862e5
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 25 09:50:15 2015 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 25 09:51:11 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb9767c5
7
8 www-client/midori: Removed old.
9
10 Package-Manager: portage-2.2.22
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 www-client/midori/Manifest | 2 -
14 www-client/midori/midori-0.5.8-r1.ebuild | 136 -------------------------------
15 www-client/midori/midori-0.5.8.ebuild | 134 ------------------------------
16 3 files changed, 272 deletions(-)
17
18 diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
19 index 471e030..02df760 100644
20 --- a/www-client/midori/Manifest
21 +++ b/www-client/midori/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST midori-0.5.8-save_as.patch.xz 7356 SHA256 29ab8718215cbbfa88a261da453736f3228fb1b618f1b541c3f4142f1a40233e SHA512 26ba30cd5c739921f3b44e50d0361f74e113ee75635efa4b2bb904442c71a5610178fb6989bd0101f7746bff04163bfe57bc142547306cf3539c99d87f971b6e WHIRLPOOL ecb57457303deacb73bfba2e88e7fcf0022b00b690aa74a8f222cdeeee47df5dd833c5f6a9fcfb705e67070f1eb9f1bd371ed8078ca1bdc4f0e1b936d228eaee
24 DIST midori_0.5.10_all_.tar.bz2 1379519 SHA256 702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f SHA512 9e615581b2029e2167d13bab3a580cf89b87da4979bb27982f2002b4ddb97e44d27ea910ee60df6479bd0dfa8cbef75217fa1956eb34b13475c99ab25b83f245 WHIRLPOOL 754b5d7b6851a2c0e537c6746d945f9412cf3757c559bcb07e455f555fa67bfc3e29ff08a39517359ba99bd0759252adea3d78f6281d7a07c8411f02da24fdc7
25 DIST midori_0.5.11_all_.tar.bz2 1428791 SHA256 96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d SHA512 237310d1f0bf70796474b9ec5be6755927e66acd2b527d04db39696c5e2f7ea2d11f7deb51ba3f5c151a450ab71e642282a1386e34253aaea1d8602ce76ac87d WHIRLPOOL 6825d1b28e269f9fb158458cd4a3ddbdb09ab241ced32c4ccc5df0c1f9a921a275baf0dcdac24aa84c58f7a3371ef74941bcd06a8303c95dd3ffb48d99de6bba
26 -DIST midori_0.5.8_all_.tar.bz2 1267130 SHA256 af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381 SHA512 3c1129324b05301502dfa4ad9147a160c7af269424451d2afba7ff2d455232274b2322699011950355cb406405bf2e38668e9cb56b748ecb87afdfd3a0e375e5 WHIRLPOOL fcc4a1c3e1b4968d0feb06b01742ba06b2ac1b0f28c17fb4369300a1cba94937a21e3aff5c2142e160fd54743ffb5d2996df38bbd88dd6aefd7a9e0a28a92a07
27
28 diff --git a/www-client/midori/midori-0.5.8-r1.ebuild b/www-client/midori/midori-0.5.8-r1.ebuild
29 deleted file mode 100644
30 index aed8649..0000000
31 --- a/www-client/midori/midori-0.5.8-r1.ebuild
32 +++ /dev/null
33 @@ -1,136 +0,0 @@
34 -# Copyright 1999-2015 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI=5
39 -
40 -VALA_MIN_API_VERSION=0.16
41 -
42 -PYTHON_COMPAT=( python2_7 )
43 -PYTHON_REQ_USE='threads(+)'
44 -
45 -unset _live_inherits
46 -
47 -if [[ ${PV} == *9999* ]]; then
48 - EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
49 - _live_inherits=git-2
50 -else
51 - KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
52 - SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2
53 - https://dev.gentoo.org/~ssuominen/${P}-save_as.patch.xz"
54 -fi
55 -
56 -inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits}
57 -
58 -DESCRIPTION="A lightweight web browser based on WebKitGTK+"
59 -HOMEPAGE="http://www.midori-browser.org/"
60 -
61 -LICENSE="LGPL-2.1 MIT"
62 -SLOT="0"
63 -IUSE="deprecated doc granite introspection +jit +webkit2 zeitgeist"
64 -
65 -RDEPEND=">=dev-db/sqlite-3.6.19:3
66 - >=dev-libs/glib-2.32.3
67 - dev-libs/libxml2
68 - >=net-libs/libsoup-2.38:2.4
69 - >=net-libs/libsoup-gnome-2.38:2.4
70 - >=x11-libs/libnotify-0.7
71 - x11-libs/libXScrnSaver
72 - deprecated? (
73 - >=net-libs/webkit-gtk-1.8.1:2[jit=]
74 - >=x11-libs/gtk+-2.24:2
75 - )
76 - !deprecated? (
77 - >=app-crypt/gcr-3
78 - x11-libs/gtk+:3
79 - webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] )
80 - !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] )
81 - )
82 - granite? ( >=dev-libs/granite-0.2 )
83 - introspection? ( dev-libs/gobject-introspection )
84 - zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
85 -DEPEND="${RDEPEND}
86 - ${PYTHON_DEPS}
87 - $(vala_depend)
88 - dev-util/intltool
89 - gnome-base/librsvg
90 - sys-devel/gettext
91 - doc? ( dev-util/gtk-doc )"
92 -REQUIRED_USE="granite? ( !deprecated )
93 - introspection? ( deprecated )
94 - webkit2? ( !deprecated )"
95 -
96 -S=${WORKDIR}
97 -
98 -pkg_setup() {
99 - python-any-r1_pkg_setup
100 -}
101 -
102 -src_unpack() {
103 - if [[ ${PV} == *9999* ]]; then
104 - git-2_src_unpack
105 - else
106 - default
107 - fi
108 -}
109 -
110 -src_prepare() {
111 - epatch "${WORKDIR}"/${P}-save_as.patch #498898
112 - vala_src_prepare
113 - sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
114 -}
115 -
116 -src_configure() {
117 - strip-linguas -i po
118 -
119 - local mycmakeargs=(
120 - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
121 - $(cmake-utils_use_use doc APIDOCS)
122 - $(cmake-utils_use_use introspection GIR)
123 - $(cmake-utils_use_use granite)
124 - $(cmake-utils_use_use zeitgeist)
125 - -DVALA_EXECUTABLE="${VALAC}"
126 - )
127 -
128 - if use deprecated; then
129 - mycmakeargs+=(
130 - -DUSE_GTK3=OFF
131 - -DHALF_BRO_INCOM_WEBKIT2=OFF
132 - )
133 - else
134 - mycmakeargs+=(
135 - -DUSE_GTK3=ON
136 - $(cmake-utils_use webkit2 HALF_BRO_INCOM_WEBKIT2)
137 - )
138 - fi
139 -
140 - cmake-utils_src_configure
141 -}
142 -
143 -src_install() {
144 - cmake-utils_src_install
145 -
146 - local jit_is_enabled
147 - if use deprecated; then
148 - has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
149 - else
150 - has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes
151 - fi
152 - [[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290
153 -}
154 -
155 -pkg_preinst() {
156 - gnome2_icon_savelist
157 -}
158 -
159 -pkg_postinst() {
160 - fdo-mime_desktop_database_update
161 - fdo-mime_mime_database_update
162 - gnome2_icon_cache_update
163 -}
164 -
165 -pkg_postrm() {
166 - fdo-mime_desktop_database_update
167 - fdo-mime_mime_database_update
168 - gnome2_icon_cache_update
169 -}
170
171 diff --git a/www-client/midori/midori-0.5.8.ebuild b/www-client/midori/midori-0.5.8.ebuild
172 deleted file mode 100644
173 index 9148128..0000000
174 --- a/www-client/midori/midori-0.5.8.ebuild
175 +++ /dev/null
176 @@ -1,134 +0,0 @@
177 -# Copyright 1999-2015 Gentoo Foundation
178 -# Distributed under the terms of the GNU General Public License v2
179 -# $Id$
180 -
181 -EAPI=5
182 -
183 -VALA_MIN_API_VERSION=0.16
184 -
185 -PYTHON_COMPAT=( python2_7 )
186 -PYTHON_REQ_USE='threads(+)'
187 -
188 -unset _live_inherits
189 -
190 -if [[ ${PV} == *9999* ]]; then
191 - EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
192 - _live_inherits=git-2
193 -else
194 - KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
195 - SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
196 -fi
197 -
198 -inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits}
199 -
200 -DESCRIPTION="A lightweight web browser based on WebKitGTK+"
201 -HOMEPAGE="http://www.midori-browser.org/"
202 -
203 -LICENSE="LGPL-2.1 MIT"
204 -SLOT="0"
205 -IUSE="deprecated doc granite introspection +jit +webkit2 zeitgeist"
206 -
207 -RDEPEND=">=dev-db/sqlite-3.6.19:3
208 - >=dev-libs/glib-2.32.3
209 - dev-libs/libxml2
210 - >=net-libs/libsoup-2.38:2.4
211 - >=net-libs/libsoup-gnome-2.38:2.4
212 - >=x11-libs/libnotify-0.7
213 - x11-libs/libXScrnSaver
214 - deprecated? (
215 - >=net-libs/webkit-gtk-1.8.1:2[jit=]
216 - >=x11-libs/gtk+-2.24:2
217 - )
218 - !deprecated? (
219 - >=app-crypt/gcr-3
220 - x11-libs/gtk+:3
221 - webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] )
222 - !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] )
223 - )
224 - granite? ( >=dev-libs/granite-0.2 )
225 - introspection? ( dev-libs/gobject-introspection )
226 - zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
227 -DEPEND="${RDEPEND}
228 - ${PYTHON_DEPS}
229 - $(vala_depend)
230 - dev-util/intltool
231 - gnome-base/librsvg
232 - sys-devel/gettext
233 - doc? ( dev-util/gtk-doc )"
234 -REQUIRED_USE="granite? ( !deprecated )
235 - introspection? ( deprecated )
236 - webkit2? ( !deprecated )"
237 -
238 -S=${WORKDIR}
239 -
240 -pkg_setup() {
241 - python-any-r1_pkg_setup
242 -}
243 -
244 -src_unpack() {
245 - if [[ ${PV} == *9999* ]]; then
246 - git-2_src_unpack
247 - else
248 - default
249 - fi
250 -}
251 -
252 -src_prepare() {
253 - vala_src_prepare
254 - sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
255 -}
256 -
257 -src_configure() {
258 - strip-linguas -i po
259 -
260 - local mycmakeargs=(
261 - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
262 - $(cmake-utils_use_use doc APIDOCS)
263 - $(cmake-utils_use_use introspection GIR)
264 - $(cmake-utils_use_use granite)
265 - $(cmake-utils_use_use zeitgeist)
266 - -DVALA_EXECUTABLE="${VALAC}"
267 - )
268 -
269 - if use deprecated; then
270 - mycmakeargs+=(
271 - -DUSE_GTK3=OFF
272 - -DHALF_BRO_INCOM_WEBKIT2=OFF
273 - )
274 - else
275 - mycmakeargs+=(
276 - -DUSE_GTK3=ON
277 - $(cmake-utils_use webkit2 HALF_BRO_INCOM_WEBKIT2)
278 - )
279 - fi
280 -
281 - cmake-utils_src_configure
282 -}
283 -
284 -src_install() {
285 - cmake-utils_src_install
286 -
287 - local jit_is_enabled
288 - if use deprecated; then
289 - has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
290 - else
291 - has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes
292 - fi
293 - [[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290
294 -}
295 -
296 -pkg_preinst() {
297 - gnome2_icon_savelist
298 -}
299 -
300 -pkg_postinst() {
301 - fdo-mime_desktop_database_update
302 - fdo-mime_mime_database_update
303 - gnome2_icon_cache_update
304 -}
305 -
306 -pkg_postrm() {
307 - fdo-mime_desktop_database_update
308 - fdo-mime_mime_database_update
309 - gnome2_icon_cache_update
310 -}