summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatsuu Takuto <matsuu@gentoo.org>2009-12-13 23:25:22 +0000
committerMatsuu Takuto <matsuu@gentoo.org>2009-12-13 23:25:22 +0000
commit94f3f8c28b12b3528ac06504e2231172f66f0226 (patch)
treef34fe41398a1b38d91787c95be3d0c6816fc3890 /www-client
parentdrop "imstt" from VIDEO_CARDS in all profiles (diff)
downloadhistorical-94f3f8c28b12b3528ac06504e2231172f66f0226.tar.gz
historical-94f3f8c28b12b3528ac06504e2231172f66f0226.tar.bz2
historical-94f3f8c28b12b3528ac06504e2231172f66f0226.zip
boehm-gc 7.2 support.
Package-Manager: portage-2.1.7.13/cvs/Linux x86_64
Diffstat (limited to 'www-client')
-rw-r--r--www-client/w3m/ChangeLog8
-rw-r--r--www-client/w3m/Manifest14
-rw-r--r--www-client/w3m/files/w3m-0.5.2-gc72.patch27
-rw-r--r--www-client/w3m/w3m-0.5.2-r3.ebuild121
4 files changed, 158 insertions, 12 deletions
diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index c41004429e34..af9f5fb84c5e 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/w3m
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.49 2009/12/12 21:33:39 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.50 2009/12/13 23:25:21 matsuu Exp $
+
+*w3m-0.5.2-r3 (13 Dec 2009)
+
+ 13 Dec 2009; MATSUU Takuto <matsuu@gentoo.org> +w3m-0.5.2-r3.ebuild,
+ +files/w3m-0.5.2-gc72.patch:
+ boehm-gc 7.2 support.
12 Dec 2009; Tiago Cunha <tcunha@gentoo.org> w3m-0.5.2-r2.ebuild:
stable sparc, bug 296051
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index ba2a09171b71..67782c1486c2 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX w3m-0.5.2-ambwidth.patch 13634 RMD160 21d967a5b6816e55aac12a161e575121065a336f SHA1 a9a040d2e9b17ed5ca454a0133e525a0ec542ba2 SHA256 9cad290d4c0122964ecb674e636fb7551b400b4f32a2697ca15d68e2fe8cf4ce
AUX w3m-0.5.2-form.patch 309 RMD160 8f208c562fdce59ef97009e373925a33815a3dcd SHA1 e703286d1a67e67b2b052ef9806e202a5ef434ec SHA256 a0e6084c82db55c746cd00410c8781887fd52b61eca86a8a61269570622c41bf
+AUX w3m-0.5.2-gc72.patch 769 RMD160 475b22c156c6be49729e9a563d5d5493ba249c4d SHA1 d0332b8dcdf3fac1f91485d6858ad8c8b25ada69 SHA256 6a6a736db1edc3936a604d7b63512510158b4decfbdadaff85f7bf14d6377a86
AUX w3m.mailcap 44 RMD160 86f571fda5a25bc7ffe2a2094c2bc590c0395ce0 SHA1 dccd475e42a34e132adfc2aa13c3c789cd2e6fff SHA256 5f3c243df65c4d2e5ceeb1fae285e0f9f6660c7b0fc66bb7e46803c1de1890b5
DIST w3m-0.5.2.tar.gz 1906812 RMD160 09ce72d8ef5e621a2e49496b63e22f2773edbe79 SHA1 484522547ae6dbb342d3858a2a53a65451e273f9 SHA256 5ff3e5a1f50a4a8e6ddbfdeefbe13d3a7f63538595a8e29f5da504ea46eda646
EBUILD w3m-0.5.2-r1.ebuild 2970 RMD160 110c3f866b5595e9f07204b9ee59d93a4a0b3113 SHA1 8c3f3b0dfa6f4eeef0a33e523c34c168e08d0725 SHA256 a367f6f136713dc8664a4f6ec52e7a71d2e1d3855e207fc9d5267ed32245681e
EBUILD w3m-0.5.2-r2.ebuild 3226 RMD160 967c39c860a9c698bf79d7712b6b51680ea7aa9d SHA1 0e6e172f802b54448bbaee6398c3a111a87b9186 SHA256 2d4b332340aa3f1dae274ee2865d00b8e659333654cff03ae1b8a9d73c94e08c
+EBUILD w3m-0.5.2-r3.ebuild 3267 RMD160 07a9acb427d26a68107b0eb6ec555f6ca9094f7e SHA1 cb1493d14eb664cd67266021d169d42b7fccb9f6 SHA256 597a5834ec3db70a308140cfd5e5da70767a5cb84b9e45ee865205155418ed4a
EBUILD w3m-0.5.2.ebuild 2843 RMD160 80b57f81897b6ee8b6d0d729ec19777da31da5fc SHA1 9b622cf526742f10c3f6f083d1f6ac99bef70695 SHA256 2d03f839d7e08b12e24c75fa3383443bdbc9ccb4b30382fe197af6abffed6843
-MISC ChangeLog 17241 RMD160 d9d42b085a609acd2ad851abe2e2f037f1889e7a SHA1 1a55720b057e6667532d3de59163c29e0ba2f2f6 SHA256 26009c74533080c4fd6e22820c420c7c1f2d486e7e8ce9f0d9df79d1de95e6ef
+MISC ChangeLog 17397 RMD160 cf96dd6a8a0c47037c6bad677cb6b00fb1984a30 SHA1 761e3e10548d3077b0ffe60de493d48a7b87556d SHA256 88882b3e001493e09c883b8b42eb76b6b56719a782cbdbe28f865786817d04ba
MISC metadata.xml 237 RMD160 795d70d06b61c12bd15a97e596afed87747e7553 SHA1 a1a1f21305275c396fb2784bb261595fbf510a6f SHA256 58936b557c67f7e90052564817055decab28947a9934d0b889fa5d7e2901ba6d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkskFGwACgkQ/vqxibGcXqGzWgCgkhqDMG7g2Y6VnlkKNr7wlLrR
-vKUAn0Sc21GRjd69hgIVSS+p5qeYNG3p
-=q6RE
------END PGP SIGNATURE-----
diff --git a/www-client/w3m/files/w3m-0.5.2-gc72.patch b/www-client/w3m/files/w3m-0.5.2-gc72.patch
new file mode 100644
index 000000000000..f2df44f06b30
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.2-gc72.patch
@@ -0,0 +1,27 @@
+diff -Naurb w3m-0.5.2.orig/main.c w3m-0.5.2/main.c
+--- w3m-0.5.2.orig/main.c 2007-05-31 10:19:50.000000000 +0900
++++ w3m-0.5.2/main.c 2009-11-09 08:20:02.184953443 +0900
+@@ -312,7 +312,11 @@
+ lock = 0;
+ }
+ }
++#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
++ else if (orig_GC_warn_proc = GC_get_warn_proc())
++#else
+ else if (orig_GC_warn_proc)
++#endif
+ orig_GC_warn_proc(msg, arg);
+ else
+ fprintf(stderr, msg, (unsigned long)arg);
+@@ -842,7 +846,11 @@
+ mySignal(SIGPIPE, SigPipe);
+ #endif
+
++#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
++ GC_set_warn_proc(wrap_GC_warn_proc);
++#else
+ orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
++#endif
+ err_msg = Strnew();
+ if (load_argc == 0) {
+ /* no URL specified */
diff --git a/www-client/w3m/w3m-0.5.2-r3.ebuild b/www-client/w3m/w3m-0.5.2-r3.ebuild
new file mode 100644
index 000000000000..6edfe5bbd780
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.2-r3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2009 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-r3.ebuild,v 1.1 2009/12/13 23:25:21 matsuu Exp $
+
+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 ~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 ) )
+ 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 )"
+PROVIDE="virtual/w3m"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ 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"
+}
+
+src_compile() {
+
+ 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
+
+ # 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
+}