Version bump (bug 543846, thanks avx)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 239 insertions, 5 deletions

diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog
index 2282f47598b2..cc36b18a4c30 100644
--- a/www-client/netsurf/ChangeLog
+++ b/www-client/netsurf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/netsurf
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.18 2015/03/17 08:06:01 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.19 2015/06/08 12:44:19 xmw Exp $
+
+*netsurf-3.3 (08 Jun 2015)
+
+  08 Jun 2015; Michael Weber <xmw@gentoo.org> +files/netsurf-3.3-CFLAGS.patch,
+  +netsurf-3.3.ebuild, files/netsurf-3.2-CFLAGS.patch:
+  Version bump (bug 543846, thanks avx)
 
   17 Mar 2015; Michael Weber <xmw@gentoo.org> netsurf-3.2-r1.ebuild:
   Add depend on dev-lang/spidermonkey (bug 518866, thanks Callum Burns and avx).
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index ebd403ef6758..02d066b97e68 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -9,16 +9,20 @@ AUX netsurf-3.0-framebuffer-pkgconfig.patch 1351 SHA256 a9572b016e029ef95181e984
 AUX netsurf-3.2-CFLAGS.patch 2651 SHA256 5e101eaf78ae018ebe6f3fdcf3aceb7f49a9c970741e26728dc270ee5cabed84 SHA512 aac8b118ce704ab4d85bd82e466b7b7802ac036ffb930d79b42a17574ed6b3bb2867b01827f47558d96b7e85ceb3ec0e1ce50e462713051354767c27e172c438 WHIRLPOOL d6c902daaf6a4174036ab367594c342f8d65ebf79bc97880f43930c3b6a57b6f435a819a1d82fc0103d9ef8de6efdc16f18d9bc3cddb70aefab8840020c5cced
 AUX netsurf-3.2-conditionally-include-image-headers.patch 1109 SHA256 2ac3b17b9aa784612560035ef983d3538e0fd5f24cf07b9765d8447d8eb06bf6 SHA512 aa17f815b65e8bf7da0d4a76fe030e702be608aea35232e314662e9665a41aed2bf2483bc1a485dad31171c1ef4532427757c424dab4068c32c665d44b041c17 WHIRLPOOL 197239418f2ef8e23f3278cd1428186df4757452d213ebf3d75cecc37451df33dabaea447c74169229570e29f07a8d32beefcaa9e430406ed07754a66b61b85d
 AUX netsurf-3.2-glibc2.20.patch 959 SHA256 d29e1769af114b83db8f9c140141f9d44218e490db849d19b89473be11332b48 SHA512 1841902de2807b0a310db535ddf85451f8f0a43e6c4c6c3908165a995823c70146bc059b37ba8b8302973aa9c63e0a8f8679d6b6a7c6688878d1a68a43953945 WHIRLPOOL 13b13ea68be4b4684524824be08ade18c7d9c9ca5d57df98c83e77de7b27a2888ae6bcf8e62dc7cdfb1b287436a89e5016f10b2db390681573d6f7c8bca2fa49
+AUX netsurf-3.3-CFLAGS.patch 2887 SHA256 ab01eb5a83a503ae85ca8620aba4f7076f8d97ddd0c18ec67a3a5bde29b293d4 SHA512 478351e4a73301e35e765a35e4b57185afce6cf32f37063959065afa62b648031dba47bd5d5fd6f15bee0b9134df0870ef13cd4c97b135ada4fcf02059881c6a WHIRLPOOL f0319ca566190c188be9122fdacfc3619c375c81b91d07c3810734b3ff086f9a3dfb59de881944ee85268b7a69c9ae3bc2a7d0e8365bfa579442d2d0e68363cc
 DIST netsurf-3.2-src.tar.gz 3232987 SHA256 04ffeb8335c59cbc23371b79ae3b178002e6e95c35225ef62db4b155ecc7e213 SHA512 d1ef15503bd7f59bea6a0bf41333e5da7a8657ab1cd6412b7cb9588b4d6e17908bd5f9b22e71c9e72574df9bb1aa5413a6ccd79a6bdd62ea5ff63c15876f1b60 WHIRLPOOL 98f343fefa39ab5f7f4e1d7e97305323d57bd4f0c1c97cee35e94f7d485d25b86b7012c95bfd2db88620f334ca2ce7cbe6eb4975cda7ac98a99f531bd10ed70b
