| 1 |
jer 13/10/04 14:21:10 |
| 2 |
|
| 3 |
Modified: ChangeLog surf-0.6-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix underlinking (bug #486912). Roll a patch out of the sed scripts. Set PKG_CONFIG for cross-compile fun. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.30 www-client/surf/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/ChangeLog?rev=1.30&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/ChangeLog?rev=1.30&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/ChangeLog?r1=1.29&r2=1.30 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v |
| 19 |
retrieving revision 1.29 |
| 20 |
retrieving revision 1.30 |
| 21 |
diff -u -r1.29 -r1.30 |
| 22 |
--- ChangeLog 12 Sep 2013 15:33:09 -0000 1.29 |
| 23 |
+++ ChangeLog 4 Oct 2013 14:21:09 -0000 1.30 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for www-client/surf |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v 1.29 2013/09/12 15:33:09 jer Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v 1.30 2013/10/04 14:21:09 jer Exp $ |
| 29 |
+ |
| 30 |
+ 04 Oct 2013; Jeroen Roovers <jer@g.o> surf-0.6-r1.ebuild, |
| 31 |
+ +files/surf-0.6-gentoo.patch: |
| 32 |
+ Fix underlinking (bug #486912). Roll a patch out of the sed scripts. Set |
| 33 |
+ PKG_CONFIG for cross-compile fun. |
| 34 |
|
| 35 |
*surf-9999 (12 Sep 2013) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.3 www-client/surf/surf-0.6-r1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/surf-0.6-r1.ebuild?rev=1.3&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/surf-0.6-r1.ebuild?rev=1.3&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/surf-0.6-r1.ebuild?r1=1.2&r2=1.3 |
| 45 |
|
| 46 |
Index: surf-0.6-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/www-client/surf/surf-0.6-r1.ebuild,v |
| 49 |
retrieving revision 1.2 |
| 50 |
retrieving revision 1.3 |
| 51 |
diff -u -r1.2 -r1.3 |
| 52 |
--- surf-0.6-r1.ebuild 12 Sep 2013 15:33:09 -0000 1.2 |
| 53 |
+++ surf-0.6-r1.ebuild 4 Oct 2013 14:21:09 -0000 1.3 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2013 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-0.6-r1.ebuild,v 1.2 2013/09/12 15:33:09 jer Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-0.6-r1.ebuild,v 1.3 2013/10/04 14:21:09 jer Exp $ |
| 59 |
|
| 60 |
EAPI=5 |
| 61 |
inherit eutils savedconfig toolchain-funcs |
| 62 |
@@ -14,18 +14,22 @@ |
| 63 |
KEYWORDS="~amd64 ~x86" |
| 64 |
IUSE="" |
| 65 |
|
| 66 |
-DEPEND=" |
| 67 |
+COMMON_DEPEND=" |
| 68 |
dev-libs/glib |
| 69 |
net-libs/libsoup |
| 70 |
net-libs/webkit-gtk:2 |
| 71 |
x11-libs/gtk+:2 |
| 72 |
x11-libs/libX11 |
| 73 |
" |
| 74 |
+DEPEND=" |
| 75 |
+ ${COMMON_DEPEND} |
| 76 |
+ virtual/pkgconfig |
| 77 |
+" |
| 78 |
RDEPEND=" |
| 79 |
+ ${COMMON_DEPEND} |
| 80 |
!sci-chemistry/surf |
| 81 |
x11-apps/xprop |
| 82 |
x11-misc/dmenu |
| 83 |
- ${DEPEND} |
| 84 |
" |
| 85 |
|
| 86 |
pkg_setup() { |
| 87 |
@@ -43,20 +47,13 @@ |
| 88 |
|
| 89 |
src_prepare() { |
| 90 |
epatch_user |
| 91 |
- sed -i \ |
| 92 |
- -e 's|{|(|g;s|}|)|g' \ |
| 93 |
- -e 's|\t@|\t|g;s|echo|@&|g' \ |
| 94 |
- -e 's|^LIBS.*|LIBS = $(GTKLIB) -lgthread-2.0|g' \ |
| 95 |
- -e 's|^LDFLAGS.*|LDFLAGS += $(LIBS)|g' \ |
| 96 |
- -e 's|^CC.*|CC ?= gcc|g' \ |
| 97 |
- -e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)|g' \ |
| 98 |
- config.mk Makefile || die |
| 99 |
+ epatch "${FILESDIR}"/${P}-gentoo.patch |
| 100 |
restore_config config.h |
| 101 |
- tc-export CC |
| 102 |
+ tc-export CC PKG_CONFIG |
| 103 |
} |
| 104 |
|
| 105 |
src_install() { |
| 106 |
- emake DESTDIR="${D}" PREFIX="/usr" install |
| 107 |
+ emake DESTDIR="${D}" install |
| 108 |
save_config config.h |
| 109 |
} |
Archives