[gentoo-commits] dev/xmw:master commit in: www-client/netsurf/

["Michael Weber" <xmw@gentoo.org>]

commit:     ce0cdcefa8660da211ad69fc316b5a834d27f615
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 03:27:32 2012 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 03:27:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=ce0cdcef

www-client/netsurf: Version bump

(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key 62EEF090)

---
 www-client/netsurf/ChangeLog                       |    8 +++-
 www-client/netsurf/Manifest                        |   12 +++---
 ...etsurf-2.7.ebuild => netsurf-2.8_p13896.ebuild} |   48 ++++++++++----------
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog
index 4ede6b6..519d74e 100644
--- a/www-client/netsurf/ChangeLog
+++ b/www-client/netsurf/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for www-client/netsurf
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netsurf-2.8_p13896 (29 Apr 2012)
+
+  29 Apr 2012; Michael Weber <xmw@gentoo.org> -netsurf-2.7.ebuild,
+  +netsurf-2.8_p13896.ebuild:
+  Version bump
+
   03 May 2011; Michael Weber <xmw@gentoo.org> netsurf-2.7.ebuild:
   net-libs/hubbub is RDEP, too
 

diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index cc43402..a825580 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST netsurf-2.7-src.tar.gz 2446099 RMD160 007cf1c8754d61296ad367008c1ed09ed45be50c SHA1 a3e2816686fc2e3d93cdc77271dd4c33dc0e5300 SHA256 54f872cf948f97b768dfd062e44f148bf263483660f7cb604ec07c835e4b0c07
-EBUILD netsurf-2.7.ebuild 3012 RMD160 418a38a4571a9868ad9b2df5bff82c2181531c4c SHA1 4b4efd60bb1469b94068a7b9a4390408345afe1d SHA256 881214bd895fd11c5eb85aebc157105a578d01873c42dbae5eaecf9eff9bd8cb
-MISC ChangeLog 450 RMD160 b2d48bc8ebd19ed5d9f885c298c94db6ddf047b1 SHA1 01e151d307c79e52b5b3cb63f8bf930fe2bba866 SHA256 b2eb4128febcc65ee6172ec8c4eb9c73dc046a0640471231b374c352ad384e24
+DIST netsurf-2.8_p13896.tar.gz 5292691 RMD160 433830bf6a680ed22e9fbdf9b19175ae1e9961e3 SHA1 be6e1939b505838e03c05d526486587d97bae30d SHA256 9caa80fdacc6b409d0619867a3d1a9f0600d868553bc75031e6bc9ecb5926cb8
+EBUILD netsurf-2.8_p13896.ebuild 3188 RMD160 4f1bc58be2cbd8c18d256ed3ec34a88fe3b386fc SHA1 5b4b65b86c40fe16f42f83459b3c1d761868f33b SHA256 90e6eb66e1d305d2caf497678a0e730895389a512bd44684f9c65a3ddd07c711
+MISC ChangeLog 598 RMD160 a870d407c5b4dbba89950f85de3d00e1b27ea0ac SHA1 293084849781022b2a5ccc0fe9c24ca7f16f7388 SHA256 59d9f67dc0c28b843e38477adda65dcdd9a25064a926a6d884f704a94d108a00
 MISC metadata.xml 762 RMD160 95f45ec4c54f381261156bb07c6010677e954d30 SHA1 aceb26cd54204b011409361456e6f7a273598488 SHA256 1a6414246cf7295476d133fdab06395aed4a01f741a89ea27be533a4bd0bd313
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3AiBwACgkQknrdDGLu8JDJ5QD/ZJtv28ZDb6KUZEh4cCXuV7CL
-eOomqjaMNx/dB5RoIpcA/0sRFNCw+GYPV2cqq+ekhc6z4bVKhAoJSERnGJbH1WEm
-=enkn
+iF4EAREIAAYFAk+ctSQACgkQknrdDGLu8JD/UAD/bDvANenL5/uI85PDRehTrf3E
+Zl8Kxt3OlJi97Gqr6bQA/3lRv4/y7BbbZyvIekjOQT25opr0R4kmxai/fVwKQoZP
+=wrP6
 -----END PGP SIGNATURE-----

diff --git a/www-client/netsurf/netsurf-2.7.ebuild b/www-client/netsurf/netsurf-2.8_p13896.ebuild
similarity index 72%
rename from www-client/netsurf/netsurf-2.7.ebuild
rename to www-client/netsurf/netsurf-2.8_p13896.ebuild
index 6435aa1..1865fb4 100644
--- a/www-client/netsurf/netsurf-2.7.ebuild
+++ b/www-client/netsurf/netsurf-2.8_p13896.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit eutils netsurf
+inherit eutils netsurf toolchain-funcs
 
 DESCRIPTION="a free, open source web browser"
 HOMEPAGE="http://www.netsurf-browser.org"