+DIST netsurf-3.3-src.tar.gz 3198799 SHA256 23f92a0940f577b9605f2e54786fea3521680d32d6c00f2a3db1eae3f29e3686 SHA512 5796ce007d438309ef809dbb972cafab29efce04a22912bb3318a1cd93f6cca73ddb6ab2f7916c6819f7f63378a27180b380759611a3c88bf00d705a1dd9c5a6 WHIRLPOOL fb5793a7502c27a7adf6cfdcaa029be19e7d750039f7a901b9004cb2a6ea390cd76d1e3bec0598d9986ea4c0203bbb6dabbe8d71955c30becb827753d20f5156
 DIST netsurf-buildsystem-1.2.tar.gz 38914 SHA256 3903a4a1551c9c202e1d2047344c4f3598c8d9d6c35ebf8cc2e18874bd0c9d61 SHA512 963e8a5033e8ef70595507f24fea3d9697eefb50ad7f92a6d3c913501c7026f12ec6d48f92b75e352b32f212f6216b8d8455aff25fa8d8d0fc12a3b19a875a1c WHIRLPOOL e56a520ae284089d0f36f06a6891ebb5b208ca847c74340c18581340e457c20ae9365999dc13284f438b965dcd7e85f04b93d1c1f22cadf6f7c1e2cef81d528c
+DIST netsurf-buildsystem-1.3.tar.gz 37906 SHA256 10bbe95ba07476208da6047bd3c74685b6e61ba9904975b5d5c9a2c79a84ac79 SHA512 79ef3e366c4798dbb88021fd05019ba9fe50539b7482bd3d07422f4c0dbf2047b906f39a0b48deebbdf111d84d93a9364d08e5c97f91609363c27641db15e6b5 WHIRLPOOL c8131d0ffb79b208b63bef94606735968584edfff8cb24b4c83cd747c5d65c2811004626840798047ffddf84556ef7d8e23242f60d01a4a046323df3c78b0980
 DIST netsurf-fb.modes-example.gz 4586 SHA256 df1514790be120f27bd23dfdca71c24112679d45d3cbd3916f9231ec5e2596bb SHA512 753a707dc428212803dd64250bb723a498fdc1c328fdac4df38be533eab3af45f727cdc6b7ced3faaa0e82db182c4eab140b8e81b0d3cfe2152252b89e6d2981 WHIRLPOOL 5a91c32a712b746c993d2fa1d47625f16241e845d556b8113ab957eda7385ac5bdde5f78b0de2dad4df544c7d7c13d8145ebb9d81272af9a3759ad4e307c3767
 EBUILD netsurf-3.2-r1.ebuild 5124 SHA256 0fc76e49f9c8de9d73386cd2084f64311558d224a35ef88c386e3977603d362d SHA512 a0611c0991d43bd9bd019e1f2ac9574336da57985a234f5467b9b9a6f0df0f34980a4732b892e68bfbe4a6c34f4b0f701cb1f0862cb683999e0e6d6010674bbb WHIRLPOOL 5656fe2c34cdf63c63ff48c456fea201aeb5451f3052b2d787dc401ef99afe98a75c19becb84d5efbec15c84e9ee4f5730898856bbd5038f36984ff3498c12ea
