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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/xmw:master commit in: www-client/netsurf/
@ 2011-05-03 20:50 Michael Weber
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Weber @ 2011-05-03 20:50 UTC (permalink / raw
  To: gentoo-commits

commit:     69f69441ff30eadc47b447d86105694c057c7642
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 20:49:49 2011 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue May  3 20:49:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=69f69441

www-client/netsurf: initial import

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

---
 www-client/netsurf/ChangeLog          |    8 +++++
 www-client/netsurf/Manifest           |   14 +++++++++
 www-client/netsurf/metadata.xml       |    6 ++++
 www-client/netsurf/netsurf-2.7.ebuild |   53 +++++++++++++++++++++++---------
 4 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog
new file mode 100644
index 0000000..276b5c7
--- /dev/null
+++ b/www-client/netsurf/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for www-client/netsurf
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  03 May 2011; Michael Weber <xmw@gentoo.org> netsurf-2.7.ebuild:
+  Initial import, bug 347471, thanks to inciner@gmail.com for the initial
+  ebuild
+

diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
new file mode 100644
index 0000000..31a1b1e
--- /dev/null
+++ b/www-client/netsurf/Manifest
@@ -0,0 +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 2936 RMD160 4223702c3d24d93ce294dcaefce7ae479fe5a227 SHA1 33de5b43977a952497e6f8c2088d98f08855acba SHA256 3d5327bb36ea9512575317541fe5b2165647ede08ed985423f752e83ab9cbf24
+MISC ChangeLog 269 RMD160 333881c549ec1954c45118afdea9179883315704 SHA1 3a6910b41b80624058a5f07b62a1e40dd88e6020 SHA256 3178a5b4169d6adbd45926ec17e6f6b55ee49101ae53cec07ff5b90e8d7ff056
+MISC metadata.xml 762 RMD160 95f45ec4c54f381261156bb07c6010677e954d30 SHA1 aceb26cd54204b011409361456e6f7a273598488 SHA256 1a6414246cf7295476d133fdab06395aed4a01f741a89ea27be533a4bd0bd313
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk3AamwACgkQknrdDGLu8JAsfwEAk2kulnmtrjJyagql/i/m8ZfA
+s7rzoXijz+cXVs/5yOMA/19xMkub1GNDlK4RZhqL94sHqlxUjnreTO5g78fqBgtV
+=jeuF
+-----END PGP SIGNATURE-----

diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index e4b882b..49561ff 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -6,6 +6,12 @@
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
+<use>
+  <flag name='bmp'>enable bmp bitmap support</flag>
+  <flag name='rosprite'>enable RISC OS Sprite bitmap support</flag>
+  <flag name='svgtiny'>enable svg support via media-libs/svgatiny</flag>
+  <flag name='webp'>enable WebP image support</flag>
+</use>
 <longdescription lang="en">
 NetSurf is a free, open source web browser. It is written in C, has its own layout and rendering engine entirely written from scratch. It is small and capable of handling many of the web standards in use today.
 </longdescription>

diff --git a/www-client/netsurf/netsurf-2.7.ebuild b/www-client/netsurf/netsurf-2.7.ebuild
index dc4ba1e..8ed7a8a 100644
--- a/www-client/netsurf/netsurf-2.7.ebuild
+++ b/www-client/netsurf/netsurf-2.7.ebuild
@@ -11,18 +11,36 @@ HOMEPAGE="http://www.netsurf-browser.org"
 
 LICENSE="MIT GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE="bmp fbcon freetype gif gtk jpeg mng pdf png svg webp"
+IUSE="bmp fbcon gif gtk jpeg mng pdf png rosprite svg svgtiny truetype webp"
 
-RDEPEND="media-fonts/dejavu"
-DEPEND="${RDEPEND}
-	net-libs/hubbub
+RDEPEND="media-fonts/dejavu
+	dev-libs/libcss
+	dev-libs/libxml2
 	bmp? ( media-libs/libnsbmp )
+	fbcon? ( dev-libs/libnsfb )
 	gif? ( media-libs/libnsgif )
-	pdf? ( media-libs/libharu )
-"
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg )
+	pdf? ( media-libs/libharu:2 )
+	png? ( media-libs/libpng )
+	svg? (
+		!svgtiny? ( gnome-base/librsvg:2 )
+		svgtiny? ( media-libs/libsvgtiny ) )
+	truetype? ( media-libs/freetype )
+	webp? ( media-libs/libwebp )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	net-libs/hubbub
+	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
 	sed -e "/cp nsgtk/s:netsurf:nsgtk.real:" \
