Gentoo Archives: gentoo-commits

From: "Jeremy Olexa (darkside)" <darkside@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/midori: ChangeLog midori-9999.ebuild
Date: Tue, 24 Aug 2010 19:27:05
Message-Id: 20100824192659.81DB62004E@flycatcher.gentoo.org
1 darkside 10/08/24 19:26:59
2
3 Modified: ChangeLog midori-9999.ebuild
4 Log:
5 Align -9999 ebuild with 0.2.7, bug 333779 by Michel Ganguin
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.35 www-client/midori/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.35&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.35&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?r1=1.34&r2=1.35
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v
18 retrieving revision 1.34
19 retrieving revision 1.35
20 diff -u -r1.34 -r1.35
21 --- ChangeLog 17 Aug 2010 16:22:18 -0000 1.34
22 +++ ChangeLog 24 Aug 2010 19:26:59 -0000 1.35
23 @@ -1,6 +1,9 @@
24 # ChangeLog for www-client/midori
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.34 2010/08/17 16:22:18 darkside Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.35 2010/08/24 19:26:59 darkside Exp $
28 +
29 + 24 Aug 2010; Jeremy Olexa <darkside@g.o> midori-9999.ebuild:
30 + Align -9999 ebuild with 0.2.7, bug 333779 by Michel Ganguin
31
32 *midori-0.2.7 (17 Aug 2010)
33
34
35
36
37 1.16 www-client/midori/midori-9999.ebuild
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.16&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.16&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?r1=1.15&r2=1.16
42
43 Index: midori-9999.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v
46 retrieving revision 1.15
47 retrieving revision 1.16
48 diff -u -r1.15 -r1.16
49 --- midori-9999.ebuild 31 Mar 2010 15:03:48 -0000 1.15
50 +++ midori-9999.ebuild 24 Aug 2010 19:26:59 -0000 1.16
51 @@ -1,6 +1,6 @@
52 # Copyright 1999-2010 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.15 2010/03/31 15:03:48 ssuominen Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.16 2010/08/24 19:26:59 darkside Exp $
56
57 EAPI=2
58
59 @@ -8,7 +8,7 @@
60
61 inherit eutils multilib python xfconf git
62
63 -DESCRIPTION="A lightweight web browser"
64 +DESCRIPTION="A lightweight web browser based on WebKitGTK+"
65 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
66 EGIT_REPO_URI="git://git.xfce.org/apps/midori"
67 EGIT_PROJECT="midori"
68 @@ -16,19 +16,20 @@
69
70 LICENSE="LGPL-2"
71 SLOT="0"
72 -KEYWORDS=""
73 -IUSE="doc gnome html idn libnotify nls +sqlite +unique"
74 +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
75 +IUSE="doc gnome +html idn libnotify nls +unique vala"
76
77 RDEPEND="libnotify? ( x11-libs/libnotify )
78 >=net-libs/libsoup-2.25.2
79 >=net-libs/webkit-gtk-1.1.1
80 + >=dev-db/sqlite-3.0
81 dev-libs/libxml2
82 - x11-libs/gtk+
83 + >=x11-libs/gtk+-2.10:2
84 gnome? ( net-libs/libsoup[gnome] )
85 idn? ( net-dns/libidn )
86 - sqlite? ( >=dev-db/sqlite-3.0 )
87 unique? ( dev-libs/libunique )"
88 DEPEND="${RDEPEND}
89 + dev-util/intltool
90 dev-util/pkgconfig
91 doc? ( dev-util/gtk-doc )
92 html? ( dev-python/docutils )
93 @@ -40,8 +41,8 @@
94
95 src_prepare() {
96 # moving docs to version-specific directory
97 - sed -i -e "s:\${DOCDIR}/${PN}:\${DOCDIR}/${PF}/:g" wscript
98 - sed -i -e "s:/${PN}/user/midori.html:/${PF}/user/midori.html:g" midori/midori-browser.c
99 + sed -i -e "s:\${DOCDIR}/${PN}:\${DOCDIR}/${PF}/:g" wscript || die
100 + sed -i -e "s:/${PN}/user/midori.html:/${PF}/user/midori.html:g" midori/midori-browser.c || die
101 }
102
103 src_configure() {
104 @@ -51,12 +52,14 @@
105 --prefix="/usr/" \
106 --libdir="/usr/$(get_libdir)" \
107 --disable-docs \
108 + --enable-addons \
109 $(use_enable doc apidocs) \
110 $(use_enable html userdocs) \
111 $(use_enable idn libidn) \
112 + $(use_enable libnotify) \
113 $(use_enable nls nls) \
114 - $(use_enable sqlite) \
115 $(use_enable unique) \
116 + $(use_enable vala) \
117 configure || die "configure failed"
118 }
119
120 @@ -67,7 +70,6 @@
121
122 src_install() {
123 DESTDIR=${D} ./waf install || die "install failed"
124 - rm -r "${D}"/usr/share/doc/${PN}
125 dodoc AUTHORS ChangeLog INSTALL TODO || die "dodoc failed"
126 }