Drop depenendency on lcms:0 (bug 526800)

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

3 files changed, 151 insertions, 7 deletions

diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog
index 6945635dbbd3..a07012e52841 100644
--- a/www-client/netsurf/ChangeLog
+++ b/www-client/netsurf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/netsurf
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.15 2014/11/15 15:01:58 xmw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.16 2015/02/02 16:54:29 xmw Exp $
+
+*netsurf-3.2-r1 (02 Feb 2015)
+
+  02 Feb 2015; Michael Weber <xmw@gentoo.org> +netsurf-3.2-r1.ebuild:
+  Drop depenendency on lcms:0 (bug 526800)
 
 *netsurf-3.2 (15 Nov 2014)
 
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 595803a15267..871c680a170d 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -19,15 +19,16 @@ EBUILD netsurf-2.9.ebuild 4157 SHA256 6b321be09e4e31e3d2e085f2bd92a4429436c0bfe4
 EBUILD netsurf-3.0-r1.ebuild 5178 SHA256 d35b8a53c0b49a9f5e85d2280abbc3b3723f4c4f91abd08839edd59807702df9 SHA512 547e448ed2360b3b72a4a00ad52affb202a12f1e9339c39834fcfe149fbe152a63af1ce7c9c0952cf304b95c94b9f024deb44f3ac1d70fa23ddcba5644aa814c WHIRLPOOL 0e32dc86e7a8e3a41e0381dcb723f7a4bb57899b269d2390666eaaacfb6bfcb7b8c3062f382656d8a7244af2f3411df8513a2ec9af4453da6f91ba1ae187032c
 EBUILD netsurf-3.0-r2.ebuild 5079 SHA256 17ec6bb7117438b5e1ad1e7ffaca7a2b5415d55584547f280e5651eedc477136 SHA512 505dc70dee1a10f8851bd4e6a6ed4747090e11ff3f0f19486fb4872de11a57a1224cf1a6a157cca5557ebe9eff9c570fd3fc441d4e79555c93e787334c0d6c90 WHIRLPOOL 145a4e1e58c886d2ce9e4477351306d954f293670ea3ea1cfd854d275771179d07d26a3a990191d8576989a7f97e8577c7db7d152a9f09745544ebf6139c9780
 EBUILD netsurf-3.0.ebuild 5175 SHA256 4e41732b3f30e3008b4530c55eb74e6860b1727c0c0f067e9135bece3ce28db3 SHA512 3ac42adb6075cdcf961fe7d90b0e1d7c3a281d698c82645501804488f6ef0d7545b388115cc2eae128c136c3bf67228e0419ff0c4978088ed209f4482139f690 WHIRLPOOL 06e3c20c48c5989091d22dc1c26532a014a74748d5ac2de39bc46b0fc5d9725305d0eaa0cf6590d37c571ec890d63a1bfaf5bce857eccf1be87caabc9a2dd61f
+EBUILD netsurf-3.2-r1.ebuild 5157 SHA256 7333c46ecca405499c7fb3f6dad9892d011f42bdb4f6ccc0cc12064c675d1ac8 SHA512 f5c1c2f0e5748e2e77a6bedef17aac069138d845fc5b7bb1d8c9a8613621e87020b7d086348354610dac254109044c7eeaeafa0e681e19605af6080b03d05c57 WHIRLPOOL 3ee03ba139b55fc38925ff3222daead0eaed8cb57bb2c3d26b9cb83ee930587236b4c443dcc968aeb9a18abefe260b9e39119ea41ae4316ff040110202522d3b
 EBUILD netsurf-3.2.ebuild 5204 SHA256 57007cb01a2f1396e9073ffb68b3f086075a76389978e7e25ebcf2401b323453 SHA512 7fbd707dd3af23f7c5d04a93bca214aa50e63ffd97c35e784cb61814f41ef68ca473955b086c7cba545b1a232e3eca627b21e7a7e0705e96f0443a17d460bdb2 WHIRLPOOL ce4c79fe6f94676c6aff9da309b8d5b92b2ff7713071661a8eb300e03790658c7b638e8b72d6493d7938cacdcf9afcf5bbdca5849ccf47ea680b45740961c511
