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: midori-0.5.2.ebuild midori-9999.ebuild ChangeLog
Date: Sat, 01 Jun 2013 14:27:48
Message-Id: 20130601142745.A81E52171D@flycatcher.gentoo.org
1 ssuominen 13/06/01 14:27:45
2
3 Modified: midori-9999.ebuild ChangeLog
4 Added: midori-0.5.2.ebuild
5 Log:
6 Version bump.
7
8 (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
9
10 Revision Changes Path
11 1.49 www-client/midori/midori-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.49&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.49&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?r1=1.48&r2=1.49
16
17 Index: midori-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v
20 retrieving revision 1.48
21 retrieving revision 1.49
22 diff -u -r1.48 -r1.49
23 --- midori-9999.ebuild 31 Mar 2013 19:10:56 -0000 1.48
24 +++ midori-9999.ebuild 1 Jun 2013 14:27:45 -0000 1.49
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.48 2013/03/31 19:10:56 pacho Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.49 2013/06/01 14:27:45 ssuominen Exp $
30
31 EAPI=5
32 VALA_MIN_API_VERSION=0.14
33 @@ -41,6 +41,7 @@
34 >=net-libs/webkit-gtk-1.10.2:3
35 x11-libs/gtk+:3
36 unique? ( dev-libs/libunique:3 )
37 + webkit2? ( >=net-libs/webkit-gtk-2 )
38 )
39 gnome? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.34:2.4 ) )
40 libnotify? ( >=x11-libs/libnotify-0.7 )
41
42
43
44 1.111 www-client/midori/ChangeLog
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.111&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.111&content-type=text/plain
48 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?r1=1.110&r2=1.111
49
50 Index: ChangeLog
51 ===================================================================
52 RCS file: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v
53 retrieving revision 1.110
54 retrieving revision 1.111
55 diff -u -r1.110 -r1.111
56 --- ChangeLog 9 Apr 2013 15:56:57 -0000 1.110
57 +++ ChangeLog 1 Jun 2013 14:27:45 -0000 1.111
58 @@ -1,6 +1,12 @@
59 # ChangeLog for www-client/midori
60 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
61 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.110 2013/04/09 15:56:57 ssuominen Exp $
62 +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.111 2013/06/01 14:27:45 ssuominen Exp $
63 +
64 +*midori-0.5.2 (01 Jun 2013)
65 +
66 + 01 Jun 2013; Samuli Suominen <ssuominen@g.o> +midori-0.5.2.ebuild,
67 + midori-9999.ebuild:
68 + Version bump.
69
70 09 Apr 2013; Samuli Suominen <ssuominen@g.o> -midori-0.4.8.ebuild,
71 -files/midori-0.4.8-desktop_file_validation.patch, -midori-0.4.9.ebuild:
72
73
74
75 1.1 www-client/midori/midori-0.5.2.ebuild
76
77 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.5.2.ebuild?rev=1.1&view=markup
78 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.5.2.ebuild?rev=1.1&content-type=text/plain
79
80 Index: midori-0.5.2.ebuild
81 ===================================================================
82 # Copyright 1999-2013 Gentoo Foundation
83 # Distributed under the terms of the GNU General Public License v2
84 # $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.2.ebuild,v 1.1 2013/06/01 14:27:45 ssuominen Exp $
85
86 EAPI=5
87 VALA_MIN_API_VERSION=0.14
88
89 PYTHON_COMPAT=( python2_7 )
90
91 unset _live_inherits
92
93 if [[ ${PV} == *9999* ]]; then
94 EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
95 _live_inherits=git-2
96 else
97 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
98 SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
99 fi
100
101 inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils vala ${_live_inherits}
102
103 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
104 HOMEPAGE="http://twotoasts.de/index.php/midori/"
105
106 LICENSE="LGPL-2.1 MIT"
107 SLOT="0"
108 IUSE="+deprecated doc gnome libnotify nls +unique webkit2 zeitgeist"
109
110 RDEPEND=">=dev-db/sqlite-3.6.19:3
111 >=dev-libs/glib-2.22
112 dev-libs/libxml2
113 >=net-libs/libsoup-2.34:2.4
114 x11-libs/libXScrnSaver
115 deprecated? (
116 net-libs/webkit-gtk:2
117 x11-libs/gtk+:2
118 unique? ( dev-libs/libunique:1 )
119 )
120 !deprecated? (
121 >=app-crypt/gcr-3
122 >=net-libs/webkit-gtk-1.10.2:3
123 x11-libs/gtk+:3
124 unique? ( dev-libs/libunique:3 )
125 webkit2? ( >=net-libs/webkit-gtk-2 )
126 )
127 gnome? ( || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.34:2.4 ) )
128 libnotify? ( >=x11-libs/libnotify-0.7 )
129 zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
130 DEPEND="${RDEPEND}
131 ${PYTHON_DEPS}
132 $(vala_depend)
133 dev-util/intltool
134 gnome-base/librsvg
135 doc? ( dev-util/gtk-doc )
136 nls? ( sys-devel/gettext )"
137
138 pkg_setup() {
139 python-any-r1_pkg_setup
140
141 DOCS=( AUTHORS ChangeLog HACKING INSTALL TODO TRANSLATE )
142 HTML_DOCS=( data/faq.html data/faq.css )
143 }
144
145 src_unpack() {
146 if [[ ${PV} == *9999* ]]; then
147 git-2_src_unpack
148 else
149 default
150 fi
151 }
152
153 src_prepare() {
154 # Force disabled because we don't have this custom renamed in Portage
155 sed -i -e 's:gcr-3-gtk2:&dIsAbLe:' wscript || die
156
157 vala_src_prepare
158 }
159
160 src_configure() {
161 strip-linguas -i po
162
163 local myconf
164 use deprecated || myconf="$(use_enable webkit2)"
165
166 waf-utils_src_configure \
167 --disable-docs \
168 $(use_enable doc apidocs) \
169 $(use_enable unique) \
170 $(use_enable libnotify) \
171 --disable-granite \
172 --enable-addons \
173 $(use_enable nls) \
174 $(use_enable !deprecated gtk3) \
175 $(use_enable zeitgeist) \
176 ${myconf}
177 }
178
179 pkg_preinst() {
180 gnome2_icon_savelist
181 }
182
183 pkg_postinst() {
184 fdo-mime_desktop_database_update
185 fdo-mime_mime_database_update
186 gnome2_icon_cache_update
187 }
188
189 pkg_postrm() {
190 fdo-mime_desktop_database_update
191 fdo-mime_mime_database_update
192 gnome2_icon_cache_update
193 }