From: Samuli Suominen Date: Fri, 16 Dec 2011 17:22:15 +0000 (+0000) Subject: Restore patch for bug 253847 which I've dropped by mistake. Improve IPv6 support... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f90b2bbd9f8644cd9c3b57ad82f38dd825f71953;p=gentoo.git Restore patch for bug 253847 which I've dropped by mistake. Improve IPv6 support with patch from Debian. Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog index 491096a9345c..db48396cac3f 100644 --- a/www-client/links/ChangeLog +++ b/www-client/links/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/links # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.143 2011/11/25 00:55:53 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.144 2011/12/16 17:22:15 ssuominen Exp $ + +*links-2.4-r2 (16 Dec 2011) + + 16 Dec 2011; Samuli Suominen +links-2.4-r2.ebuild: + Restore patch for bug 253847 which I've dropped by mistake. Improve IPv6 + support with patch from Debian. 25 Nov 2011; Samuli Suominen metadata.xml: Apply myself to metadata.xml too. diff --git a/www-client/links/Manifest b/www-client/links/Manifest index e4f7632d3ece..84071f3f1820 100644 --- a/www-client/links/Manifest +++ b/www-client/links/Manifest @@ -5,18 +5,20 @@ AUX links-2.3_pre1-libpng-1.5.patch 1232 RMD160 999358a40826d30d55eb4222358f71a7 AUX links-2.3_pre1-verify-ssl-certs.patch 1840 RMD160 7f38e7ddb1af06fc55cd23a749c02a7afbc0f8c3 SHA1 4726405578261027c3d28177eae02d4d808c480f SHA256 5fb7df573de849a2bfa7ad9b7c6ce150afe3f2c42a862945fabd57ca5ae66c34 DIST links-2.3pre1.tar.bz2 3832651 RMD160 f0cfc8c48c7d5fb759ac58b7f7a00275480ac3de SHA1 6d420a5c4514b45ee245fd3933d2a8cfa6eae76d SHA256 21ab49f2f24359ef2d0e634a7926f76419084bd792af28746323b2f16c229bde DIST links-2.4.tar.bz2 3843247 RMD160 9ede914cba25925356e3f69a3f40794821326235 SHA1 c09fcb03874b1d0586f582f73833bb2f4c9ed7ac SHA256 bebb6ccafaaabf1d251ccd79ff5cda07078a11bf7d15e775d6f3a0a89d4dd125 +DIST links2_2.4-1.debian.tar.gz 20808 RMD160 cedde06aa161c9f429531e3a045230cf9e0b46ee SHA1 2caa1602dcbac0d9c0092b2eae99e0f7ae64379c SHA256 5f092ec2eef39048cee2114d9f6c32d18778e244b0217b5e38b4f92e805d235d EBUILD links-2.3_pre1-r1.ebuild 3475 RMD160 8352313b0b496d876ebc3cea692c295b0fca1ada SHA1 12af946a7668405bd1f5e0de751c99d1d39d8622 SHA256 80f53c0db696f15084013fd9f6db351f77fcf4d5609fba77def9b84ce0ebd8dc EBUILD links-2.4-r1.ebuild 3048 RMD160 00b54d0f42fb45ea9406287f196203f985c81263 SHA1 9d26a41200b5fe71747b2b40130d74780cfdab80 SHA256 28376ae60add0908d5422663164d8696586bf77983de33d4e0a5c50e94e852b6 -MISC ChangeLog 29607 RMD160 bf06d12bb2926c643d7c95c81df0df290b611033 SHA1 12742d62226affc0b97082412ada0d3085121a1a SHA256 c16a48e3219fc1d58059216e38f82348b0888fd7cd82d0223023c2429afc670d +EBUILD links-2.4-r2.ebuild 3186 RMD160 a5af42d4fe937549e78f5f4d81b1c1c941daf672 SHA1 c8b9ee4146d622efc9db2c5e8eb371f77cec0332 SHA256 41b3f6e5065d564afdceee401451405643f38bb353141f0c23e8c0ae1731a513 +MISC ChangeLog 29822 RMD160 f57a10833638acdb063fb178ca09af6d2036df51 SHA1 60160cd415c188bea9a1738ca20c56fabc81b8c8 SHA256 bc2cf24c834f4b70331d7a3cc0e09345ba7f8e757134400b7f40d6b38915ba7d MISC metadata.xml 342 RMD160 f48da44e2ff7ef33505a66744713dde872654bf5 SHA1 09f4631fef863d70a152eec29c2455243413c9ee SHA256 264e605d3878a9b815b642d43c413afd628f1945e9a875fc31eaf7e2cef0a085 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOzuccAAoJEEdUh39IaPFN3VkIAIRnZh4ZjSDZ2IonaT9DSC3S -Z3m3faz3jo/WkA/vnB2CS0SlCnwl7FwiTRUikpZoyUEZ37O0wwPNBVlHbWsjILCL -0P5ABsZsHXPIIuz6ndUm+Wu+t54T4RBOI2pIBTJ37bb5LdtRIh6rUIDs12PfeYXx -UnQjDA+2xXTG1AV/c03lFxuImXrB3OimkZOVDZ1XuDCRhJ+9YuRc0rq4iOE5QZPS -cxb0jg5LRBGLluULlQGO1YjteRynVic75ogEfdiYgNPGnvp4QR6a0tY0YCfd5gaf -Bta61t2zK+nNGF+kJ6tJI/Ru68PxD/EEYavbRwUNMTcDAfgmBxF4iG8d4P218JU= -=Bt5o +iQEcBAEBAgAGBQJO634wAAoJEEdUh39IaPFNBjkH/j2qG6jP456LRTd7OxpLYqjr +HfwBYgZPVe5S+IezfcPJqAQgpaXenhDJODyiQ759LluHs8MfR1VXWH6K8a9xdmn3 +CRhZCodWuArvSQLrtxdbJVb6KiEk6w3K3FKMYRyGPXhSsWCVx9hEl5BH0Y/OILnn +iISazM0+eRk4HFbslIaDsmVhFDy2iCcbK2hL2xZzQ4bYgvJ9zLnHZMCnU4pl97uY +k+/vQspyxZhydTln8xrDRjKY8xX0hr9ac8kFvZnQpGdp4MXDb8z64I3Mc/4rqETh +vOeW/iKulbIiIl+W+4SX0lSfgxGKwqmFUhKiShcUZ9NiAH13cKE9KRBmSh4BCi4= +=NBld -----END PGP SIGNATURE----- diff --git a/www-client/links/links-2.4-r2.ebuild b/www-client/links/links-2.4-r2.ebuild new file mode 100644 index 000000000000..7c05334636af --- /dev/null +++ b/www-client/links/links-2.4-r2.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.4-r2.ebuild,v 1.1 2011/12/16 17:22:15 ssuominen Exp $ + +EAPI=4 +inherit autotools eutils + +DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode" +HOMEPAGE="http://links.twibright.com/" +SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2 + mirror://debian/pool/main/l/${PN}2/${PN}2_${PV}-1.debian.tar.gz" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="bzip2 directfb fbcon gpm jpeg livecd ssl suid svga tiff unicode X zlib" + +# Note: if X or fbcon usegflag are enabled, links will be built in graphic +# mode. libpng is required to compile links in graphic mode +# (not required in text mode), so let's add libpng for X? and fbcon? + +# We've also made USE=livecd compile in graphics mode. This closes bug #75685. + +# 2.3_pre1: SDL support is disabled in this version by upstream: sdl? ( >=media-libs/libsdl-1.2.0 ) +RDEPEND="ssl? ( dev-libs/openssl:0 ) + gpm? ( sys-libs/gpm ) + jpeg? ( virtual/jpeg ) + fbcon? ( + media-libs/libpng:0 + virtual/jpeg + sys-libs/gpm + ) + tiff? ( media-libs/tiff:0 ) + svga? ( + >=media-libs/svgalib-1.4.3 + media-libs/libpng:0 + ) + X? ( + x11-libs/libXext + media-libs/libpng:0 + ) + directfb? ( dev-libs/DirectFB ) + sys-libs/ncurses + livecd? ( + media-libs/libpng:0 + virtual/jpeg + sys-libs/gpm + )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +REQUIRED_USE="svga? ( suid )" + +DOCS=( AUTHORS BRAILLE_HOWTO BUGS ChangeLog KEYS NEWS README SITES TODO ) + +src_prepare() { + epatch "${WORKDIR}"/debian/patches/{verify-ssl-certs-510417,ipv6}.diff + + if use unicode; then + pushd intl >/dev/null + ./gen-intl || die + ./synclang || die + popd >/dev/null + fi + + # Upstream configure produced by broken autoconf-2.13. See #131440 and + # #103483#c23. This also fixes toolchain detection. + eautoconf +} + +src_configure() { + local myconf + + if use X || use fbcon || use directfb || use svga || use livecd; then + myconf="${myconf} --enable-graphics" + fi + + # Note: --enable-static breaks. + + # Note: ./configure only support 'gpm' features auto-detection, so + # we use the autoconf trick + ( use gpm || use fbcon || use livecd ) || export ac_cv_lib_gpm_Gpm_Open=no + + if use fbcon || use livecd; then + myconf="${myconf} --with-fb" + else + myconf="${myconf} --without-fb" + fi + + # force --with-libjpeg if livecd flag is set + if use livecd; then + myconf="${myconf} --with-libjpeg" + fi + + # $(use_with sdl) + econf \ + $(use_with X x) \ + $(use_with jpeg libjpeg) \ + $(use_with tiff libtiff) \ + $(use_with svga svgalib) \ + $(use_with directfb) \ + $(use_with ssl) \ + $(use_with zlib) \ + $(use_with bzip2) \ + ${myconf} +} + +src_install() { + default + + if use X; then + newicon Links_logo.png ${PN}.png + make_desktop_entry "${PN} -g" Links ${PN} "Network;WebBrowser" + fi + + dohtml doc/links_cal/* + + dosym links /usr/bin/links2 + + use suid && fperms 4755 /usr/bin/links +}