-SRC_URI="http://www.netsurf-browser.org/downloads/releases/${P}-src.tar.gz"
+SRC_URI="http://xmw.de/mirror/${PN}/${P}.tar.gz"
 
 LICENSE="MIT GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="bmp fbcon gif gtk jpeg mng pdf png rosprite svg svgtiny truetype webp"
+REQUIRED_USE="|| ( fbcon gtk )"
 
-RDEPEND="media-fonts/dejavu
-	dev-libs/libcss
+RDEPEND="dev-libs/libcss
 	dev-libs/libxml2
+	media-fonts/dejavu
 	net-libs/hubbub
+	net-libs/libdom
 	bmp? ( media-libs/libnsbmp )
 	fbcon? ( dev-libs/libnsfb )
 	gif? ( media-libs/libnsgif )
 	gtk? ( x11-libs/gtk+:2 )
 	jpeg? ( virtual/jpeg )
-	pdf? ( media-libs/libharu:2 )
+	pdf? ( media-libs/libharu )
 	png? ( media-libs/libpng )
 	svg? (
 		!svgtiny? ( gnome-base/librsvg:2 )
@@ -34,22 +36,20 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	rosprite? ( media-libs/librosprite )"
 
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	if ! use fbcon && ! use gtk ; then
-		die "either enable fbcon or gtk use flags"
-	fi
-}
-
 src_prepare() {
 	netsurf_src_prepare
+	mv Makefile.config.override Makefile.config || die
 	sed -e "/cp nsgtk/s:netsurf:nsgtk.real:" \
 		-e "/cp -v/s:netsurf:nsfb.real:" \
 		-e "s:\@cp:cp:" \
 		-i Makefile || die
 	sed -e "/DEJAVU_PATH/s:truetype/ttf-::" \
 		-i framebuffer/font_freetype.c || die
+	sed -e '/^GTKCFLAGS/,+12s:--cflags openssl:--cflags openssl librsvg-2.0:' \
+		-i gtk/Makefile.target || die
+	sed -e '/CFLAGS/s:--cflags libcurl:--cflags libcurl librsvg-2.0 libwebp:' \
+		-e '/LDFLAGS/s:--libs libcss:--libs libcss librsvg-2.0 libwebp:' \
+		-i framebuffer/Makefile.target || die
 }
 
 src_configure() {
@@ -81,34 +81,34 @@ src_configure() {
 }
 
 src_compile() {
-	use gtk && { emake TARGET=gtk || die ; }
-	use fbcon && { emake TARGET=framebuffer || die ; }
+	use gtk && emake TARGET=gtk
+	use fbcon && emake TARGET=framebuffer
 }
 
 src_install() {
 	if use gtk ; then
-		emake TARGET=gtk PREFIX="${ED}usr" install || die
+		emake TARGET=gtk PREFIX="${ED}usr" install
 
 		echo "#!/bin/sh" > nsgtk || die
 		echo "NETSURFRES=${EPREFIX}/usr/share/netsurf ${EPREFIX}/usr/bin/nsgtk.real \"\$@\"" >> nsgtk || die
-		dobin nsgtk || die
+		dobin nsgtk
 
 		insinto /usr/share/pixmaps
-		doins gtk/res/netsurf.xpm || die
+		doins gtk/res/netsurf.xpm
 		make_desktop_entry /usr/bin/nsgtk NetSurf-gtk netsurf "Network;WebBrowser"
 	fi
 
 	if use fbcon ; then
-		emake TARGET=framebuffer PREFIX="${ED}usr" install || die
+		emake TARGET=framebuffer PREFIX="${ED}usr" install
 
 		echo "#!/bin/sh" > nsfb || die
 		echo "NETSURFRES=${EPREFIX}/usr/share/netsurf ${EPREFIX}/usr/bin/nsfb.real \"\$@\"" >> nsfb || die
-		dobin nsfb || die
+		dobin nsfb
 
 		insinto /usr/share/pixmaps
-		doins gtk/res/netsurf.xpm || die
+		doins gtk/res/netsurf.xpm
 		make_desktop_entry /usr/bin/nsfb NetSurf-fb netsurf "Network;WebBrowser"
 	fi
 
-	dodoc ChangeLog README || die
+	dodoc README
 }