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

Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libnsfb: libnsfb-9999.ebuild libnsfb-0.0.2.ebuild ChangeLog
Date: Thu, 28 Feb 2013 07:40:01
Message-Id: 20130228073957.896A22171D@flycatcher.gentoo.org
1 xmw 13/02/28 07:39:57
2
3 Modified: libnsfb-9999.ebuild libnsfb-0.0.2.ebuild ChangeLog
4 Log:
5 netsurf eclass preparation.
6
7 (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
8
9 Revision Changes Path
10 1.3 dev-libs/libnsfb/libnsfb-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/libnsfb-9999.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/libnsfb-9999.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/libnsfb-9999.ebuild?r1=1.2&r2=1.3
15
16 Index: libnsfb-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-9999.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- libnsfb-9999.ebuild 27 Feb 2013 08:00:54 -0000 1.2
23 +++ libnsfb-9999.ebuild 28 Feb 2013 07:39:57 -0000 1.3
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2013 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-9999.ebuild,v 1.2 2013/02/27 08:00:54 xmw Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-9999.ebuild,v 1.3 2013/02/28 07:39:57 xmw Exp $
29
30 EAPI=5
31
32 @@ -14,7 +14,7 @@
33 LICENSE="MIT"
34 SLOT="0"
35 KEYWORDS=""
36 -IUSE="sdl static-libs vnc xcb"
37 +IUSE="debug sdl static-libs vnc xcb"
38
39 RDEPEND="sdl? ( media-libs/libsdl )
40 vnc? ( net-libs/libvncserver )
41 @@ -28,6 +28,30 @@
42 # we don't allow access to /dev/fb0
43 RESTRICT="test"
44
45 +pkg_setup(){
46 + netsurf_src_prepare() {
47 + sed -e "/^CCOPT :=/s:=.*:=:" \
48 + -e "/^CCNOOPT :=/s:=.*:=:" \
49 + -e "/^CCDBG :=/s:=.*:=:" \
50 + -i build/makefiles/Makefile.{gcc,clang}
51 + sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
52 + -i Makefile || die
53 + sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
54 + -i ${NETSURF_PKGCONFIG:-${PN}}.pc.in || die
55 + }
56 + netsurf_src_configure() {
57 + echo "Q := " >> Makefile.config
58 + echo "CC := $(tc-getCC)" >> Makefile.config
59 + echo "AR := $(tc-getAR)" >> Makefile.config
60 + }
61 +
62 + netsurf_make() {
63 + emake COMPONENT_TYPE=lib-shared BUILD=$(usex debug debug release) "$@"
64 + use static-libs && \
65 + emake COMPONENT_TYPE=lib-static BUILD=$(usex debug debug release) "$@"
66 + }
67 +}
68 +
69 src_unpack() {
70 default
71 git-2_src_unpack
72 @@ -40,20 +64,17 @@
73 #patch buildsystem from SRC_URI
74 epatch "${FILESDIR}"/${PN}-0.0.2-autodetect.patch
75
76 - sed -e "/^CCOPT :=/s:=.*:=:" \
77 - -i build/makefiles/Makefile.gcc || die
78 + netsurf_src_prepare
79 +
80 sed -e '/^CFLAGS/s: -g : :' \
81 - -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
82 -e "s/\$(eval \$(call pkg_config_get_variable,NSFB_XCBPROTO_VERSION,xcb,xcbproto_version))/NSFB_XCBPROTO_VERSION := $(pkg-config --variable=xcbproto_version xcb)/" \
83 -e "1iNSSHARED=${S}/build" \
84 -e "1iNSBUILD=${S}/build/makefiles" \
85 -i Makefile || die
86 - sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
87 - -i ${PN}.pc.in || die
88 +}
89
90 - echo "Q := " >> Makefile.config
91 - echo "CC := $(tc-getCC)" >> Makefile.config
92 - echo "AR := $(tc-getAR)" >> Makefile.config
93 +src_configure() {
94 + netsurf_src_configure
95
96 echo "NSFB_SDL_AVAILABLE := $(usex sdl)" >> Makefile.config
97 echo "NSFB_VNC_AVAILABLE := $(usex vnc)" >> Makefile.config
98 @@ -62,20 +83,15 @@
99 }
100
101 src_compile() {
102 - emake COMPONENT_TYPE=lib-shared
103 - use static-libs && \
104 - emake COMPONENT_TYPE=lib-static
105 + netsurf_make
106 }
107
108 src_test() {
109 - emake COMPONENT_TYPE=lib-shared test
110 - use static-libs && \
111 - emake COMPONENT_TYPE=lib-static test
112 + netsurf_make test
113 }
114
115 src_install() {
116 - emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-shared install
117 - use static-libs && \
118 - emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-static install
119 + netsurf_make DESTDIR="${D}" PREFIX=/usr install
120 +
121 dodoc usage
122 }
123
124
125
126 1.3 dev-libs/libnsfb/libnsfb-0.0.2.ebuild
127
128 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/libnsfb-0.0.2.ebuild?rev=1.3&view=markup
129 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/libnsfb-0.0.2.ebuild?rev=1.3&content-type=text/plain
130 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/libnsfb-0.0.2.ebuild?r1=1.2&r2=1.3
131
132 Index: libnsfb-0.0.2.ebuild
133 ===================================================================
134 RCS file: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-0.0.2.ebuild,v
135 retrieving revision 1.2
136 retrieving revision 1.3
137 diff -u -r1.2 -r1.3
138 --- libnsfb-0.0.2.ebuild 27 Feb 2013 08:00:54 -0000 1.2
139 +++ libnsfb-0.0.2.ebuild 28 Feb 2013 07:39:57 -0000 1.3
140 @@ -1,6 +1,6 @@
141 # Copyright 1999-2013 Gentoo Foundation
142 # Distributed under the terms of the GNU General Public License v2
143 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-0.0.2.ebuild,v 1.2 2013/02/27 08:00:54 xmw Exp $
144 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-0.0.2.ebuild,v 1.3 2013/02/28 07:39:57 xmw Exp $
145
146 EAPI=5
147
148 @@ -13,7 +13,7 @@
149 LICENSE="MIT"
150 SLOT="0"
151 KEYWORDS="~amd64 ~arm"
152 -IUSE="sdl static-libs vnc xcb"
153 +IUSE="debug sdl static-libs vnc xcb"
154
155 RDEPEND="sdl? ( media-libs/libsdl )
156 vnc? ( net-libs/libvncserver )
157 @@ -27,6 +27,30 @@
158 # we don't allow access to /dev/fb0
159 RESTRICT="test"
160
161 +pkg_setup(){
162 + netsurf_src_prepare() {
163 + sed -e "/^CCOPT :=/s:=.*:=:" \
164 + -e "/^CCNOOPT :=/s:=.*:=:" \
165 + -e "/^CCDBG :=/s:=.*:=:" \
166 + -i build/makefiles/Makefile.{gcc,clang}
167 + sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
168 + -i Makefile || die
169 + sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
170 + -i ${NETSURF_PKGCONFIG:-${PN}}.pc.in || die
171 + }
172 + netsurf_src_configure() {
173 + echo "Q := " >> Makefile.config
174 + echo "CC := $(tc-getCC)" >> Makefile.config
175 + echo "AR := $(tc-getAR)" >> Makefile.config
176 + }
177 +
178 + netsurf_make() {
179 + emake COMPONENT_TYPE=lib-shared BUILD=$(usex debug debug release) "$@"
180 + use static-libs && \
181 + emake COMPONENT_TYPE=lib-static BUILD=$(usex debug debug release) "$@"
182 + }
183 +}
184 +
185 src_unpack() {
186 default
187 mv netsurf-2.9/${P} . || die
188 @@ -40,17 +64,11 @@
189 epatch "${FILESDIR}"/${P}-unused.patch
190 epatch "${FILESDIR}"/${P}-autodetect.patch
191
192 - sed -e "/^CCOPT :=/s:=.*:=:" \
193 - -i build/makefiles/Makefile.{gcc,clang} || die
194 - sed -e '/^CFLAGS/s: -g : :' \
195 - -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
196 - -i Makefile || die
197 - sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
198 - -i ${PN}.pc.in || die
199 -
200 - echo "Q := " >> Makefile.config
201 - echo "CC := $(tc-getCC)" >> Makefile.config
202 - echo "AR := $(tc-getAR)" >> Makefile.config
203 + netsurf_src_prepare
204 +}
205 +
206 +src_configure() {
207 + netsurf_src_configure
208
209 echo "NSFB_SDL_AVAILABLE := $(usex sdl)" >> Makefile.config
210 echo "NSFB_VNC_AVAILABLE := $(usex vnc)" >> Makefile.config
211 @@ -59,20 +77,15 @@
212 }
213
214 src_compile() {
215 - emake COMPONENT_TYPE=lib-shared
216 - use static-libs && \
217 - emake COMPONENT_TYPE=lib-static
218 + netsurf_make
219 }
220
221 src_test() {
222 - emake COMPONENT_TYPE=lib-shared test
223 - use static-libs && \
224 - emake COMPONENT_TYPE=lib-static test
225 + netsurf_make test
226 }
227
228 src_install() {
229 - emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-shared install
230 - use static-libs && \
231 - emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-static install
232 + netsurf_make DESTDIR="${D}" PREFIX=/usr install
233 +
234 dodoc usage
235 }
236
237
238
239 1.5 dev-libs/libnsfb/ChangeLog
240
241 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/ChangeLog?rev=1.5&view=markup
242 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/ChangeLog?rev=1.5&content-type=text/plain
243 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/ChangeLog?r1=1.4&r2=1.5
244
245 Index: ChangeLog
246 ===================================================================
247 RCS file: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v
248 retrieving revision 1.4
249 retrieving revision 1.5
250 diff -u -r1.4 -r1.5
251 --- ChangeLog 27 Feb 2013 08:00:54 -0000 1.4
252 +++ ChangeLog 28 Feb 2013 07:39:57 -0000 1.5
253 @@ -1,6 +1,10 @@
254 # ChangeLog for dev-libs/libnsfb
255 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
256 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v 1.4 2013/02/27 08:00:54 xmw Exp $
257 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v 1.5 2013/02/28 07:39:57 xmw Exp $
258 +
259 + 28 Feb 2013; Michael Weber <xmw@g.o> libnsfb-0.0.2.ebuild,
260 + libnsfb-9999.ebuild:
261 + netsurf eclass preparation.
262
263 27 Feb 2013; Michael Weber <xmw@g.o> libnsfb-0.0.2.ebuild,
264 +files/libnsfb-0.0.2-autodetect.patch, libnsfb-9999.ebuild:
Report Message
Find on MARC Find on Google Groups