From a483104f5b159cc42db0350a4715ab4a2b58c252 Mon Sep 17 00:00:00 2001 From: Michael Januszewski Date: Sun, 4 Apr 2010 11:55:13 +0000 Subject: [PATCH] Version bump (includes a workaround for bug #310495). Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- www-client/elinks/ChangeLog | 8 +- www-client/elinks/Manifest | 15 +- www-client/elinks/elinks-0.12_pre5.ebuild | 139 ++++++++++++++++++ .../elinks-0.12_pre5-compilation-fix.patch | 12 ++ 4 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 www-client/elinks/elinks-0.12_pre5.ebuild create mode 100644 www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog index fba290bf6cbb..0dd3077cc15b 100644 --- a/www-client/elinks/ChangeLog +++ b/www-client/elinks/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/elinks # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.118 2010/02/24 12:27:34 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.119 2010/04/04 11:55:12 spock Exp $ + +*elinks-0.12_pre5 (04 Apr 2010) + + 04 Apr 2010; Michał Januszewski + +elinks-0.12_pre5.ebuild, +files/elinks-0.12_pre5-compilation-fix.patch: + Version bump (includes a workaround for bug #310495). 24 Feb 2010; Pawel Hajdan jr elinks-0.11.7.ebuild: Run econf in src_configure, to be QA-correct and avoid running ./configure diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest index 81f79782da31..614fab9e457b 100644 --- a/www-client/elinks/Manifest +++ b/www-client/elinks/Manifest @@ -1,16 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX elinks-0.10.1-utf_8_io-default.patch 456 RMD160 69bcd2fe9a85381d53ef7d2c3da32e15d8eae36b SHA1 c9141e89ba62da5277d0df42e73f4eb258e23552 SHA256 3255c36e7107323d7415995c3c5d2458acf7b739848fb9804157b708956a7010 AUX elinks-0.10.4.conf-syscharset.diff 2580 RMD160 3bb9037e75adc225915a4a6b41afff0ef09f1eba SHA1 fe28f5ae8f290f15f1165273f22e9417f5648e40 SHA256 3269413843aabff245ee3dce522a475e5b3042adf4676b644a63d323bb77818c AUX elinks-0.11.2-lua-5.1.patch 538 RMD160 7bd83ed15ea14cc41b909c4022eee082a47fb706 SHA1 0183f106db71725ccb0f2b83746373ca9e5f0522 SHA256 d931af4db13b53be32def17417d86ee916511209ce9a54f25d017ee2d24473d4 AUX elinks-0.11.2-lua-5.patch 2125 RMD160 be94e085a7b231dad1681566c533699b2a6d2745 SHA1 d1af052c0700951c703f26ac39f09d1cbbf43081 SHA256 4e0f7b622111696e52e15745d8ac35249a95def36eb5aa782487c7901125260c AUX elinks-0.11.3-lua-5.patch 1841 RMD160 61ef22891e59893542326df7803c63ac81117622 SHA1 17682210d407b3efb47bbab9b47463b937d6bffe SHA256 f04d11e01824fb2cf4387b87cd531d64ad280d21e9bcb57e461ace56419d1220 AUX elinks-0.11.5-makefile.patch 1109 RMD160 7d20513b6922f895b4e4050a37550706500952c7 SHA1 4edd6e791ac08f37ee933652ded7049e04e3b6c2 SHA256 5b37be9328b80b9a995de94cf0a053ad63d43a2e0550df6e0c5a4cdc94276e1f +AUX elinks-0.12_pre5-compilation-fix.patch 464 RMD160 afe5e31db6a7ed454052e8f0220e3a5c35aca0e1 SHA1 58a69b5b48f1699451e7a508540b14962888b4d8 SHA256 984c3e1127c18eb0925fbe1cca5bb2a7b214c6cd082db434e8fe37e082715e7e AUX elinks-po-path.patch 1387 RMD160 47b0d596a607c476b94e88d8fe4e65ca0bbf6174 SHA1 a92aac2fee4f11c895dbf7bf2f2e15b494df5315 SHA256 18a5299dcea9fee1ef22c3257e09bd0dbc0567cb1aee6750aba9d185bca374cf DIST elinks-0.10.4.conf.bz2 5370 RMD160 5a0935ed8b035cd2f7636516b0e226a8065d1c70 SHA1 7f7b009b1b6cb746e90835d2b612f1aa6b5d3a1e SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209 DIST elinks-0.11.5.tar.bz2 2589451 RMD160 397e5e94de8cd8c5dc9a1774b7485d6edf1a7c49 SHA1 90768912dbb7a77e328a25b43c3e484ae3e4be2f SHA256 f5ddb8f8c82d96c5d159bd01abd475a678fa15b8dba8f2d477b903b28f1204c3 DIST elinks-0.11.6.tar.bz2 2577351 RMD160 b58477965684f77c852ea5275b4101eb84b37156 SHA1 c05e639cc656c2559a56e38f38b0cb40f19bc861 SHA256 9068f7160318cbee90f3218eb68cc341fff38b50f312da33a612e6352b4affa6 DIST elinks-0.11.7.tar.bz2 2467915 RMD160 2e6e863d08f9accb71892ba6f236f795c83cba9c SHA1 d13edc1477d0ab32cafe7d3c1f3a23ae1c0a5c54 SHA256 456db6f704c591b1298b0cd80105f459ff8a1fc07a0ec1156a36c4da6f898979 +DIST elinks-0.12pre5.tar.bz2 2783523 RMD160 4983083f21928da78f937b4dea09f8937c3a9cb9 SHA1 15fb38fa938a0eec9d5f22fdd538a6785e2854af SHA256 2d19547831098acff0c5f97f9fbc7912240f122961fd49fb8b76738417dd24d2 EBUILD elinks-0.11.5.ebuild 4700 RMD160 0596dde9f327083f3b77b56b9503f7a636b2f8dd SHA1 64d686e6c98a639cdb65f4f8c174b16451d06f0d SHA256 7a6af3656cbd5e7ce1f463d2b8ce517ef79cafd5aaf151bad89ca547bf4d3681 EBUILD elinks-0.11.6.ebuild 4382 RMD160 c399f5ad41ff2da5e08a5a8fa981792c84dcf82f SHA1 91036ad55444ba5b63aa289a90197efb5f335910 SHA256 6120a5c13cb76e31ceb00c1e0927b6e8229cab4e869c42251d94e83c3469ea78 EBUILD elinks-0.11.7.ebuild 4362 RMD160 c714797d3dff31f1a0545167bfe1917765e35543 SHA1 c6fda68b9d43afd257665de5653554b54bf3c055 SHA256 aec34fba27dd0a7cadf27bfddcfc4b9aa752ea7836b24c3b8d609af0b1d2fde3 -MISC ChangeLog 23509 RMD160 2795ae361873a0942a4e5b5936144e06efd16069 SHA1 f0f869d214c88cf9d4973f762feb5ad8c5768e58 SHA256 20b06469e1220c74cad1bbf318c044d703b37a97af7c0ac9f96ff603602946fb +EBUILD elinks-0.12_pre5.ebuild 4374 RMD160 af20ef3fbe4515f6ffe5dbb1dc744327a14f3881 SHA1 a3c9e558f849037e6de8e1568351403a6746fe05 SHA256 899de85b502dd7981e475f5e377407b722bb4bc67c5259cb076fe9ad12280d27 +MISC ChangeLog 23723 RMD160 8ac30f16532baba01ac11422543bacbd15178bdd SHA1 ab6b9f5021c30677337a8695f3478aec712fbf03 SHA256 059d9ceae357c669fa3a6c89ffdf8909076f81441dcf2c172328e1570a8c583a MISC metadata.xml 475 RMD160 e888de64596f6e3707ee9adb6e6f3612740f1c94 SHA1 5cb61eb3f8afb550f9de204bd4203833b0dfe024 SHA256 bec4875969a65fe6ea9c2187ecc644d6105279f04dd4f82fd30bef71e6692e2f +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAku4fh8ACgkQchej4aZK9/eZYwCcD6p7O2wPM79dmY2SxY6fOXoX +29oAn2jDJCN/tNUzNRngvx46joN9Pqya +=Iq9R +-----END PGP SIGNATURE----- diff --git a/www-client/elinks/elinks-0.12_pre5.ebuild b/www-client/elinks/elinks-0.12_pre5.ebuild new file mode 100644 index 000000000000..58e743119694 --- /dev/null +++ b/www-client/elinks/elinks-0.12_pre5.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.12_pre5.ebuild,v 1.1 2010/04/04 11:55:12 spock Exp $ + +EAPI="2" + +inherit eutils autotools flag-o-matic + +MY_P="${P/_/}" +DESCRIPTION="Advanced and well-established text-mode web browser" +HOMEPAGE="http://elinks.or.cz/" +SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2 + http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \ + javascript lua nls nntp perl ruby samba ssl unicode X zlib" +RESTRICT="test" + +DEPEND=">=dev-libs/expat-1.95.4 + bzip2? ( >=app-arch/bzip2-1.0.2 ) + ssl? ( >=dev-libs/openssl-0.9.6g ) + X? ( x11-libs/libX11 x11-libs/libXt ) + zlib? ( >=sys-libs/zlib-1.1.4 ) + lua? ( >=dev-lang/lua-5 ) + gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 ) + guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) + idn? ( net-dns/libidn ) + perl? ( sys-devel/libperl ) + ruby? ( dev-lang/ruby ) + samba? ( net-fs/samba-libs ) + !hppa? ( !mips? ( !alpha? ( javascript? ( dev-lang/spidermonkey ) ) ) )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + cd "${WORKDIR}" + epatch "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff + mv "${PN}-0.10.4.conf" "${PN}.conf" + if ! use ftp ; then + sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf + fi + sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf + cd "${S}" + + if use lua && has_version ">=dev-lang/lua-5.1"; then + epatch "${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch + fi + + epatch "${FILESDIR}"/elinks-0.11.5-makefile.patch + epatch "${FILESDIR}"/elinks-0.12_pre5-compilation-fix.patch + + sed -i -e 's/-Werror//' configure* + eautoreconf +} + +src_configure() { + # NOTE about GNUTSL SSL support (from the README -- 25/12/2002) + # As GNUTLS is not yet 100% stable and its support in ELinks is not so well + # tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible. + local myconf="" + + if use debug ; then + myconf="--enable-debug" + else + myconf="--enable-fastmem" + fi + + if use ssl ; then + myconf="${myconf} --with-openssl" + else + myconf="${myconf} --without-openssl --without-gnutls" + fi + + econf \ + --sysconfdir=/etc/elinks \ + --enable-leds \ + --enable-88-colors \ + --enable-256-colors \ + --enable-true-color \ + --enable-html-highlight \ + $(use_with gpm) \ + $(use_with zlib) \ + $(use_with bzip2 bzlib) \ + $(use_with X x) \ + $(use_with lua) \ + $(use_with guile) \ + $(use_with perl) \ + $(use_with ruby) \ + $(use_with idn) \ + $(use_with javascript spidermonkey) \ + $(use_enable bittorrent) \ + $(use_enable nls) \ + $(use_enable ipv6) \ + $(use_enable ftp) \ + $(use_enable gopher) \ + $(use_enable nntp) \ + $(use_enable finger) \ + $(use_enable samba smb) \ + ${myconf} || die +} + +src_install() { + make DESTDIR="${D}" install || die + + insopts -m 644 ; insinto /etc/elinks + doins "${WORKDIR}"/elinks.conf + newins contrib/keybind-full.conf keybind-full.sample + newins contrib/keybind.conf keybind.conf.sample + + dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.* + docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*} + insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote} + insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.* + insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm + + # Remove some conflicting files on OSX. The files provided by OSX 10.4 + # are more or less the same. -- Fabian Groffen (2005-06-30) + rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias +} + +pkg_postinst() { + einfo "This ebuild provides a default config for ELinks." + einfo "Please check /etc/elinks/elinks.conf" + einfo + einfo "You may want to convert your html.cfg and links.cfg of" + einfo "Links or older ELinks versions to the new ELinks elinks.conf" + einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl" + einfo + einfo "Please have a look at /etc/elinks/keybind-full.sample and" + einfo "/etc/elinks/keybind.conf.sample for some bindings examples." + einfo + einfo "You will have to set your TERM variable to 'xterm-256color'" + einfo "to be able to use 256 colors in elinks." + echo +} diff --git a/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch b/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch new file mode 100644 index 000000000000..dee09a67eb45 --- /dev/null +++ b/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch @@ -0,0 +1,12 @@ +diff -Naurp elinks-0.12pre5-orig//src/intl/charsets.c elinks-0.12pre5/src/intl/charsets.c +--- elinks-0.12pre5-orig//src/intl/charsets.c 2010-04-04 12:19:02.000000000 +0200 ++++ elinks-0.12pre5/src/intl/charsets.c 2010-04-04 12:19:20.000000000 +0200 +@@ -821,7 +821,7 @@ free_utf_table(void) + + /* Cast away const. */ + for (i = 128; i < 256; i++) +- mem_free((unsigned char *) utf_table[i].u.str); ++ mem_free(utf_table[i].u.str); + } + + static struct conv_table * -- 2.26.2