Gentoo Archives: gentoo-commits

From: Michael Weber <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/xmw:master commit in: www-client/netsurf/
Date: Tue, 03 May 2011 20:50:25
Message-Id: 69f69441ff30eadc47b447d86105694c057c7642.xmw@gentoo
1 commit: 69f69441ff30eadc47b447d86105694c057c7642
2 Author: Michael Weber <xmw <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 3 20:49:49 2011 +0000
4 Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
5 CommitDate: Tue May 3 20:49:49 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=69f69441
7
8 www-client/netsurf: initial import
9
10 (Portage version: 2.1.9.42/git/Linux x86_64, signed Manifest commit with key 62EEF090)
11
12 ---
13 www-client/netsurf/ChangeLog | 8 +++++
14 www-client/netsurf/Manifest | 14 +++++++++
15 www-client/netsurf/metadata.xml | 6 ++++
16 www-client/netsurf/netsurf-2.7.ebuild | 53 +++++++++++++++++++++++---------
17 4 files changed, 66 insertions(+), 15 deletions(-)
18
19 diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog
20 new file mode 100644
21 index 0000000..276b5c7
22 --- /dev/null
23 +++ b/www-client/netsurf/ChangeLog
24 @@ -0,0 +1,8 @@
25 +# ChangeLog for www-client/netsurf
26 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 +# $Header: $
28 +
29 + 03 May 2011; Michael Weber <xmw@g.o> netsurf-2.7.ebuild:
30 + Initial import, bug 347471, thanks to inciner@×××××.com for the initial
31 + ebuild
32 +
33
34 diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
35 new file mode 100644
36 index 0000000..31a1b1e
37 --- /dev/null
38 +++ b/www-client/netsurf/Manifest
39 @@ -0,0 +1,14 @@
40 +-----BEGIN PGP SIGNED MESSAGE-----
41 +Hash: SHA256
42 +
43 +DIST netsurf-2.7-src.tar.gz 2446099 RMD160 007cf1c8754d61296ad367008c1ed09ed45be50c SHA1 a3e2816686fc2e3d93cdc77271dd4c33dc0e5300 SHA256 54f872cf948f97b768dfd062e44f148bf263483660f7cb604ec07c835e4b0c07
44 +EBUILD netsurf-2.7.ebuild 2936 RMD160 4223702c3d24d93ce294dcaefce7ae479fe5a227 SHA1 33de5b43977a952497e6f8c2088d98f08855acba SHA256 3d5327bb36ea9512575317541fe5b2165647ede08ed985423f752e83ab9cbf24
45 +MISC ChangeLog 269 RMD160 333881c549ec1954c45118afdea9179883315704 SHA1 3a6910b41b80624058a5f07b62a1e40dd88e6020 SHA256 3178a5b4169d6adbd45926ec17e6f6b55ee49101ae53cec07ff5b90e8d7ff056
46 +MISC metadata.xml 762 RMD160 95f45ec4c54f381261156bb07c6010677e954d30 SHA1 aceb26cd54204b011409361456e6f7a273598488 SHA256 1a6414246cf7295476d133fdab06395aed4a01f741a89ea27be533a4bd0bd313
47 +-----BEGIN PGP SIGNATURE-----
48 +Version: GnuPG v2.0.17 (GNU/Linux)
49 +
50 +iF4EAREIAAYFAk3AamwACgkQknrdDGLu8JAsfwEAk2kulnmtrjJyagql/i/m8ZfA
51 +s7rzoXijz+cXVs/5yOMA/19xMkub1GNDlK4RZhqL94sHqlxUjnreTO5g78fqBgtV
52 +=jeuF
53 +-----END PGP SIGNATURE-----
54
55 diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
56 index e4b882b..49561ff 100644
57 --- a/www-client/netsurf/metadata.xml
58 +++ b/www-client/netsurf/metadata.xml
59 @@ -6,6 +6,12 @@
60 <email>xmw@g.o</email>
61 <name>Michael Weber</name>
62 </maintainer>
63 +<use>
64 + <flag name='bmp'>enable bmp bitmap support</flag>
65 + <flag name='rosprite'>enable RISC OS Sprite bitmap support</flag>
66 + <flag name='svgtiny'>enable svg support via media-libs/svgatiny</flag>
67 + <flag name='webp'>enable WebP image support</flag>
68 +</use>
69 <longdescription lang="en">
70 NetSurf is a free, open source web browser. It is written in C, has its own layout and rendering engine entirely written from scratch. It is small and capable of handling many of the web standards in use today.
71 </longdescription>
72
73 diff --git a/www-client/netsurf/netsurf-2.7.ebuild b/www-client/netsurf/netsurf-2.7.ebuild
74 index dc4ba1e..8ed7a8a 100644
75 --- a/www-client/netsurf/netsurf-2.7.ebuild
76 +++ b/www-client/netsurf/netsurf-2.7.ebuild
77 @@ -11,18 +11,36 @@ HOMEPAGE="http://www.netsurf-browser.org"
78
79 LICENSE="MIT GPL-2"
80 KEYWORDS="~amd64 ~x86"
81 -IUSE="bmp fbcon freetype gif gtk jpeg mng pdf png svg webp"
82 +IUSE="bmp fbcon gif gtk jpeg mng pdf png rosprite svg svgtiny truetype webp"
83
84 -RDEPEND="media-fonts/dejavu"
85 -DEPEND="${RDEPEND}
86 - net-libs/hubbub
87 +RDEPEND="media-fonts/dejavu
88 + dev-libs/libcss
89 + dev-libs/libxml2
90 bmp? ( media-libs/libnsbmp )
91 + fbcon? ( dev-libs/libnsfb )
92 gif? ( media-libs/libnsgif )
93 - pdf? ( media-libs/libharu )
94 -"
95 + gtk? ( x11-libs/gtk+:2 )
96 + jpeg? ( virtual/jpeg )
97 + pdf? ( media-libs/libharu:2 )
98 + png? ( media-libs/libpng )
99 + svg? (
100 + !svgtiny? ( gnome-base/librsvg:2 )
101 + svgtiny? ( media-libs/libsvgtiny ) )
102 + truetype? ( media-libs/freetype )
103 + webp? ( media-libs/libwebp )"
104 +DEPEND="${RDEPEND}
105 + dev-util/pkgconfig
106 + net-libs/hubbub
107 + rosprite? ( media-libs/librosprite )"
108
109 S=${WORKDIR}/${PN}
110
111 +pkg_setup() {
112 + if ! use fbcon && ! use gtk ; then
113 + die "either enable fbcon or gtk use flags"
114 + fi
115 +}
116 +
117 src_prepare() {
118 netsurf_src_prepare
119 sed -e "/cp nsgtk/s:netsurf:nsgtk.real:" \
120 @@ -35,7 +53,7 @@ src_prepare() {
121
122 src_configure() {
123 netsurf_conf() {
124 - echo "override $1" >> Makefile.config
125 + echo "override $1" >> Makefile.config || die
126 }
127 netsurf_use() {
128 local val=${4:-NO}
129 @@ -49,23 +67,28 @@ src_configure() {
130 netsurf_use mng NETSURF_USE_MNG
131 netsurf_use pdf NETSURF_USE_HARU_PDF
132 netsurf_use png NETSURF_USE_PNG
133 - netsurf_use svg NETSURF_USE_NSSVG NO NO
134 - netsurf_use svg NETSURF_USE_RSVG YES NO
135 - netsurf_use svg NETSURF_USE_ROSPRITE NO NO
136 + if use svgtiny ; then
137 + netsurf_use svg NETSURF_USE_NSSVG
138 + netsurf_use svg NETSURF_USE_RSVG NO
139 + else
140 + netsurf_use svg NETSURF_USE_NSSVG NO
141 + netsurf_use svg NETSURF_USE_RSVG
142 + fi
143 + netsurf_use rosprite NETSURF_USE_ROSPRITE
144 netsurf_use webp NETSURF_USE_WEBP
145 netsurf_conf "NETSURF_FB_FRONTEND := linux"
146 }
147
148 src_compile() {
149 - use gtk && ( emake TARGET=gtk || die )
150 - use fbcon && ( emake TARGET=framebuffer || die )
151 + use gtk && { emake TARGET=gtk || die ; }
152 + use fbcon && { emake TARGET=framebuffer || die ; }
153 }
154
155 src_install() {
156 if use gtk ; then
157 emake TARGET=gtk PREFIX="${ED}usr" install || die
158
159 - echo "#!/bin/sh" >> nsgtk || die
160 + echo "#!/bin/sh" > nsgtk || die
161 echo "NETSURFRES=${EPREFIX}/usr/share/netsurf ${EPREFIX}/usr/bin/nsgtk.real \"\$@\"" >> nsgtk || die
162 dobin nsgtk || die
163
164 @@ -75,9 +98,9 @@ src_install() {
165 fi
166
167 if use fbcon ; then
168 - emake TARGET=framebuffer PREFIX="${D}" install || die
169 + emake TARGET=framebuffer PREFIX="${ED}usr" install || die
170
171 - echo "#!/bin/sh" >> nsgtk || die
172 + echo "#!/bin/sh" > nsfb || die
173 echo "NETSURFRES=${EPREFIX}/usr/share/netsurf ${EPREFIX}/usr/bin/nsfb.real \"\$@\"" >> nsfb || die
174 dobin nsfb || die