1 |
commit: d4484c9b9811701ad253a19c0afa81414cf720a7 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 2 20:38:16 2017 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 2 20:38:45 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4484c9b |
7 |
|
8 |
www-client/surf: Old. |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
www-client/surf/Manifest | 2 - |
13 |
www-client/surf/files/surf-0.6-gentoo.patch | 133 ---------------------------- |
14 |
www-client/surf/files/surf-0.7-gentoo.patch | 84 ------------------ |
15 |
www-client/surf/surf-0.6-r1.ebuild | 63 ------------- |
16 |
www-client/surf/surf-0.7-r1.ebuild | 72 --------------- |
17 |
5 files changed, 354 deletions(-) |
18 |
|
19 |
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest |
20 |
index ab5738436d7..a9e0de2717d 100644 |
21 |
--- a/www-client/surf/Manifest |
22 |
+++ b/www-client/surf/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST surf-0.6.tar.gz 14781 SHA256 fdc1ccfaee5c4f008eeb8fe5f9200d3ad71296e8d7af52bdd6a771f111866805 SHA512 f3550535351e37296280d33d229998e1f00aa605d0dab4a58944cf213721e823a1cfd9134b7bca2a4d61e265122a30d5dc917a290163ed8af2b24cd75d41a100 WHIRLPOOL 2a163d450b47b4964ce3686d76bf6e3a747984f0e86f84e2dccfa9d3e885bc26adf0100cdef48ae19d91f34a2d14d6c4950d2a7db7d333612e2b1fc48b077f99 |
25 |
-DIST surf-0.7.tar.gz 18792 SHA256 95608546fb64d01c7a8153c356be0e284ebe120c3c596a94eb3f3ad47e1c494a SHA512 a6a0e172d99f8ce5a7eb63bd34ef3e55ae26059cc94148cf7c50ac665a5e64d90f4a6b1e71b73c1fa763dfaef9b50aaae79e924724f564b2ddf2b8aef4268ff6 WHIRLPOOL 6dbda75a102e108fb0d2910018b0b622189d3729326ba7ce69c4995c599f0d041bc5add771bdd27444752b6e627fcff6c546259e8605189f465e825578a9949b |
26 |
DIST surf-2.0.tar.gz 19056 SHA256 faee4c7a62c38fc9791eff1ad06787c3c9b2b79f338806827f5152a7bc54951d SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5 WHIRLPOOL 5cb76a924b0f1e97727321515deb84661f72ee892a7a34ceccdcc13fd6b994572021411b29603056af3f48efbbe66ee3318eab0828eb4a129366a5b79498eb0b |
27 |
|
28 |
diff --git a/www-client/surf/files/surf-0.6-gentoo.patch b/www-client/surf/files/surf-0.6-gentoo.patch |
29 |
deleted file mode 100644 |
30 |
index cda644baa84..00000000000 |
31 |
--- a/www-client/surf/files/surf-0.6-gentoo.patch |
32 |
+++ /dev/null |
33 |
@@ -1,133 +0,0 @@ |
34 |
---- a/config.mk |
35 |
-+++ b/config.mk |
36 |
-@@ -4,27 +4,27 @@ |
37 |
- # Customize below to fit your system |
38 |
- |
39 |
- # paths |
40 |
--PREFIX = /usr/local |
41 |
--MANPREFIX = ${PREFIX}/share/man |
42 |
-+PREFIX = /usr |
43 |
-+MANPREFIX = $(PREFIX)/share/man |
44 |
- |
45 |
--X11INC = /usr/X11R6/include |
46 |
--X11LIB = /usr/X11R6/lib |
47 |
-+X11INC = $(shell $(PKG_CONFIG) --cflags x11) |
48 |
-+X11LIB = $(shell $(PKG_CONFIG) --libs x11) |
49 |
- |
50 |
--GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0` |
51 |
--GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0` |
52 |
-+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 webkit-1.0) |
53 |
-+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 webkit-1.0) |
54 |
- |
55 |
- # includes and libs |
56 |
--INCS = -I. -I/usr/include -I${X11INC} ${GTKINC} |
57 |
--LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0 |
58 |
-+INCS = -I. -I/usr/include $(X11INC) $(GTKINC) |
59 |
-+LIBS = $(X11LIB) $(GTKLIB) |
60 |
- |
61 |
- # flags |
62 |
--CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE |
63 |
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} |
64 |
--LDFLAGS = -g ${LIBS} |
65 |
-+CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_BSD_SOURCE |
66 |
-+CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS) |
67 |
-+LDFLAGS += $(LIBS) |
68 |
- |
69 |
- # Solaris |
70 |
--#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" |
71 |
--#LDFLAGS = ${LIBS} |
72 |
-+#CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\" |
73 |
-+#LDFLAGS = $(LIBS) |
74 |
- |
75 |
- # compiler and linker |
76 |
--CC = cc |
77 |
-+CC ?= gcc |
78 |
---- a/Makefile |
79 |
-+++ b/Makefile |
80 |
-@@ -4,58 +4,58 @@ |
81 |
- include config.mk |
82 |
- |
83 |
- SRC = surf.c |
84 |
--OBJ = ${SRC:.c=.o} |
85 |
-+OBJ = $(SRC:.c=.o) |
86 |
- |
87 |
- all: options surf |
88 |
- |
89 |
- options: |
90 |
- @echo surf build options: |
91 |
-- @echo "CFLAGS = ${CFLAGS}" |
92 |
-- @echo "LDFLAGS = ${LDFLAGS}" |
93 |
-- @echo "CC = ${CC}" |
94 |
-+ @echo "CFLAGS = $(CFLAGS)" |
95 |
-+ @echo "LDFLAGS = $(LDFLAGS)" |
96 |
-+ @echo "CC = $(CC)" |
97 |
- |
98 |
- .c.o: |
99 |
- @echo CC $< |
100 |
-- @${CC} -c ${CFLAGS} $< |
101 |
-+ $(CC) -c $(CFLAGS) $< |
102 |
- |
103 |
--${OBJ}: config.h config.mk |
104 |
-+$(OBJ): config.h config.mk |
105 |
- |
106 |
- config.h: |
107 |
- @echo creating $@ from config.def.h |
108 |
-- @cp config.def.h $@ |
109 |
-+ cp config.def.h $@ |
110 |
- |
111 |
--surf: ${OBJ} |
112 |
-+surf: $(OBJ) |
113 |
- @echo CC -o $@ |
114 |
-- @${CC} -o $@ surf.o ${LDFLAGS} |
115 |
-+ $(CC) -o $@ surf.o $(LDFLAGS) |
116 |
- |
117 |
- clean: |
118 |
- @echo cleaning |
119 |
-- @rm -f surf ${OBJ} surf-${VERSION}.tar.gz |
120 |
-+ rm -f surf $(OBJ) surf-$(VERSION).tar.gz |
121 |
- |
122 |
- dist: clean |
123 |
- @echo creating dist tarball |
124 |
-- @mkdir -p surf-${VERSION} |
125 |
-- @cp -R LICENSE Makefile config.mk config.def.h README \ |
126 |
-+ mkdir -p surf-$(VERSION) |
127 |
-+ cp -R LICENSE Makefile config.mk config.def.h README \ |
128 |
- surf-open.sh arg.h TODO.md surf.png \ |
129 |
-- surf.1 ${SRC} surf-${VERSION} |
130 |
-- @tar -cf surf-${VERSION}.tar surf-${VERSION} |
131 |
-- @gzip surf-${VERSION}.tar |
132 |
-- @rm -rf surf-${VERSION} |
133 |
-+ surf.1 $(SRC) surf-$(VERSION) |
134 |
-+ tar -cf surf-$(VERSION).tar surf-$(VERSION) |
135 |
-+ gzip surf-$(VERSION).tar |
136 |
-+ rm -rf surf-$(VERSION) |
137 |
- |
138 |
- install: all |
139 |
-- @echo installing executable file to ${DESTDIR}${PREFIX}/bin |
140 |
-- @mkdir -p ${DESTDIR}${PREFIX}/bin |
141 |
-- @cp -f surf ${DESTDIR}${PREFIX}/bin |
142 |
-- @chmod 755 ${DESTDIR}${PREFIX}/bin/surf |
143 |
-- @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 |
144 |
-- @mkdir -p ${DESTDIR}${MANPREFIX}/man1 |
145 |
-- @sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1 |
146 |
-- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1 |
147 |
-+ @echo installing executable file to $(DESTDIR)$(PREFIX)/bin |
148 |
-+ mkdir -p $(DESTDIR)$(PREFIX)/bin |
149 |
-+ cp -f surf $(DESTDIR)$(PREFIX)/bin |
150 |
-+ chmod 755 $(DESTDIR)$(PREFIX)/bin/surf |
151 |
-+ @echo installing manual page to $(DESTDIR)$(MANPREFIX)/man1 |
152 |
-+ mkdir -p $(DESTDIR)$(MANPREFIX)/man1 |
153 |
-+ sed "s/VERSION/$(VERSION)/g" < surf.1 > $(DESTDIR)$(MANPREFIX)/man1/surf.1 |
154 |
-+ chmod 644 $(DESTDIR)$(MANPREFIX)/man1/surf.1 |
155 |
- |
156 |
- uninstall: |
157 |
-- @echo removing executable file from ${DESTDIR}${PREFIX}/bin |
158 |
-- @rm -f ${DESTDIR}${PREFIX}/bin/surf |
159 |
-- @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1 |
160 |
-- @rm -f ${DESTDIR}${MANPREFIX}/man1/surf.1 |
161 |
-+ @echo removing executable file from $(DESTDIR)$(PREFIX)/bin |
162 |
-+ rm -f $(DESTDIR)$(PREFIX)/bin/surf |
163 |
-+ @echo removing manual page from $(DESTDIR)$(MANPREFIX)/man1 |
164 |
-+ rm -f $(DESTDIR)$(MANPREFIX)/man1/surf.1 |
165 |
- |
166 |
- .PHONY: all options clean dist install uninstall |
167 |
|
168 |
diff --git a/www-client/surf/files/surf-0.7-gentoo.patch b/www-client/surf/files/surf-0.7-gentoo.patch |
169 |
deleted file mode 100644 |
170 |
index 0be4598f1c4..00000000000 |
171 |
--- a/www-client/surf/files/surf-0.7-gentoo.patch |
172 |
+++ /dev/null |
173 |
@@ -1,84 +0,0 @@ |
174 |
---- a/config.mk |
175 |
-+++ b/config.mk |
176 |
-@@ -4,27 +4,27 @@ |
177 |
- # Customize below to fit your system |
178 |
- |
179 |
- # paths |
180 |
--PREFIX = /usr/local |
181 |
-+PREFIX = /usr |
182 |
- MANPREFIX = ${PREFIX}/share/man |
183 |
- |
184 |
--X11INC = /usr/X11R6/include |
185 |
--X11LIB = /usr/X11R6/lib |
186 |
-+X11INC = $(shell $(PKG_CONFIG) --cflags x11) |
187 |
-+X11LIB = $(shell $(PKG_CONFIG) --libs x11) |
188 |
- |
189 |
--GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0` |
190 |
--GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0` |
191 |
-+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 webkit-1.0) |
192 |
-+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 webkit-1.0) |
193 |
- |
194 |
- # includes and libs |
195 |
--INCS = -I. -I/usr/include -I${X11INC} ${GTKINC} |
196 |
--LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0 |
197 |
-+INCS = -I. -I/usr/include ${X11INC} ${GTKINC} |
198 |
-+LIBS = ${X11LIB} ${GTKLIB} |
199 |
- |
200 |
- # flags |
201 |
- CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE |
202 |
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} |
203 |
--LDFLAGS = -g ${LIBS} |
204 |
-+CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS} |
205 |
-+LDFLAGS = ${LIBS} |
206 |
- |
207 |
- # Solaris |
208 |
- #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" |
209 |
- #LDFLAGS = ${LIBS} |
210 |
- |
211 |
- # compiler and linker |
212 |
--CC = cc |
213 |
-+CC ?= cc |
214 |
---- a/Makefile |
215 |
-+++ b/Makefile |
216 |
-@@ -15,18 +15,16 @@ |
217 |
- @echo "CC = ${CC}" |
218 |
- |
219 |
- .c.o: |
220 |
-- @echo CC $< |
221 |
-- @${CC} -c ${CFLAGS} $< |
222 |
-+ ${CC} -c ${CFLAGS} $< |
223 |
- |
224 |
- ${OBJ}: config.h config.mk |
225 |
- |
226 |
- config.h: |
227 |
- @echo creating $@ from config.def.h |
228 |
-- @cp config.def.h $@ |
229 |
-+ cp config.def.h $@ |
230 |
- |
231 |
- surf: ${OBJ} |
232 |
-- @echo CC -o $@ |
233 |
-- @${CC} -o $@ surf.o ${LDFLAGS} |
234 |
-+ ${CC} -o $@ surf.o ${LDFLAGS} |
235 |
- |
236 |
- clean: |
237 |
- @echo cleaning |
238 |
-@@ -44,13 +42,13 @@ |
239 |
- |
240 |
- install: all |
241 |
- @echo installing executable file to ${DESTDIR}${PREFIX}/bin |
242 |
-- @mkdir -p ${DESTDIR}${PREFIX}/bin |
243 |
-- @cp -f surf ${DESTDIR}${PREFIX}/bin |
244 |
-- @chmod 755 ${DESTDIR}${PREFIX}/bin/surf |
245 |
-+ mkdir -p ${DESTDIR}${PREFIX}/bin |
246 |
-+ cp -f surf ${DESTDIR}${PREFIX}/bin |
247 |
-+ chmod 755 ${DESTDIR}${PREFIX}/bin/surf |
248 |
- @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 |
249 |
-- @mkdir -p ${DESTDIR}${MANPREFIX}/man1 |
250 |
-- @sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1 |
251 |
-- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1 |
252 |
-+ mkdir -p ${DESTDIR}${MANPREFIX}/man1 |
253 |
-+ sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1 |
254 |
-+ chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1 |
255 |
- |
256 |
- uninstall: |
257 |
- @echo removing executable file from ${DESTDIR}${PREFIX}/bin |
258 |
|
259 |
diff --git a/www-client/surf/surf-0.6-r1.ebuild b/www-client/surf/surf-0.6-r1.ebuild |
260 |
deleted file mode 100644 |
261 |
index 00244e9e1cd..00000000000 |
262 |
--- a/www-client/surf/surf-0.6-r1.ebuild |
263 |
+++ /dev/null |
264 |
@@ -1,63 +0,0 @@ |
265 |
-# Copyright 1999-2013 Gentoo Foundation |
266 |
-# Distributed under the terms of the GNU General Public License v2 |
267 |
- |
268 |
-EAPI=5 |
269 |
-inherit eutils savedconfig toolchain-funcs |
270 |
- |
271 |
-DESCRIPTION="a simple web browser based on WebKit/GTK+" |
272 |
-HOMEPAGE="http://surf.suckless.org/" |
273 |
-SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz" |
274 |
- |
275 |
-LICENSE="MIT" |
276 |
-SLOT="0" |
277 |
-KEYWORDS="amd64 x86" |
278 |
- |
279 |
-COMMON_DEPEND=" |
280 |
- dev-libs/glib:2 |
281 |
- net-libs/libsoup |
282 |
- net-libs/webkit-gtk:2 |
283 |
- x11-libs/gtk+:2 |
284 |
- x11-libs/libX11 |
285 |
-" |
286 |
-DEPEND=" |
287 |
- ${COMMON_DEPEND} |
288 |
- virtual/pkgconfig |
289 |
-" |
290 |
-RDEPEND=" |
291 |
- !sci-chemistry/surf |
292 |
- ${COMMON_DEPEND} |
293 |
- x11-apps/xprop |
294 |
- x11-misc/dmenu |
295 |
-" |
296 |
- |
297 |
-pkg_setup() { |
298 |
- if ! use savedconfig; then |
299 |
- elog "The default config.h assumes you have" |
300 |
- elog " net-misc/curl" |
301 |
- elog " x11-terms/st" |
302 |
- elog "installed to support the download function." |
303 |
- elog "Without those, downloads will fail (gracefully)." |
304 |
- elog "You can fix this by:" |
305 |
- elog "1) Installing these packages, or" |
306 |
- elog "2) Setting USE=savedconfig and changing config.h accordingly." |
307 |
- fi |
308 |
-} |
309 |
- |
310 |
-src_prepare() { |
311 |
- epatch "${FILESDIR}"/${P}-gentoo.patch |
312 |
- epatch_user |
313 |
- restore_config config.h |
314 |
- tc-export CC PKG_CONFIG |
315 |
-} |
316 |
- |
317 |
-src_install() { |
318 |
- default |
319 |
- save_config config.h |
320 |
-} |
321 |
- |
322 |
-pkg_postinst() { |
323 |
- if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 0.4.1-r1 ]]; then |
324 |
- ewarn "Please correct the permissions of your \$HOME/.surf/ directory" |
325 |
- ewarn "and its contents to no longer be world readable (see bug #404983)" |
326 |
- fi |
327 |
-} |
328 |
|
329 |
diff --git a/www-client/surf/surf-0.7-r1.ebuild b/www-client/surf/surf-0.7-r1.ebuild |
330 |
deleted file mode 100644 |
331 |
index d5f2405feb1..00000000000 |
332 |
--- a/www-client/surf/surf-0.7-r1.ebuild |
333 |
+++ /dev/null |
334 |
@@ -1,72 +0,0 @@ |
335 |
-# Copyright 1999-2017 Gentoo Foundation |
336 |
-# Distributed under the terms of the GNU General Public License v2 |
337 |
- |
338 |
-EAPI=6 |
339 |
-inherit savedconfig toolchain-funcs |
340 |
- |
341 |
-DESCRIPTION="a simple web browser based on WebKit/GTK+" |
342 |
-HOMEPAGE="http://surf.suckless.org/" |
343 |
-SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz" |
344 |
- |
345 |
-LICENSE="MIT" |
346 |
-SLOT="0" |
347 |
-KEYWORDS="~amd64 ~x86" |
348 |
- |
349 |
-COMMON_DEPEND=" |
350 |
- dev-libs/glib:2 |
351 |
- net-libs/libsoup |
352 |
- net-libs/webkit-gtk:2 |
353 |
- x11-libs/gtk+:2 |
354 |
- x11-libs/libX11 |
355 |
-" |
356 |
-DEPEND=" |
357 |
- ${COMMON_DEPEND} |
358 |
- virtual/pkgconfig |
359 |
-" |
360 |
-RDEPEND=" |
361 |
- !sci-chemistry/surf |
362 |
- ${COMMON_DEPEND} |
363 |
- x11-apps/xprop |
364 |
- x11-misc/dmenu |
365 |
- !savedconfig? ( |
366 |
- net-misc/curl |
367 |
- x11-terms/st |
368 |
- ) |
369 |
-" |
370 |
-PATCHES=( |
371 |
- "${FILESDIR}"/${PN}-0.7-gentoo.patch |
372 |
-) |
373 |
- |
374 |
-pkg_setup() { |
375 |
- if ! use savedconfig; then |
376 |
- elog "The default config.h assumes you have" |
377 |
- elog " net-misc/curl" |
378 |
- elog " x11-terms/st" |
379 |
- elog "installed to support the download function." |
380 |
- elog "Without those, downloads will fail (gracefully)." |
381 |
- elog "You can fix this by:" |
382 |
- elog "1) Installing these packages, or" |
383 |
- elog "2) Setting USE=savedconfig and changing config.h accordingly." |
384 |
- fi |
385 |
-} |
386 |
- |
387 |
-src_prepare() { |
388 |
- default |
389 |
- |
390 |
- restore_config config.h |
391 |
- |
392 |
- tc-export CC PKG_CONFIG |
393 |
-} |
394 |
- |
395 |
-src_install() { |
396 |
- default |
397 |
- |
398 |
- save_config config.h |
399 |
-} |
400 |
- |
401 |
-pkg_postinst() { |
402 |
- if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 0.4.1-r1 ]]; then |
403 |
- ewarn "Please correct the permissions of your \$HOME/.surf/ directory" |
404 |
- ewarn "and its contents to no longer be world readable (see bug #404983)" |
405 |
- fi |
406 |
-} |