@@ -35,7 +53,7 @@ src_prepare() {
 
 src_configure() {
 	netsurf_conf() {
-		echo "override $1" >> Makefile.config
+		echo "override $1" >> Makefile.config || die
 	}
 	netsurf_use() {
 		local val=${4:-NO}
@@ -49,23 +67,28 @@ src_configure() {
 	netsurf_use mng NETSURF_USE_MNG
 	netsurf_use pdf NETSURF_USE_HARU_PDF
 	netsurf_use png NETSURF_USE_PNG
-	netsurf_use svg NETSURF_USE_NSSVG NO NO
-	netsurf_use svg NETSURF_USE_RSVG YES NO
-	netsurf_use svg NETSURF_USE_ROSPRITE NO NO
+	if use svgtiny ; then
+		netsurf_use svg NETSURF_USE_NSSVG
+		netsurf_use svg NETSURF_USE_RSVG NO
+	else
+		netsurf_use svg NETSURF_USE_NSSVG NO
+		netsurf_use svg NETSURF_USE_RSVG
+	fi
+	netsurf_use rosprite NETSURF_USE_ROSPRITE
 	netsurf_use webp NETSURF_USE_WEBP
 	netsurf_conf "NETSURF_FB_FRONTEND := linux"
 }
 
 src_compile() {
-	use gtk && ( emake TARGET=gtk || die )
-	use fbcon && ( emake TARGET=framebuffer || die )
+	use gtk && { emake TARGET=gtk || die ; }
+	use fbcon && { emake TARGET=framebuffer || die ; }
 }
 
 src_install() {
 	if use gtk ; then
 		emake TARGET=gtk PREFIX="${ED}usr" install || die
 
-		echo "#!/bin/sh" >> nsgtk || die
+		echo "#!/bin/sh" > nsgtk || die
 		echo "NETSURFRES=${EPREFIX}/usr/share/netsurf ${EPREFIX}/usr/bin/nsgtk.real \"\$@\"" >> nsgtk || die
 		dobin nsgtk || die
 
@@ -75,9 +98,9 @@ src_install() {
 	fi
 
 	if use fbcon ; then
-		emake TARGET=framebuffer PREFIX="${D}" install || die
+		emake TARGET=framebuffer PREFIX="${ED}usr" install || die
 
-		echo "#!/bin/sh" >> nsgtk || die
+		echo "#!/bin/sh" > nsfb || die
 		echo "NETSURFRES=${EPREFIX}/usr/share/netsurf ${EPREFIX}/usr/bin/nsfb.real \"\$@\"" >> nsfb || die
 		dobin nsfb || die
 



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] dev/xmw:master commit in: www-client/netsurf/
@ 2011-05-03 21:13 Michael Weber
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Weber @ 2011-05-03 21:13 UTC (permalink / raw
  To: gentoo-commits

commit:     357bbc7c3c93f539ee294f9ae9454f119f11749e
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 21:12:58 2011 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue May  3 21:12:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=357bbc7c

www-client/netsurf: fixed SRC_URI

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

---
 www-client/netsurf/ChangeLog          |    3 +++
 www-client/netsurf/Manifest           |   10 +++++-----
 www-client/netsurf/netsurf-2.7.ebuild |    1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog
index 276b5c7..956ec13 100644
--- a/www-client/netsurf/ChangeLog
+++ b/www-client/netsurf/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   03 May 2011; Michael Weber <xmw@gentoo.org> netsurf-2.7.ebuild:
+  fixed SRC_URI
+
+  03 May 2011; Michael Weber <xmw@gentoo.org> netsurf-2.7.ebuild:
   Initial import, bug 347471, thanks to inciner@gmail.com for the initial
   ebuild
 

diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 31a1b1e..7a41674 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 DIST netsurf-2.7-src.tar.gz 2446099 RMD160 007cf1c8754d61296ad367008c1ed09ed45be50c SHA1 a3e2816686fc2e3d93cdc77271dd4c33dc0e5300 SHA256 54f872cf948f97b768dfd062e44f148bf263483660f7cb604ec07c835e4b0c07
-EBUILD netsurf-2.7.ebuild 2936 RMD160 4223702c3d24d93ce294dcaefce7ae479fe5a227 SHA1 33de5b43977a952497e6f8c2088d98f08855acba SHA256 3d5327bb36ea9512575317541fe5b2165647ede08ed985423f752e83ab9cbf24
-MISC ChangeLog 269 RMD160 333881c549ec1954c45118afdea9179883315704 SHA1 3a6910b41b80624058a5f07b62a1e40dd88e6020 SHA256 3178a5b4169d6adbd45926ec17e6f6b55ee49101ae53cec07ff5b90e8d7ff056
+EBUILD netsurf-2.7.ebuild 3012 RMD160 2576ae4f06e0b1f354ae152dd139b6ef0968c75d SHA1 465e169327f913fd85c4129f8811432e7e656cd0 SHA256 3307978e8f3c98ceede8bd0354b5bf281db0de60d4e3bc4ffc456593711481ce
+MISC ChangeLog 352 RMD160 c0a40dce2c1b8f85f46ebd0df2a648b65a6eed44 SHA1 f541cc010b1c95820d7166f13e722bd4fe83359f SHA256 c0c67b260fc7c1363c2d53638a59a4a3fc663f1f6040e0e83e0533fbcd32a399
 MISC metadata.xml 762 RMD160 95f45ec4c54f381261156bb07c6010677e954d30 SHA1 aceb26cd54204b011409361456e6f7a273598488 SHA256 1a6414246cf7295476d133fdab06395aed4a01f741a89ea27be533a4bd0bd313
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3AamwACgkQknrdDGLu8JAsfwEAk2kulnmtrjJyagql/i/m8ZfA
-s7rzoXijz+cXVs/5yOMA/19xMkub1GNDlK4RZhqL94sHqlxUjnreTO5g78fqBgtV
-=jeuF
+iF4EAREIAAYFAk3Ab9kACgkQknrdDGLu8JC1xgD/YWSXYULDJrqL1aoYrtvqsQBb
+VBcUdQSR7fUxHJzXYr8A/3ujBatCdZtOLA+TYEeL9hwwAYd2J8yA9CEFTlijvAI2
+=A3QI
 -----END PGP SIGNATURE-----

diff --git a/www-client/netsurf/netsurf-2.7.ebuild b/www-client/netsurf/netsurf-2.7.ebuild
index 8ed7a8a..5dc8331 100644
--- a/www-client/netsurf/netsurf-2.7.ebuild
+++ b/www-client/netsurf/netsurf-2.7.ebuild
@@ -8,6 +8,7 @@ inherit eutils netsurf
 
 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"
 
 LICENSE="MIT GPL-2"
 KEYWORDS="~amd64 ~x86"



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] dev/xmw:master commit in: www-client/netsurf/
@ 2011-05-03 22:56 Michael Weber
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Weber @ 2011-05-03 22:56 UTC (permalink / raw
  To: gentoo-commits

commit:     27a2126ea6d281df15b1a017513fde1c36a095e2
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 22:56:29 2011 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue May  3 22:56:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=27a2126e

www-client/netsurf: net-libs/hubbub is RDEP

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

---
 www-client/netsurf/ChangeLog          |    3 +++
 www-client/netsurf/Manifest           |   10 +++++-----
 www-client/netsurf/netsurf-2.7.ebuild |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog
index 956ec13..4ede6b6 100644
--- a/www-client/netsurf/ChangeLog
+++ b/www-client/netsurf/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   03 May 2011; Michael Weber <xmw@gentoo.org> netsurf-2.7.ebuild:
+  net-libs/hubbub is RDEP, too
+
+  03 May 2011; Michael Weber <xmw@gentoo.org> netsurf-2.7.ebuild:
   fixed SRC_URI
 
   03 May 2011; Michael Weber <xmw@gentoo.org> netsurf-2.7.ebuild:

diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 7a41674..cc43402 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 DIST netsurf-2.7-src.tar.gz 2446099 RMD160 007cf1c8754d61296ad367008c1ed09ed45be50c SHA1 a3e2816686fc2e3d93cdc77271dd4c33dc0e5300 SHA256 54f872cf948f97b768dfd062e44f148bf263483660f7cb604ec07c835e4b0c07
-EBUILD netsurf-2.7.ebuild 3012 RMD160 2576ae4f06e0b1f354ae152dd139b6ef0968c75d SHA1 465e169327f913fd85c4129f8811432e7e656cd0 SHA256 3307978e8f3c98ceede8bd0354b5bf281db0de60d4e3bc4ffc456593711481ce
-MISC ChangeLog 352 RMD160 c0a40dce2c1b8f85f46ebd0df2a648b65a6eed44 SHA1 f541cc010b1c95820d7166f13e722bd4fe83359f SHA256 c0c67b260fc7c1363c2d53638a59a4a3fc663f1f6040e0e83e0533fbcd32a399
+EBUILD netsurf-2.7.ebuild 3012 RMD160 418a38a4571a9868ad9b2df5bff82c2181531c4c SHA1 4b4efd60bb1469b94068a7b9a4390408345afe1d SHA256 881214bd895fd11c5eb85aebc157105a578d01873c42dbae5eaecf9eff9bd8cb
+MISC ChangeLog 450 RMD160 b2d48bc8ebd19ed5d9f885c298c94db6ddf047b1 SHA1 01e151d307c79e52b5b3cb63f8bf930fe2bba866 SHA256 b2eb4128febcc65ee6172ec8c4eb9c73dc046a0640471231b374c352ad384e24
 MISC metadata.xml 762 RMD160 95f45ec4c54f381261156bb07c6010677e954d30 SHA1 aceb26cd54204b011409361456e6f7a273598488 SHA256 1a6414246cf7295476d133fdab06395aed4a01f741a89ea27be533a4bd0bd313
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3Ab9kACgkQknrdDGLu8JC1xgD/YWSXYULDJrqL1aoYrtvqsQBb
-VBcUdQSR7fUxHJzXYr8A/3ujBatCdZtOLA+TYEeL9hwwAYd2J8yA9CEFTlijvAI2
-=A3QI
+iF4EAREIAAYFAk3AiBwACgkQknrdDGLu8JDJ5QD/ZJtv28ZDb6KUZEh4cCXuV7CL
+eOomqjaMNx/dB5RoIpcA/0sRFNCw+GYPV2cqq+ekhc6z4bVKhAoJSERnGJbH1WEm
+=enkn
 -----END PGP SIGNATURE-----

diff --git a/www-client/netsurf/netsurf-2.7.ebuild b/www-client/netsurf/netsurf-2.7.ebuild
index 5dc8331..6435aa1 100644
--- a/www-client/netsurf/netsurf-2.7.ebuild
+++ b/www-client/netsurf/netsurf-2.7.ebuild
@@ -17,6 +17,7 @@ IUSE="bmp fbcon gif gtk jpeg mng pdf png rosprite svg svgtiny truetype webp"
 RDEPEND="media-fonts/dejavu
 	dev-libs/libcss
 	dev-libs/libxml2
+	net-libs/hubbub
 	bmp? ( media-libs/libnsbmp )
 	fbcon? ( dev-libs/libnsfb )
 	gif? ( media-libs/libnsgif )
@@ -31,7 +32,6 @@ RDEPEND="media-fonts/dejavu
 	webp? ( media-libs/libwebp )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	net-libs/hubbub
 	rosprite? ( media-libs/librosprite )"
 
 S=${WORKDIR}/${PN}



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] dev/xmw:master commit in: www-client/netsurf/
@ 2012-04-29  3:30 Michael Weber
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Weber @ 2012-04-29  3:30 UTC (permalink / raw
  To: gentoo-commits

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
 }



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] dev/xmw:master commit in: www-client/netsurf/
@ 2012-07-18 23:43 Michael Weber
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Weber @ 2012-07-18 23:43 UTC (permalink / raw
  To: gentoo-commits

commit:     ea4f6b39eea766ad14aeb352f94d66ac99d81abd
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 18 23:42:00 2012 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Jul 18 23:42:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=ea4f6b39

www-client/netsurf: moved to tree

---
 www-client/netsurf/ChangeLog                 |   20 -----
 www-client/netsurf/Manifest                  |   14 ---
 www-client/netsurf/metadata.xml              |   19 ----
 www-client/netsurf/netsurf-2.8_p13896.ebuild |  114 --------------------------
 4 files changed, 0 insertions(+), 167 deletions(-)

diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog
deleted file mode 100644
index 519d74e..0000000
--- a/www-client/netsurf/ChangeLog
+++ /dev/null
@@ -1,20 +0,0 @@
-# ChangeLog for www-client/netsurf
-# 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
-
-  03 May 2011; Michael Weber <xmw@gentoo.org> netsurf-2.7.ebuild:
-  fixed SRC_URI
-
-  03 May 2011; Michael Weber <xmw@gentoo.org> netsurf-2.7.ebuild:
-  Initial import, bug 347471, thanks to inciner@gmail.com for the initial
-  ebuild
-

diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
deleted file mode 100644
index a825580..0000000
--- a/www-client/netsurf/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-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)
-
-iF4EAREIAAYFAk+ctSQACgkQknrdDGLu8JD/UAD/bDvANenL5/uI85PDRehTrf3E
-Zl8Kxt3OlJi97Gqr6bQA/3lRv4/y7BbbZyvIekjOQT25opr0R4kmxai/fVwKQoZP
-=wrP6
------END PGP SIGNATURE-----

diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
deleted file mode 100644
index 49561ff..0000000
--- a/www-client/netsurf/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-<use>
-  <flag name='bmp'>enable bmp bitmap support</flag>
-  <flag name='rosprite'>enable RISC OS Sprite bitmap support</flag>
-  <flag name='svgtiny'>enable svg support via media-libs/svgatiny</flag>
-  <flag name='webp'>enable WebP image support</flag>
-</use>
-<longdescription lang="en">
-NetSurf is a free, open source web browser. It is written in C, has its own layout and rendering engine entirely written from scratch. It is small and capable of handling many of the web standards in use today.
-</longdescription>
-</pkgmetadata>
-

diff --git a/www-client/netsurf/netsurf-2.8_p13896.ebuild b/www-client/netsurf/netsurf-2.8_p13896.ebuild
deleted file mode 100644
index 1865fb4..0000000
--- a/www-client/netsurf/netsurf-2.8_p13896.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils netsurf toolchain-funcs
-
-DESCRIPTION="a free, open source web browser"
-HOMEPAGE="http://www.netsurf-browser.org"
-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="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 )
-	png? ( media-libs/libpng )
-	svg? (
-		!svgtiny? ( gnome-base/librsvg:2 )
-		svgtiny? ( media-libs/libsvgtiny ) )
-	truetype? ( media-libs/freetype )
-	webp? ( media-libs/libwebp )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	rosprite? ( media-libs/librosprite )"
-
-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() {
-	netsurf_conf() {
-		echo "override $1" >> Makefile.config || die
-	}
-	netsurf_use() {
-		local val=${4:-NO}
-		use $1 && val=${3:-YES}
-		echo "override $2 := $val" >> Makefile.config || die
-	}
-	netsurf_use bmp NETSURF_USE_BMP
-	netsurf_use freetype NETSURF_FB_FONTLIB freetype internal
-	netsurf_use gif NETSURF_USE_GIF
-	netsurf_use jpeg NETSURF_USE_JPEG
-	netsurf_use mng NETSURF_USE_MNG
-	netsurf_use pdf NETSURF_USE_HARU_PDF
-	netsurf_use png NETSURF_USE_PNG
-	if use svgtiny ; then
-		netsurf_use svg NETSURF_USE_NSSVG
-		netsurf_use svg NETSURF_USE_RSVG NO
-	else
-		netsurf_use svg NETSURF_USE_NSSVG NO
-		netsurf_use svg NETSURF_USE_RSVG
-	fi
-	netsurf_use rosprite NETSURF_USE_ROSPRITE
-	netsurf_use webp NETSURF_USE_WEBP
-	netsurf_conf "NETSURF_FB_FRONTEND := linux"
-}
-
-src_compile() {
-	use gtk && emake TARGET=gtk
-	use fbcon && emake TARGET=framebuffer
-}
-
-src_install() {
-	if use gtk ; then
-		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
-
-		insinto /usr/share/pixmaps
-		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
-
-		echo "#!/bin/sh" > nsfb || die
-		echo "NETSURFRES=${EPREFIX}/usr/share/netsurf ${EPREFIX}/usr/bin/nsfb.real \"\$@\"" >> nsfb || die
-		dobin nsfb
-
-		insinto /usr/share/pixmaps
-		doins gtk/res/netsurf.xpm
-		make_desktop_entry /usr/bin/nsfb NetSurf-fb netsurf "Network;WebBrowser"
-	fi
-
-	dodoc README
-}



^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-07-18 23:43 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-29  3:30 [gentoo-commits] dev/xmw:master commit in: www-client/netsurf/ Michael Weber
  -- strict thread matches above, loose matches on Subject: below --
2012-07-18 23:43 Michael Weber
2011-05-03 22:56 Michael Weber
2011-05-03 21:13 Michael Weber
2011-05-03 20:50 Michael Weber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox