1 |
ssuominen 11/01/16 18:32:51 |
2 |
|
3 |
Modified: ChangeLog midori-9999.ebuild |
4 |
Added: midori-0.2.9-r1.ebuild |
5 |
Log: |
6 |
Don't disable PaX anymore wrt #351407 by Faustus. |
7 |
|
8 |
(Portage version: 2.2.0_alpha14/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.46 www-client/midori/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.46&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.46&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?r1=1.45&r2=1.46 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v |
20 |
retrieving revision 1.45 |
21 |
retrieving revision 1.46 |
22 |
diff -u -r1.45 -r1.46 |
23 |
--- ChangeLog 18 Dec 2010 18:02:17 -0000 1.45 |
24 |
+++ ChangeLog 16 Jan 2011 18:32:50 -0000 1.46 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for www-client/midori |
27 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.45 2010/12/18 18:02:17 ssuominen Exp $ |
29 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.46 2011/01/16 18:32:50 ssuominen Exp $ |
31 |
+ |
32 |
+*midori-0.2.9-r1 (16 Jan 2011) |
33 |
+ |
34 |
+ 16 Jan 2011; Samuli Suominen <ssuominen@g.o> +midori-0.2.9-r1.ebuild, |
35 |
+ midori-9999.ebuild: |
36 |
+ Don't disable PaX anymore wrt #351407 by Faustus. |
37 |
|
38 |
18 Dec 2010; Samuli Suominen <ssuominen@g.o> midori-0.2.9.ebuild: |
39 |
Remove USE="vala" because it's not ready to be stabilized yet. Stabilize for |
40 |
|
41 |
|
42 |
|
43 |
1.24 www-client/midori/midori-9999.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.24&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.24&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?r1=1.23&r2=1.24 |
48 |
|
49 |
Index: midori-9999.ebuild |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v |
52 |
retrieving revision 1.23 |
53 |
retrieving revision 1.24 |
54 |
diff -u -r1.23 -r1.24 |
55 |
--- midori-9999.ebuild 8 Nov 2010 02:45:35 -0000 1.23 |
56 |
+++ midori-9999.ebuild 16 Jan 2011 18:32:50 -0000 1.24 |
57 |
@@ -1,9 +1,9 @@ |
58 |
-# Copyright 1999-2010 Gentoo Foundation |
59 |
+# Copyright 1999-2011 Gentoo Foundation |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.23 2010/11/08 02:45:35 ssuominen Exp $ |
62 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.24 2011/01/16 18:32:50 ssuominen Exp $ |
63 |
|
64 |
EAPI=2 |
65 |
-inherit pax-utils eutils multilib python xfconf git |
66 |
+inherit eutils multilib python xfconf git |
67 |
|
68 |
DESCRIPTION="A lightweight web browser based on WebKitGTK+" |
69 |
HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html" |
70 |
@@ -73,8 +73,6 @@ |
71 |
src_install() { |
72 |
DESTDIR=${D} ./waf install || die |
73 |
dodoc AUTHORS ChangeLog INSTALL TODO || die |
74 |
- |
75 |
- pax-mark -m "${D}"/usr/bin/midori #338561 |
76 |
} |
77 |
|
78 |
pkg_postinst() { |
79 |
|
80 |
|
81 |
|
82 |
1.1 www-client/midori/midori-0.2.9-r1.ebuild |
83 |
|
84 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.2.9-r1.ebuild?rev=1.1&view=markup |
85 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.2.9-r1.ebuild?rev=1.1&content-type=text/plain |
86 |
|
87 |
Index: midori-0.2.9-r1.ebuild |
88 |
=================================================================== |
89 |
# Copyright 1999-2011 Gentoo Foundation |
90 |
# Distributed under the terms of the GNU General Public License v2 |
91 |
# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.9-r1.ebuild,v 1.1 2011/01/16 18:32:50 ssuominen Exp $ |
92 |
|
93 |
EAPI=2 |
94 |
inherit eutils multilib python xfconf |
95 |
|
96 |
DESCRIPTION="A lightweight web browser based on WebKitGTK+" |
97 |
HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html" |
98 |
SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2" |
99 |
|
100 |
LICENSE="LGPL-2" |
101 |
SLOT="0" |
102 |
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd" |
103 |
IUSE="doc gnome +html idn libnotify nls +unique" |
104 |
|
105 |
RDEPEND="libnotify? ( x11-libs/libnotify ) |
106 |
>=net-libs/libsoup-2.25.2 |
107 |
>=net-libs/webkit-gtk-1.1.1 |
108 |
>=dev-db/sqlite-3.0 |
109 |
dev-libs/libxml2 |
110 |
>=x11-libs/gtk+-2.10:2 |
111 |
gnome? ( net-libs/libsoup-gnome ) |
112 |
idn? ( net-dns/libidn ) |
113 |
unique? ( dev-libs/libunique )" |
114 |
DEPEND="${RDEPEND} |
115 |
|| ( dev-lang/python:2.7 dev-lang/python:2.6 ) |
116 |
dev-util/intltool |
117 |
dev-util/pkgconfig |
118 |
doc? ( dev-util/gtk-doc ) |
119 |
html? ( dev-python/docutils ) |
120 |
nls? ( sys-devel/gettext )" |
121 |
|
122 |
pkg_setup() { |
123 |
python_set_active_version 2 |
124 |
} |
125 |
|
126 |
src_prepare() { |
127 |
# moving docs to version-specific directory |
128 |
sed -i -e "s:/${PN}/user/midori.html:/user/midori.html:g" midori/midori-browser.c || die |
129 |
} |
130 |
|
131 |
src_configure() { |
132 |
strip-linguas -i po |
133 |
|
134 |
CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf \ |
135 |
--prefix="/usr/" \ |
136 |
--libdir="/usr/$(get_libdir)" \ |
137 |
--docdir="/usr/share/doc/${PF}/html" \ |
138 |
--disable-docs \ |
139 |
--enable-addons \ |
140 |
$(use_enable doc apidocs) \ |
141 |
$(use_enable html userdocs) \ |
142 |
$(use_enable idn libidn) \ |
143 |
$(use_enable libnotify) \ |
144 |
$(use_enable nls) \ |
145 |
$(use_enable unique) \ |
146 |
--disable-vala \ |
147 |
configure || die |
148 |
} |
149 |
|
150 |
src_compile() { |
151 |
# This is from dev-libs/boost, keep it synced |
152 |
jobs=$( echo " ${MAKEOPTS} " | \ |
153 |
sed -e 's/ --jobs[= ]/ -j /g' \ |
154 |
-e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \ |
155 |
-e 's/ -j\>/ -j1/g' | \ |
156 |
( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; |
157 |
jobs="${j#-j}"; done; echo ${jobs} ) ) |
158 |
if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi; |
159 |
|
160 |
./waf build ${NUMJOBS} || die |
161 |
} |
162 |
|
163 |
src_install() { |
164 |
DESTDIR=${D} ./waf install || die |
165 |
dodoc AUTHORS ChangeLog INSTALL TODO || die |
166 |
} |
167 |
|
168 |
pkg_postinst() { |
169 |
xfconf_pkg_postinst |
170 |
ewarn "Midori tends to crash due to bugs in WebKit." |
171 |
ewarn "Report bugs at http://www.twotoasts.de/bugs" |
172 |
} |