[gentoo-commits] gentoo-x86 commit in www-client/surf: surf-9999.ebuild ChangeLog surf-0.6-r1.ebuild

[Jeroen Roovers (jer)]

jer         13/10/04 14:52:10

  Modified:             surf-9999.ebuild ChangeLog surf-0.6-r1.ebuild
  Log:
  Sync 0.6-r1 changes. Clean up 0.6-r1 some more.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.2                  www-client/surf/surf-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/surf-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/surf-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/surf-9999.ebuild?r1=1.1&r2=1.2

Index: surf-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/surf/surf-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- surf-9999.ebuild	12 Sep 2013 15:33:09 -0000	1.1
+++ surf-9999.ebuild	4 Oct 2013 14:52:10 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-9999.ebuild,v 1.1 2013/09/12 15:33:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-9999.ebuild,v 1.2 2013/10/04 14:52:10 jer Exp $
 
 EAPI=5
 inherit eutils git-2 savedconfig toolchain-funcs
@@ -13,18 +13,22 @@
 SLOT="0"
 KEYWORDS=""
 
-DEPEND="
+COMMON_DEPEND="
 	dev-libs/glib
 	net-libs/libsoup
 	net-libs/webkit-gtk:2
 	x11-libs/gtk+:2
 	x11-libs/libX11
 "
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
 RDEPEND="
 	!sci-chemistry/surf
+	${COMMON_DEPEND}
 	x11-apps/xprop
 	x11-misc/dmenu
-	${DEPEND}
 "
 
 pkg_setup() {
@@ -41,20 +45,13 @@
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 	epatch_user
-	sed -i \
-		-e 's|{|(|g;s|}|)|g' \
-		-e 's|\t@|\t|g;s|echo|@&|g' \
-		-e 's|^LIBS.*|LIBS = $(GTKLIB) -lgthread-2.0|g' \
-		-e 's|^LDFLAGS.*|LDFLAGS += $(LIBS)|g' \
-		-e 's|^CC.*|CC ?= gcc|g' \
-		-e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)|g' \
-		config.mk Makefile || die
 	restore_config config.h
-	tc-export CC
+	tc-export CC PKG_CONFIG
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	default
 	save_config config.h
 }



1.32                 www-client/surf/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/ChangeLog?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/ChangeLog?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/ChangeLog?r1=1.31&r2=1.32

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChangeLog	4 Oct 2013 14:35:29 -0000	1.31
+++ ChangeLog	4 Oct 2013 14:52:10 -0000	1.32
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/surf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v 1.31 2013/10/04 14:35:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v 1.32 2013/10/04 14:52:10 jer Exp $
+
+  04 Oct 2013; Jeroen Roovers <jer@g.o> surf-0.6-r1.ebuild,
+  surf-9999.ebuild, files/surf-0.6-gentoo.patch, +files/surf-9999-gentoo.patch:
+  Sync 0.6-r1 changes. Clean up 0.6-r1 some more.
 
   04 Oct 2013; Jeroen Roovers <jer@g.o> surf-0.6-r1.ebuild:
   Determine REPLACING_VERSIONS to conditionally call ewarn.



1.5                  www-client/surf/surf-0.6-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/surf-0.6-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/surf-0.6-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/surf-0.6-r1.ebuild?r1=1.4&r2=1.5

Index: surf-0.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/surf/surf-0.6-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- surf-0.6-r1.ebuild	4 Oct 2013 14:35:29 -0000	1.4
+++ surf-0.6-r1.ebuild	4 Oct 2013 14:52:10 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-0.6-r1.ebuild,v 1.4 2013/10/04 14:35:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-0.6-r1.ebuild,v 1.5 2013/10/04 14:52:10 jer Exp $
 
 EAPI=5
 inherit eutils savedconfig toolchain-funcs
@@ -12,7 +12,6 @@
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 COMMON_DEPEND="
 	dev-libs/glib
@@ -26,8 +25,8 @@
 	virtual/pkgconfig
 "
 RDEPEND="
-	${COMMON_DEPEND}
 	!sci-chemistry/surf
+	${COMMON_DEPEND}
 	x11-apps/xprop
 	x11-misc/dmenu
 "
@@ -40,20 +39,20 @@
 		elog "installed to support the download function."
 		elog "Without those, downloads will fail (gracefully)."
 		elog "You can fix this by:"
-		elog " 1) Installing these packages, or"
-		elog " 2) Setting USE=savedconfig and changing config.h accordingly."
+		elog "1) Installing these packages, or"
+		elog "2) Setting USE=savedconfig and changing config.h accordingly."
 	fi
 }
 
 src_prepare() {
-	epatch_user
 	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch_user
 	restore_config config.h
 	tc-export CC PKG_CONFIG
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	save_config config.h
 }