diff options
author | Naohiro Aota <naota@gentoo.org> | 2012-11-25 22:01:55 +0000 |
---|---|---|
committer | Naohiro Aota <naota@gentoo.org> | 2012-11-25 22:01:55 +0000 |
commit | d68ef9c1b5416ef408189dc6fedc83f02a7fa1a0 (patch) | |
tree | 2eb11679d6193a7eb1181a0a31471e7552660cfd /www-client/w3m | |
parent | Remove unused duplicates of Sleepycat license, bug 300426. (diff) | |
download | gentoo-2-d68ef9c1b5416ef408189dc6fedc83f02a7fa1a0.tar.gz gentoo-2-d68ef9c1b5416ef408189dc6fedc83f02a7fa1a0.tar.bz2 gentoo-2-d68ef9c1b5416ef408189dc6fedc83f02a7fa1a0.zip |
Set AR properly. #444376; Drop old version.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key F8551514)
Diffstat (limited to 'www-client/w3m')
-rw-r--r-- | www-client/w3m/ChangeLog | 5 | ||||
-rw-r--r-- | www-client/w3m/w3m-0.5.2-r4.ebuild | 122 | ||||
-rw-r--r-- | www-client/w3m/w3m-0.5.3-r2.ebuild | 3 |
3 files changed, 6 insertions, 124 deletions
diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog index 960db710ec4c..81a6174d78a1 100644 --- a/www-client/w3m/ChangeLog +++ b/www-client/w3m/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/w3m # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.78 2012/06/21 10:31:15 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.79 2012/11/25 22:01:55 naota Exp $ + + 25 Nov 2012; <naota@gentoo.org> -w3m-0.5.2-r4.ebuild, w3m-0.5.3-r2.ebuild: + Set AR properly. #444376; Drop old version. 21 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org> w3m-0.5.3-r2.ebuild: QA: don't use parallel build until bug #362249 is fixed. diff --git a/www-client/w3m/w3m-0.5.2-r4.ebuild b/www-client/w3m/w3m-0.5.2-r4.ebuild deleted file mode 100644 index e25c1743c667..000000000000 --- a/www-client/w3m/w3m-0.5.2-r4.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.2-r4.ebuild,v 1.10 2012/05/29 13:39:31 naota Exp $ - -EAPI="2" -inherit 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" -IUSE="X fbcon gpm gtk imlib lynxkeymap migemo nls nntp ssl unicode 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.... -DEPEND=">=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? ( x11-libs/gtk+:2 ) - !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 )" - -src_prepare() { - epatch "${FILESDIR}/${P}-ambwidth.patch" - # http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200708.month/4286.html - epatch "${FILESDIR}/${P}-form.patch" - epatch "${FILESDIR}/${P}-gc72.patch" - # from w3m-0.5.2-149.1.src.rpm(openSUSE) - epatch "${FILESDIR}/${PN}-CVE-2010-2074.patch" -} - -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 /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=/usr/bin/vi \ - --with-mailer=/bin/mail \ - --with-browser=/usr/bin/firefox \ - --with-termlib=curses \ - --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} || die -} - -src_compile() { - # parallel make borks, bug #215394. - emake -j1 || die "emake failed" -} - -src_install() { - - emake DESTDIR="${D}" install || die "emake install failed" - - # 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 "${D}"/usr/share/man/ja - fi -} diff --git a/www-client/w3m/w3m-0.5.3-r2.ebuild b/www-client/w3m/w3m-0.5.3-r2.ebuild index 3e4fefb36af2..54617010f0d1 100644 --- a/www-client/w3m/w3m-0.5.3-r2.ebuild +++ b/www-client/w3m/w3m-0.5.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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-r2.ebuild,v 1.6 2012/06/21 10:31:15 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r2.ebuild,v 1.7 2012/11/25 22:01:55 naota Exp $ EAPI="3" inherit eutils @@ -40,6 +40,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-0.5.3-button.patch \ "${FILESDIR}"/${P}-gdk-pixbuf.patch find . -name CVS -type d | xargs rm -r + sed -i -e "/^AR=/s/ar/$(tc-getAR)/" {.,w3mimg,libwc}/Makefile.in || die } src_configure() { |