-MISC ChangeLog 2825 SHA256 63f6c50a3a5796f912dcedc3d7422fae599281ffe70a1e06b1ddd624f78188ab SHA512 8881ad38d93464a556097087b1749d1216d513159d69a4ddfaff173fe15a28795aa77be64451ed4b10289548b2e5c69bf6b5b0d2a09fb26304e26e76c5f71ca0 WHIRLPOOL da06095edd54175b53fcad4f473352c090d8400358ed93f26e7f43c3689492005574ab64fc54de5d2b39d2957f5474c09027300a11c4727304d5ed8d0c82848c
+EBUILD netsurf-3.3.ebuild 5133 SHA256 4c901a021c5a805b35dadbbc9d55d99d7b85a137fae5f42266f95712147ec8d3 SHA512 1a613d219908ab9becf34661336af162162f131829c6793a768c7384c92e5db02b7dddf696fb7ff2e7492a93bcbf1bedcfe8ed17277662c9ba643f34ca629aea WHIRLPOOL eecf90034aac8a09373d8a97ce835b55037723845d8951cbbee3577ccf24204d341c0b2882caad0e662c79687dd21bf3d16c1d1a5bf71924611c15eb8d8f7dac
+MISC ChangeLog 3028 SHA256 d9f695afc56de102104da65764ea99f43c6f3ac3e3692a3515e51e25c4814874 SHA512 5ab8c7ab90bdb7f36d9fa05f0960f33be0ddedd5a14a56dcaaf7c8e047ddf68b2c8b81f21e3ff4fbc433ff3bae1b064ae8b637638bfb8ec7405c00098854a8bd WHIRLPOOL 53931f8ac6797f1c8af7507a41af6dd9d790dae58b50d29e9b64f8d1fb10d1c1e548a0b04cad5a63f3f37b9a32208c430519bf39928dcac5b38fcd13be9ac4bf
 MISC metadata.xml 1577 SHA256 f53de90c2188f6b757c2fdd700eaf1c25c642f708786c552449bd54c57da40f6 SHA512 4003d28e9ef15fe3f3a46080a2584986e166148a43f060cbc90bbcc46ffe130becca495b65ee3e0d3bd348f78fdd42bccfd0e1fa90a7176a8ff5d01151a4ffc8 WHIRLPOOL 8d6c7941d0731d8280e6ee016cbc500137cd5087523dd637657fbe1c668814bdf093b66bd68f89c9d12a2dedc71719e49e873cb935b006fa93c188af12424cc1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUH4G0ACgkQknrdDGLu8JCdzgD6A2I2Nrj0eUN4laqMcg2jqD5C
-GpBRi9E7H0PgXSqtu1sA+wfH6kmxJXcCudUKxGjTw9BI9f9hWjuW4uNziQy3MDQi
-=r9tA
+iF4EAREIAAYFAlV1jiQACgkQknrdDGLu8JBMzQD+Onqi2AgcNwhPrjpzrmAbjygu
+q2pDcKt+ieiTAfu0WQwBAJgmQpPglE0es0WpnfZDHXk45Ex8u4Fmo9iHZaG0LLZX
+=b2PM
 -----END PGP SIGNATURE-----
