Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/midori: metadata.xml midori-0.5.7.ebuild ChangeLog
Date: Sat, 29 Mar 2014 13:22:22
Message-Id: 20140329132214.31B1C20054@flycatcher.gentoo.org
1 ssuominen 14/03/29 13:22:14
2
3 Modified: metadata.xml ChangeLog
4 Added: midori-0.5.7.ebuild
5 Log:
6 Version bump wrt #492214 and add USE="granite" wrt #490040. Thanks to "A. Person" for reporting both bugs.
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
9
10 Revision Changes Path
11 1.16 www-client/midori/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/metadata.xml?rev=1.16&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/metadata.xml?rev=1.16&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/metadata.xml?r1=1.15&r2=1.16
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/midori/metadata.xml,v
20 retrieving revision 1.15
21 retrieving revision 1.16
22 diff -u -r1.15 -r1.16
23 --- metadata.xml 12 Mar 2013 10:23:53 -0000 1.15
24 +++ metadata.xml 29 Mar 2014 13:22:13 -0000 1.16
25 @@ -4,6 +4,7 @@
26 <herd>xfce</herd>
27 <use>
28 <flag name='deprecated'>Enable GTK+-2 instead of GTK+-3 because of external plugins like adobe-flash</flag>
29 + <flag name='granite'>Enable support for the elementary library <pkg>dev-libs/granite</pkg></flag>
30 <flag name='unique'>Enable single instance support using <pkg>dev-libs/libunique</pkg></flag>
31 <flag name='zeitgeist'>Add support for Zeitgeist event tracking system</flag>
32 <flag name='webkit2'>Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag>
33
34
35
36 1.120 www-client/midori/ChangeLog
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.120&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.120&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?r1=1.119&r2=1.120
41
42 Index: ChangeLog
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v
45 retrieving revision 1.119
46 retrieving revision 1.120
47 diff -u -r1.119 -r1.120
48 --- ChangeLog 4 Mar 2014 20:22:12 -0000 1.119
49 +++ ChangeLog 29 Mar 2014 13:22:13 -0000 1.120
50 @@ -1,6 +1,13 @@
51 # ChangeLog for www-client/midori
52 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
53 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.119 2014/03/04 20:22:12 vincent Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.120 2014/03/29 13:22:13 ssuominen Exp $
55 +
56 +*midori-0.5.7 (29 Mar 2014)
57 +
58 + 29 Mar 2014; Samuli Suominen <ssuominen@g.o>
59 + +files/midori-0.5.7-underlinking.patch, +midori-0.5.7.ebuild, metadata.xml:
60 + Version bump wrt #492214 and add USE="granite" wrt #490040. Thanks to "A.
61 + Person" for reporting both bugs.
62
63 04 Mar 2014; Vicente Olivert Riera <vincent@g.o> midori-0.5.5.ebuild:
64 Add ~mips keyword.
65
66
67
68 1.1 www-client/midori/midori-0.5.7.ebuild
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.5.7.ebuild?rev=1.1&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.5.7.ebuild?rev=1.1&content-type=text/plain
72
73 Index: midori-0.5.7.ebuild
74 ===================================================================
75 # Copyright 1999-2014 Gentoo Foundation
76 # Distributed under the terms of the GNU General Public License v2
77 # $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.7.ebuild,v 1.1 2014/03/29 13:22:13 ssuominen Exp $
78
79 EAPI=5
80
81 VALA_MIN_API_VERSION=0.16
82
83 PYTHON_COMPAT=( python2_7 )
84
85 unset _live_inherits
86
87 if [[ ${PV} == *9999* ]]; then
88 EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
89 _live_inherits=git-2
90 else
91 KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
92 SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
93 fi
94
95 inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits}
96
97 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
98 HOMEPAGE="http://www.midori-browser.org/"
99
100 LICENSE="LGPL-2.1 MIT"
101 SLOT="0"
102 IUSE="deprecated doc granite +jit +webkit2 zeitgeist"
103
104 RDEPEND=">=dev-db/sqlite-3.6.19:3
105 >=dev-libs/glib-2.32.3
106 dev-libs/libxml2
107 >=net-libs/libsoup-2.38:2.4
108 >=net-libs/libsoup-gnome-2.38:2.4
109 >=x11-libs/libnotify-0.7
110 x11-libs/libXScrnSaver
111 deprecated? (
112 >=net-libs/webkit-gtk-1.8.1:2[jit=]
113 >=x11-libs/gtk+-2.24:2
114 )
115 !deprecated? (
116 >=app-crypt/gcr-3
117 x11-libs/gtk+:3
118 webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] )
119 !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] )
120 )
121 granite? ( >=dev-libs/granite-0.2 )
122 zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
123 DEPEND="${RDEPEND}
124 ${PYTHON_DEPS}
125 $(vala_depend)
126 dev-util/intltool
127 gnome-base/librsvg
128 sys-devel/gettext
129 doc? ( dev-util/gtk-doc )"
130 REQUIRED_USE="webkit2? ( !deprecated )"
131
132 pkg_setup() {
133 python-any-r1_pkg_setup
134 }
135
136 src_unpack() {
137 if [[ ${PV} == *9999* ]]; then
138 git-2_src_unpack
139 else
140 default
141 fi
142 }
143
144 src_prepare() {
145 vala_src_prepare
146 sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
147 epatch "${FILESDIR}"/${P}-underlinking.patch
148 }
149
150 src_configure() {
151 strip-linguas -i po
152
153 local mycmakeargs=(
154 -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
155 $(cmake-utils_use_use doc APIDOCS)
156 $(cmake-utils_use_use granite)
157 $(cmake-utils_use_use zeitgeist)
158 -DVALA_EXECUTABLE="${VALAC}"
159 )
160
161 if use deprecated; then
162 mycmakeargs+=(
163 -DUSE_GTK3=OFF
164 -DHALF_BRO_INCOM_WEBKIT2=OFF
165 )
166 else
167 mycmakeargs+=(
168 -DUSE_GTK3=ON
169 $(cmake-utils_use webkit2 HALF_BRO_INCOM_WEBKIT2)
170 )
171 fi
172
173 cmake-utils_src_configure
174 }
175
176 src_install() {
177 cmake-utils_src_install
178
179
180 local jit_is_enabled
181 if use deprecated; then
182 has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
183 else
184 has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes
185 fi
186 [[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290
187 }
188
189 pkg_preinst() {
190 gnome2_icon_savelist
191 }
192
193 pkg_postinst() {
194 fdo-mime_desktop_database_update
195 fdo-mime_mime_database_update
196 gnome2_icon_cache_update
197 }
198
199 pkg_postrm() {
200 fdo-mime_desktop_database_update
201 fdo-mime_mime_database_update
202 gnome2_icon_cache_update
203 }
Report Message
Find on MARC Find on Google Groups