jer         14/03/14 13:56:31

  Modified:             ChangeLog
  Added:                w3m-0.5.3-r5.ebuild
  Log:
  Fix building against sys-libs/ncurses[tinfo] (bug #504588).
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
A792A613)

Revision  Changes    Path
1.82                 www-client/w3m/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/w3m/ChangeLog?rev=1.82&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/w3m/ChangeLog?rev=1.82&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/w3m/ChangeLog?r1=1.81&r2=1.82

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ChangeLog   6 Nov 2013 10:53:28 -0000       1.81
+++ ChangeLog   14 Mar 2014 13:56:30 -0000      1.82
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/w3m
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.81 2013/11/06 
10:53:28 naota Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.82 2014/03/14 
13:56:30 jer Exp $
+
+*w3m-0.5.3-r5 (14 Mar 2014)
+
+  14 Mar 2014; Jeroen Roovers <[email protected]> +w3m-0.5.3-r5.ebuild,
+  +files/w3m-0.5.3-tinfo.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #504588).
 
 *w3m-0.5.3-r4 (06 Nov 2013)
 



1.1                  www-client/w3m/w3m-0.5.3-r5.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/w3m/w3m-0.5.3-r5.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/w3m/w3m-0.5.3-r5.ebuild?rev=1.1&content-type=text/plain

Index: w3m-0.5.3-r5.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r5.ebuild,v 1.1 
2014/03/14 13:56:30 jer Exp $

EAPI=5
inherit autotools eutils

DESCRIPTION="Text based WWW browser, supports tables and frames"
HOMEPAGE="http://w3m.sourceforge.net/";
SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz"

LICENSE="w3m"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="X fbcon gpm gtk imlib lynxkeymap migemo nls nntp ssl unicode vanilla 
xface linguas_ja"

# We cannot build w3m with gtk+2 w/o X because gtk+2 ebuild doesn't
# allow us to build w/o X, so we have to give up framebuffer w3mimg....
RDEPEND=">=sys-libs/ncurses-5.2-r3
        >=sys-libs/zlib-1.1.3-r2
        >=dev-libs/boehm-gc-6.2
        X? ( x11-libs/libXext x11-libs/libXdmcp )
        gtk? (
                vanilla? ( x11-libs/gtk+:2 )
                !vanilla? ( x11-libs/gdk-pixbuf ) )
        !gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) )
        xface? ( media-libs/compface )
        gpm? ( >=sys-libs/gpm-1.19.3-r5 )
        migemo? ( >=app-text/migemo-0.40 )
        ssl? ( >=dev-libs/openssl-0.9.6b )"
DEPEND="${RDEPEND}
        virtual/pkgconfig"

src_prepare() {
        epatch \
                "${FILESDIR}/${PN}-0.5.2-gc72.patch" \
                "${FILESDIR}/${PN}-0.5.3-parallel-make.patch" \
                "${FILESDIR}/${PN}-0.5.3-glibc214.patch" \
                "${FILESDIR}/${PN}-0.5.3-underlinking.patch" \
                "${FILESDIR}/${PN}-0.5.3-tinfo.patch"
        use vanilla || \
                epatch "${FILESDIR}"/${PN}-0.5.3-button.patch \
                        "${FILESDIR}"/${P}-gdk-pixbuf.patch \
                        "${FILESDIR}"/${P}-input-type-default.patch \
                        "${FILESDIR}"/${P}-url-schema.patch
        find . -name CVS -type d | xargs rm -r
        sed -i -e "/^AR=/s/ar/$(tc-getAR)/" {.,w3mimg,libwc}/Makefile.in || die
        eautoconf
}

src_configure() {
        local myconf migemo_command imagelibval imageval

        if use gtk ; then
                imagelibval="gtk2"
        elif use imlib ; then
                imagelibval="imlib2"
        fi

        if [ ! -z "${imagelibval}" ] ; then
                use X && imageval="${imageval}${imageval:+,}x11"
                use X && use fbcon && imageval="${imageval}${imageval:+,}fb"
        fi

        if use migemo ; then
                migemo_command="migemo -t egrep 
${EPREFIX}/usr/share/migemo/migemo-dict"
        else
                migemo_command="no"
        fi

        # emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
        # so we better enable or disable both. Default to enable
        # m17n and unicode, see bug #47046.
        if use linguas_ja ; then
                if use unicode ; then
                        myconf="${myconf} --enable-japanese=U"
                else
                        myconf="${myconf} --enable-japanese=E"
                fi
        elif use unicode ; then
                myconf="${myconf} --with-charset=UTF-8"
        else
                myconf="${myconf} --with-charset=US-ASCII"
        fi

        # lynxkeymap IUSE flag. bug #49397
        if use lynxkeymap ; then
                myconf="${myconf} --enable-keymap=lynx"
        else
                myconf="${myconf} --enable-keymap=w3m"
        fi

        econf \
                --with-editor="${EPREFIX}/usr/bin/vi" \
                --with-mailer="${EPREFIX}/bin/mail" \
                --with-browser="${EPREFIX}/usr/bin/xdg-open" \
                --with-termlib=yes \
                --enable-image=${imageval:-no} \
                --with-imagelib="${imagelibval:-no}" \
                --with-migemo="${migemo_command}" \
                --enable-m17n \
                --enable-unicode \
                $(use_enable gpm mouse) \
                $(use_enable nls) \
                $(use_enable nntp) \
                $(use_enable ssl digest-auth) \
                $(use_with ssl) \
                $(use_enable xface) \
                ${myconf}
}

src_compile() {
        # bug #362249
        emake -j1
}

src_install() {

        emake DESTDIR="${D}" install

        # 
http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200307.month/3944.html
        insinto /etc/${PN}
        newins "${FILESDIR}/${PN}.mailcap" mailcap

        insinto /usr/share/${PN}/Bonus
        doins Bonus/*
        dodoc README NEWS TODO ChangeLog
        docinto doc-en ; dodoc doc/*
        if use linguas_ja ; then
                docinto doc-jp ; dodoc doc-jp/*
        else
                rm -rf "${ED}"/usr/share/man/ja || die
        fi
}




Reply via email to