More multilib abi

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

2 files changed, 144 insertions, 2 deletions

diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog
index 3ac20730a94f..823adb942570 100644
--- a/www-client/netsurf/ChangeLog
+++ b/www-client/netsurf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/netsurf
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.11 2013/08/22 16:50:07 xmw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.12 2014/06/16 22:41:52 xmw Exp $
+
+*netsurf-3.0-r2 (16 Jun 2014)
+
+  16 Jun 2014; Michael Weber <xmw@gentoo.org> +netsurf-3.0-r2.ebuild:
+  More multilib abi
 
 *netsurf-3.0-r1 (22 Aug 2013)
 
diff --git a/www-client/netsurf/netsurf-3.0-r2.ebuild b/www-client/netsurf/netsurf-3.0-r2.ebuild
new file mode 100644
index 000000000000..ece6a1f3c486
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.0-r2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/netsurf-3.0-r2.ebuild,v 1.1 2014/06/16 22:41:52 xmw Exp $
+
+EAPI=5
+NETSURF_COMPONENT_TYPE=binary
+
+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.2.0[${MULTILIB_USEDEP}]
+	>=net-libs/libhubbub-0.2.0[${MULTILIB_USEDEP}]
+	bmp? ( >=media-libs/libnsbmp-0.1.0[${MULTILIB_USEDEP}] )
+	fbcon? ( >=dev-libs/libnsfb-0.1.0[${MULTILIB_USEDEP}]
+		truetype? ( media-fonts/dejavu
+			media-libs/freetype[${MULTILIB_USEDEP}] )
+	)
+	gif? ( >=media-libs/libnsgif-0.1.0[${MULTILIB_USEDEP}] )
+	gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+		gnome-base/libglade:2.0
+		media-libs/lcms:0[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-libs/gstreamer:0.10 )
+	javascript? ( dev-libs/nsgenbind )
+	jpeg? ( virtual/jpeg[${MULTILIB_USEDEP}] )
+	mng? ( media-libs/libmng[${MULTILIB_USEDEP}] )
+	pdf-writer? ( media-libs/libharu )
+	png? ( media-libs/libpng[${MULTILIB_USEDEP}] )
+	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.0[${MULTILIB_USEDEP}] )
+		!svgtiny? ( gnome-base/librsvg:2 ) )
+	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	javascript? ( dev-libs/nsgenbind )
+	rosprite? ( >=media-libs/librosprite-0.1.0[${MULTILIB_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-CFLAGS.patch
+	"${FILESDIR}"/${P}-framebuffer-pkgconfig.patch
+	"${FILESDIR}"/${PN}-2.9-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
+}