diff --git a/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch
new file mode 100644
index 000000000000..3f1c21645d21
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch
@@ -0,0 +1,85 @@
+--- netsurf-3.3/Makefile.defaults
++++ netsurf-3.3/Makefile.defaults
+@@ -91,12 +91,6 @@
+ # Valid options: YES, NO
+ NETSURF_FS_BACKING_STORE := NO
+ 
+-# Initial CFLAGS. Optimisation level etc. tend to be target specific.
+-CFLAGS :=
+-
+-# Initial CXXFLAGS. Optimisation level etc. tend to be target specific.
+-CXXFLAGS :=
+-
+ # Default installation/execution prefix
+ PREFIX ?= /usr/local
+ 
+--- netsurf-3.3/framebuffer/Makefile.defaults
++++ netsurf-3.3/framebuffer/Makefile.defaults
+@@ -2,9 +2,6 @@
+ # Framebuffer-target-specific options
+ # ----------------------------------------------------------------------------
+ 
+-# Optimisation levels
+-CFLAGS += -O2
+-
+ # Framebuffer default surface provider.
+ # Valid values are: x, sdl, linux, vnc, able,
+ NETSURF_FB_FRONTEND := sdl
+--- netsurf-3.3/framebuffer/Makefile.target
++++ netsurf-3.3/framebuffer/Makefile.target
+@@ -42,8 +42,8 @@
+ $(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript))
+ $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
+ 
+-CFLAGS += -std=c99 -g -Dsmall \
+-	  -D_BSD_SOURCE \
++CFLAGS += -std=c99 -Dsmall \
++	  -D_DEFAULT_SOURCE \
+ 	  -D_XOPEN_SOURCE=600 \
+ 	  -D_POSIX_C_SOURCE=200112L \
+ 	  $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl)
+--- netsurf-3.3/gtk/Makefile.defaults
++++ netsurf-3.3/gtk/Makefile.defaults
+@@ -26,6 +26,3 @@
+ 
+ # Set default GTK version to build for (2 or 3)
+ NETSURF_GTK_MAJOR ?= 2
+-
+-# Optimisation levels
+-CFLAGS += -O2
+--- netsurf-3.3/gtk/Makefile.target
++++ netsurf-3.3/gtk/Makefile.target
+@@ -46,9 +46,9 @@
+ # libsexy currently means we cannot enable this
+ #		-DGDK_DISABLE_DEPRECATED 
+ 
+-GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
++GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
+ 		$(GTKDEPFLAGS) \
+-		-D_BSD_SOURCE \
++		-D_DEFAULT_SOURCE \
+ 		-D_XOPEN_SOURCE=600 \
+ 		-D_POSIX_C_SOURCE=200809L \
+ 		-D_NETBSD_SOURCE \
+--- netsurf-3.3/test/Makefile
++++ netsurf-3.3/test/Makefile
+@@ -1,8 +1,8 @@
+-CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
++CFLAGS := -std=c99 -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE -I.. \
+ 		$(shell pkg-config --cflags libcurl)
+ LDFLAGS := $(shell pkg-config --libs libcurl) -lz
+ 
+-llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet libdom) -O2
++llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet libdom)
+ llcache_LDFLAGS := $(shell pkg-config --libs libparserutils libwapcaplet libdom)
+ 
+ llcache_SRCS := content/fetch.c content/fetchers/curl.c \
+@@ -19,7 +19,7 @@
+ 		utils/filename.c utils/nsurl.c utils/corestrings.c \
+ 		test/urldbtest.c
+ 
+-urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom) -O2
++urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom)
+ urldbtest_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom)
+ 
+ nsurl_SRCS := utils/corestrings.c utils/log.c utils/nsurl.c utils/idna.c utils/utf8proc.c test/nsurl.c
diff --git a/www-client/netsurf/netsurf-3.3.ebuild b/www-client/netsurf/netsurf-3.3.ebuild
new file mode 100644
index 000000000000..560367a8ce32
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/netsurf-3.3.ebuild,v 1.1 2015/06/08 12:44:19 xmw Exp $
+
+EAPI=5
+
+NETSURF_COMPONENT_TYPE=binary
+NETSURF_BUILDSYSTEM=buildsystem-1.3
+inherit netsurf
+
+DESCRIPTION="a free, open source web browser"
+HOMEPAGE="http://www.netsurf-browser.org/"
+SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz
+	http://xmw.de/mirror/netsurf-fb.modes-example.gz
+	${NETSURF_BUILDSYSTEM_SRC_URI}"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="+bmp fbcon truetype +gif gstreamer gtk javascript +jpeg +mng pdf-writer
+	+png +rosprite +svg +svgtiny +webp fbcon_frontend_able fbcon_frontend_linux
+	fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x"
+
+REQUIRED_USE="|| ( fbcon gtk )
+	amd64? ( abi_x86_32? (
+		!gstreamer !javascript !pdf-writer svg? ( svgtiny ) !truetype ) )
+	fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl
+		fbcon_frontend_vnc fbcon_frontend_x ) )"
+
+RDEPEND="dev-libs/libnsutils
+	dev-libs/libutf8proc
+	dev-libs/libxml2
+	net-misc/curl
+	>=dev-libs/libcss-0.4.0[${MULTILIB_USEDEP}]
+	>=net-libs/libhubbub-0.3.0-r1[${MULTILIB_USEDEP}]
+	bmp? ( >=media-libs/libnsbmp-0.1.1[${MULTILIB_USEDEP}] )
+	fbcon? ( >=dev-libs/libnsfb-0.1.2[${MULTILIB_USEDEP}]
+		truetype? ( media-fonts/dejavu
+			>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+	)
+	gif? ( >=media-libs/libnsgif-0.1.1[${MULTILIB_USEDEP}] )
+	gtk? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+		gnome-base/libglade:2.0
+		>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-libs/gstreamer:0.10 )
+	javascript? ( >=dev-libs/nsgenbind-0.1.1[${MULTILIB_USEDEP}]
+		dev-lang/spidermonkey:0= )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	mng? ( >=media-libs/libmng-1.0.10-r2[${MULTILIB_USEDEP}] )
+	pdf-writer? ( media-libs/libharu )
+	png? ( >=media-libs/libpng-1.2.51:0[${MULTILIB_USEDEP}] )
+	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.2[${MULTILIB_USEDEP}] )
+		!svgtiny? ( gnome-base/librsvg:2 ) )
+	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	rosprite? ( >=media-libs/librosprite-0.1.1[${MULTILIB_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-CFLAGS.patch
+	"${FILESDIR}"/${PN}-3.0-framebuffer-pkgconfig.patch
+	"${FILESDIR}"/${PN}-3.2-conditionally-include-image-headers.patch )
+DOCS=( fb.modes README Docs/USING-Framebuffer
+	Docs/ideas/{cache,css-engine,render-library}.txt )
+
+src_prepare() {
+	rm -rf amiga atari beos cocoa monkey riscos windows  || die
+
+	mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
+
+	netsurf_src_prepare
+}
+
+src_configure() {
+	netsurf_src_configure
+
+	netsurf_makeconf+=(
+		NETSURF_USE_BMP=$(usex bmp YES NO)
+		NETSURF_USE_GIF=$(usex gif YES NO)
+		NETSURF_USE_JPEG=$(usex jpeg YES NO)
+		NETSURF_USE_PNG=$(usex png YES NO)
+		NETSURF_USE_PNG=$(usex png YES NO)
+		NETSURF_USE_MNG=$(usex mng YES NO)
+		NETSURF_USE_WEBP=$(usex webp YES NO)
+		NETSURF_USE_VIDEO=$(usex gstreamer YES NO)
+		NETSURF_USE_MOZJS=$(usex javascript YES NO)
+		NETSURF_USE_JS=NO
+		NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
+		NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
+		NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
+		NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
+		PKG_CONFIG=$(tc-getPKG_CONFIG)
+		$(usex fbcon_frontend_able  NETSURF_FB_FRONTEND=able  "")
+		$(usex fbcon_frontend_linux NETSURF_FB_FRONTEND=linux "")
+		$(usex fbcon_frontend_sdl   NETSURF_FB_FRONTEND=sdl   "")
+		$(usex fbcon_frontend_vnc   NETSURF_FB_FRONTEND=vnc   "")
+		$(usex fbcon_frontend_x     NETSURF_FB_FRONTEND=x     "")
+		NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
+		NETSURF_FB_FONTPATH=${EROOT}usr/share/fonts/dejavu
+		TARGET=dummy
+	)
+}
+
+src_compile() {
+	if use fbcon ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+		netsurf_src_compile
+	fi
+	if use gtk ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+		netsurf_src_compile
+	fi
+}
+
+src_install() {
+	sed -e '1iexit;' \
+		-i "${WORKDIR}"/*/utils/git-testament.pl || die
+
+	if use fbcon ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+		netsurf_src_install
+		elog "framebuffer binary has been installed as netsurf-fb"
+		mv -v "${ED}"usr/bin/netsurf{,-fb} || die
+		make_desktop_entry "${EROOT}"usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
+
+		elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
+		elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
+		elog "Please make /etc/input/mice readable to the account using netsurf-fb."
+		elog "Either use chmod a+r /etc/input/mice (security!!!) or use an group."
+	fi
+	if use gtk ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+		netsurf_src_install
+		elog "netsurf gtk version has been installed as netsurf-gtk"
+		mv -v "${ED}"/usr/bin/netsurf{,-gtk} || die
+		make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
+	fi
+
+	insinto /usr/share/pixmaps
+	doins gtk/res/netsurf.xpm
+}