-MISC ChangeLog 2318 SHA256 fcd9d4ba00d721208999803870adb27d58aae72bbdd4b999762deba60c5eb339 SHA512 3d43c23a9776ea213894e947c913870d590ff1cedf18bd4b39b3275ad64d1ba715c21a83e209014de5094844e4b86bf297056a4ca1c483a3c5b5233302380d9f WHIRLPOOL cf2708ec445adfc2d363d22e30c1adeb5e58c665b9579783fca30ef85d32e925719bf579e0875e9e35ab49db6b13026128cb36a09d3f085ecf200f3e560c2c89
+MISC ChangeLog 2463 SHA256 b248c264365409f8256e63ed7f657a5367c0951d5d7e15549106772bcd6c592b SHA512 80f4d183d2ba125b1731ef3387c02f886329e0d36d9b5ab06c5c18cfc94f2b6e7eb8f504efd2515627c1bef6b3d1e7fbe1ee6d2f863d32792d2d11cfbac50256 WHIRLPOOL 41d89d192c10363878a8be9bb14271b0be40289900b320be4073b7b73db3f7dc5740483d2e735c1a5d266d150675258367f9801a5b42bd258a4e621955b1bf25
 MISC metadata.xml 1577 SHA256 f53de90c2188f6b757c2fdd700eaf1c25c642f708786c552449bd54c57da40f6 SHA512 4003d28e9ef15fe3f3a46080a2584986e166148a43f060cbc90bbcc46ffe130becca495b65ee3e0d3bd348f78fdd42bccfd0e1fa90a7176a8ff5d01151a4ffc8 WHIRLPOOL 8d6c7941d0731d8280e6ee016cbc500137cd5087523dd637657fbe1c668814bdf093b66bd68f89c9d12a2dedc71719e49e873cb935b006fa93c188af12424cc1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iL4EAREIAGYFAlRnauxfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iL4EAREIAGYFAlTPq8lfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JDQKQEAjEFUc1o+Qax+YIyevN9JeOkP
-09/dw2H7GUxSpevjD3YA/R+zOH/N+qSs8Tf18b9iKrsfszn7TWPeVr9lO5j5m8kP
-=KsKg
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JALyAD+Lz7y6rIOVQR3MOf3lcOZTlGj
+rxAtA765Ha2uwtphqM4A/A97K5KqJc+CPwcJzwrg0g375YKYOF2gBOTN7KZUnOk+
+=rVWB
 -----END PGP SIGNATURE-----
diff --git a/www-client/netsurf/netsurf-3.2-r1.ebuild b/www-client/netsurf/netsurf-3.2-r1.ebuild
new file mode 100644
index 000000000000..00291b1ad36c
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.2-r1.ebuild
@@ -0,0 +1,138 @@
+# 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.2-r1.ebuild,v 1.1 2015/02/02 16:54:29 xmw Exp $
+
+EAPI=5
+
+NETSURF_COMPONENT_TYPE=binary
+NETSURF_BUILDSYSTEM=buildsystem-1.2
+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/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}] )
+	jpeg? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
+	mng? ( >=media-libs/libmng-1.0.10-r2[${MULTILIB_USEDEP}] )
+	pdf-writer? ( media-libs/libharu )
+	png? ( >=media-libs/libpng-1.2.51[${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}
+	javascript? ( >=dev-libs/nsgenbind-0.1.1[${MULTILIB_USEDEP}] )
+	rosprite? ( >=media-libs/librosprite-0.1.1[${MULTILIB_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-CFLAGS.patch
+	"${FILESDIR}"/${PN}-3.0-framebuffer-pkgconfig.patch
+	"${FILESDIR}"/${P}-conditionally-include-image-headers.patch
+	"${FILESDIR}"/${P}-glibc2.20.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
+}