From fef4fa083fcd7418a77f96c8249c7a60a07d1dca Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Wed, 19 Jun 2013 07:26:45 +0000 Subject: Add NETSURF_COMPONENT_TYPE default, restore .desktop generation (Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) --- www-client/netsurf/ChangeLog | 5 +---- www-client/netsurf/netsurf-3.0.ebuild | 30 ++++++++++++------------------ 2 files changed, 13 insertions(+), 22 deletions(-) (limited to 'www-client/netsurf') diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog index 0ea3a7742641..c26e02122d44 100644 --- a/www-client/netsurf/ChangeLog +++ b/www-client/netsurf/ChangeLog @@ -1,9 +1,6 @@ # 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.8 2013/06/19 07:20:26 xmw Exp $ - - 19 Jun 2013; Michael Weber netsurf-3.0.ebuild: - Add NETSURF_COMPONENT_TYPE default. +# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.9 2013/06/19 07:26:45 xmw Exp $ *netsurf-3.0 (19 Jun 2013) diff --git a/www-client/netsurf/netsurf-3.0.ebuild b/www-client/netsurf/netsurf-3.0.ebuild index f61459a6eb26..a98b01ce70e6 100644 --- a/www-client/netsurf/netsurf-3.0.ebuild +++ b/www-client/netsurf/netsurf-3.0.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/netsurf-3.0.ebuild,v 1.2 2013/06/19 07:20:26 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/netsurf-3.0.ebuild,v 1.3 2013/06/19 07:26:45 xmw Exp $ EAPI=5 -inherit base toolchain-funcs multilib-minimal +inherit eutils base toolchain-funcs multilib-minimal DESCRIPTION="a free, open source web browser" HOMEPAGE="http://www.netsurf-browser.org/" @@ -230,28 +230,22 @@ src_install() { if use fbcon ; then netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" ) netsurf_src_install - einfo "install framebuffer binary as netsurf-fb" + elog "framebuffer binary has been installed as netsurf-fb" mv -v "${ED}"usr/bin/netsurf{,-fb} || die + make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk NetSurf-gtk 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-fb NetSurf-framebuffer netsurf "Network;WebBrowser" fi - # mv "${D}"/usr/bin/netsurf{,-gtk} || die - # make_desktop_entry /usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser" - #if use fbcon ; then - # emake DESTDIR="${D}" PREFIX="/usr" TARGET=framebuffer install - # mv "${D}"/usr/bin/netsurf{,-fb} || die - # make_desktop_entry /usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser" - # - # einfo - # 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)." - # einfo - # 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." - # einfo - #fi insinto /usr/share/pixmaps doins gtk/res/netsurf.xpm -- cgit v1.2.3-65-gdbad