diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-24 19:58:07 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-24 19:58:07 +0000 |
commit | 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch) | |
tree | da76713365257a445f3ae3b95470917f59d46728 /www-client/elinks | |
parent | 4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff) |
gentoo resync : 24.02.2018
Diffstat (limited to 'www-client/elinks')
-rw-r--r-- | www-client/elinks/Manifest | 5 | ||||
-rw-r--r-- | www-client/elinks/elinks-0.12_pre6-r2.ebuild | 188 | ||||
-rw-r--r-- | www-client/elinks/elinks-0.12_pre6-r4.ebuild (renamed from www-client/elinks/elinks-0.12_pre6-r3.ebuild) | 52 | ||||
-rw-r--r-- | www-client/elinks/elinks-9999.ebuild | 58 |
4 files changed, 40 insertions, 263 deletions
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest index 065ca64b4a3c..ed579e1f5085 100644 --- a/www-client/elinks/Manifest +++ b/www-client/elinks/Manifest @@ -11,7 +11,6 @@ DIST elinks-0.10.4.conf.bz2 5370 BLAKE2B a8058021060c3e0ca1bd040dd34a3155fa17bcf DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 BLAKE2B b850c66cc74d59c6cfb0c7c6ebaaddfe0706e8cdcc14b1df5232ba2b3c75bf632e3b3e398b200876d7e594b122c6b27227ca92729129ef955174b05e7f0e6a06 SHA512 1552aeacdecb0a2db357402e0474d6b4810c767609d1d399b3350a4bcdc21ba9c0bde5a5d0bffd1d7b27d41ac46e3e85ae2527d715a1645a2dd51ab14b8eab3c DIST elinks-0.12pre6.tar.bz2 2854500 BLAKE2B 3d91c2a4b03cf77a2a86131cfb5339a40c6e89c8aaab7293d5b7f6861f0b7647b1951f2bc15814e342c926a154707162a7814981cdc729329dfb04627133f3bf SHA512 bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f EBUILD elinks-0.12_pre6-r1.ebuild 6169 BLAKE2B c78a14bc5e9baf75cb1cc1ebbe0694ebbc3044fbe6ecf26438d10c293e4b7f971ead2e48fb82f4570a1c8f0f86057f1010b0c761d332acc5082ceb0cde8bef46 SHA512 55fdeff2c895755867af2b8955f2c998c0f4630a42bf6b42cd04fc06375319711cd9d16148e4c3522f3aee01fc815afc66f8d7985c861aec93edf662c76dd8b5 -EBUILD elinks-0.12_pre6-r2.ebuild 6343 BLAKE2B 9437d9c1725e21aaa525dddbd987865a71b867223b4e070046be1ceca71c6d1ab0790e8347474e3f2e7d6fdb521225d91c91c35b61d48a61e31ab02685f78044 SHA512 f5d57136d9cc2d395bf9557e582a117d45836b81434c5ca35674217930be584587da53d5210e014ecf7b21f3e1ae07a63161f94f85631d85665ff4bd68d6b7ec -EBUILD elinks-0.12_pre6-r3.ebuild 5421 BLAKE2B d9f27998c8bc27f99051df71db7396739a3e4a5b1612865f2455c2b7b8d780732b82d7ab747b30a939cedf8b1e751801ed734b6e16cf8d3a8580fd8ab07de047 SHA512 3d0c1fac9d74b4031412fd80be8cda2754ac6b4ba207d44f0c5e0c1bd354f5808fd0d70b8ee72c51588dc82617e9089b01813655109b45d41a0773b15776d8dd -EBUILD elinks-9999.ebuild 4574 BLAKE2B 6a6a4613bdef3f70150f66635581deb777a9a838e8c59cc163ef2535a43cdcc8500cba9ef537786f0bbf2aab8b398722cfcdb02ed8de5e4df75de27db3c1f907 SHA512 83afd5e717271d062906b5da0c2a3f47af91c725d20f8f5cd183067c69b108bd036fbf5fdc851049f75902af5cbbba131f96bb05c1df2db7fa65d49756dfd713 +EBUILD elinks-0.12_pre6-r4.ebuild 4907 BLAKE2B 9d33b7fe010204ea0f18116fd8badd0e61e4238bbf91f8e16601b98b9477c26979428afab333496606b2bb1091331a1caede56a13197b4bc016f5d1665d88df9 SHA512 aa5e83d35cecefc25b563db261648ca7b8b2d6ee77c1885a3817d77662a10be73317c3f1bc6b07007c9a410ee529a04f6e41e36906bc8df839584ccba5e54ebf +EBUILD elinks-9999.ebuild 3847 BLAKE2B 5f02f015804da0b2594ecfb12b005e408af854750a27fe09573947ff347985dd92fe224ec316d5715ca3300c4cd69882b41365658e3e284f044c334d6055038b SHA512 51c54fa114f1306701d97f52572ae4b088661205db1cc44445edce98880f2f5c9d46cb852d944b31d7181ee489da2a89d926a194d839a7efa2fbf277e7410c40 MISC metadata.xml 989 BLAKE2B 4b2f65d67e922e7e9cce74761cebca030866842af469ef4776d7cf2f8e685a52f9cbdfee25fb6a29546543e71127f48f93f78593745f6ab151e49250fe1b0259 SHA512 66a3bb8694de90a61d37a4fe5029afc894b12eba7ce7832159f88ca3168ee99c324179b27edf2876f94b4465e81cc218f5d271fff92a495bed11dd6b8ffad990 diff --git a/www-client/elinks/elinks-0.12_pre6-r2.ebuild b/www-client/elinks/elinks-0.12_pre6-r2.ebuild deleted file mode 100644 index e9e8625888a0..000000000000 --- a/www-client/elinks/elinks-0.12_pre6-r2.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -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 - https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2 - https://dev.gentoo.org/~axs/distfiles/${PN}-0.12_pre5-js185-patches.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6 - javascript libressl lua +mouse nls nntp perl ruby samba ssl unicode X xml zlib" -RESTRICT="test" - -DEPEND=" - bzip2? ( >=app-arch/bzip2-1.0.2 ) - gc? ( dev-libs/boehm-gc ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - xml? ( >=dev-libs/expat-1.95.4 ) - X? ( x11-libs/libX11 x11-libs/libXt ) - zlib? ( >=sys-libs/zlib-1.1.4 ) - lua? ( >=dev-lang/lua-5:0 ) - gpm? ( >=sys-libs/ncurses-5.2:0 >=sys-libs/gpm-1.20.0-r5 ) - guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) - idn? ( net-dns/libidn ) - perl? ( dev-lang/perl ) - ruby? ( dev-lang/ruby:= dev-ruby/rubygems ) - samba? ( net-fs/samba ) - javascript? ( dev-lang/spidermonkey:0 )" -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}"/${PN}-9999-parallel-make.patch - epatch "${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch - epatch "${FILESDIR}"/${PN}-0.12_pre5-libressl.patch - epatch "${FILESDIR}"/${PN}-0.12_pre5-rand-egd.patch - - if use javascript ; then - if has_version ">=dev-lang/spidermonkey-1.8"; then - if has_version ">=dev-lang/spidermonkey-1.8.5"; then - epatch "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-1-heartbeat.patch - epatch "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-2-up.patch - epatch "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-3-histback.patch - epatch "${FILESDIR}"/${PN}-0.12_pre5-sm185-jsval-fixes.patch -# if has_version ">=dev-lang/spidermonkey-1.8.7"; then -# # fix lib order in configure check and add mozjs187 -# # (these seds are necessary so that @preserved-libs copies are not used) -# sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs187 mozjs185 mozjs js smjs; do:' \ -# configure.in || die -# else - # fix lib order in configure check - # (these seds are necessary so that @preserved-libs copies are not used) - sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs185 mozjs js smjs; do:' \ - configure.in || die -# fi - else - # fix lib order in configure check - # (these seds are necessary so that @preserved-libs copies are not used) - epatch "${FILESDIR}"/${MY_P}-spidermonkey-callback.patch - sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs js smjs; do:' \ - configure.in || die - fi - fi - fi - epatch "${FILESDIR}"/${PN}-0.12_pre5-ruby-1.9.patch - # Regenerate acinclude.m4 - based on autogen.sh. - cat > acinclude.m4 <<- _EOF - dnl Automatically generated from config/m4/ files. - dnl Do not modify! - _EOF - cat config/m4/*.m4 >> acinclude.m4 - - 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=${EPREFIX}/usr" - else - myconf="${myconf} --without-openssl --without-gnutls" - fi - - econf \ - --sysconfdir="${EPREFIX}"/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 gc) \ - $(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) \ - $(use_enable mouse) \ - $(use_enable xml xbel) \ - ${myconf} -} - -src_compile() { - emake V=1 -} - -src_install() { - emake V=1 DESTDIR="${D}" install - - 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 "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias || die -} - -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/elinks-0.12_pre6-r3.ebuild b/www-client/elinks/elinks-0.12_pre6-r4.ebuild index 045c7b755e8a..8578fc6b794b 100644 --- a/www-client/elinks/elinks-0.12_pre6-r3.ebuild +++ b/www-client/elinks/elinks-0.12_pre6-r4.ebuild @@ -8,7 +8,6 @@ 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 - https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2 https://dev.gentoo.org/~axs/distfiles/${PN}-0.12_pre5-js185-patches.tar.bz2" LICENSE="GPL-2" @@ -21,22 +20,22 @@ RESTRICT="test" DEPEND=" bzip2? ( >=app-arch/bzip2-1.0.2 ) gc? ( dev-libs/boehm-gc ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - xml? ( >=dev-libs/expat-1.95.4 ) - X? ( x11-libs/libX11 x11-libs/libXt ) - zlib? ( >=sys-libs/zlib-1.1.4 ) - lua? ( >=dev-lang/lua-5:0= ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) + javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) + lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) tre? ( dev-libs/tre ) - javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )" + X? ( x11-libs/libX11 x11-libs/libXt ) + xml? ( >=dev-libs/expat-1.95.4 ) + zlib? ( >=sys-libs/zlib-1.1.4 )" RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" @@ -56,15 +55,6 @@ PATCHES=( src_prepare() { default - cd "${WORKDIR}" || die - eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff - mv ${PN}-0.10.4.conf ${PN}.conf || die - if ! use ftp ; then - sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die - fi - sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die - cd "${S}" || die - # fix lib order in configure check # (these seds are necessary so that @preserved-libs copies are not used) sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs185 mozjs js smjs; do:' \ @@ -105,27 +95,27 @@ src_configure() { --enable-256-colors \ --enable-true-color \ --enable-html-highlight \ - $(use_with gpm) \ - $(use_with zlib) \ $(use_with bzip2 bzlib) \ $(use_with gc) \ - $(use_with X x) \ - $(use_with lua) \ + $(use_with gpm) \ $(use_with guile) \ - $(use_with perl) \ - $(use_with ruby) \ $(use_with idn) \ $(use_with javascript spidermonkey) \ + $(use_with lua) \ + $(use_with perl) \ + $(use_with ruby) \ $(use_with tre) \ + $(use_with X x) \ + $(use_with zlib) \ $(use_enable bittorrent) \ - $(use_enable nls) \ - $(use_enable ipv6) \ + $(use_enable finger) \ $(use_enable ftp) \ $(use_enable gopher) \ + $(use_enable ipv6) \ + $(use_enable mouse) \ + $(use_enable nls) \ $(use_enable nntp) \ - $(use_enable finger) \ $(use_enable samba smb) \ - $(use_enable mouse) \ $(use_enable xml xbel) \ ${myconf} } @@ -138,7 +128,6 @@ src_install() { emake V=1 DESTDIR="${D}" install insinto /etc/elinks - doins "${WORKDIR}"/elinks.conf newins contrib/keybind-full.conf keybind-full.sample newins contrib/keybind.conf keybind.conf.sample @@ -154,9 +143,6 @@ src_install() { } 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" diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild index f608a19718e3..871ec4ab5abb 100644 --- a/www-client/elinks/elinks-9999.ebuild +++ b/www-client/elinks/elinks-9999.ebuild @@ -6,12 +6,11 @@ PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" inherit autotools git-r3 python-any-r1 -EGIT_REPO_URI="git://repo.or.cz/elinks.git" +EGIT_REPO_URI="https://github.com/rkd77/felinks" MY_P="${P/_/}" DESCRIPTION="Advanced and well-established text-mode web browser" HOMEPAGE="http://elinks.or.cz/" -SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2" LICENSE="GPL-2" SLOT="0" @@ -24,22 +23,22 @@ DEPEND=" ${PYTHON_DEPS} brotli? ( app-arch/brotli ) bzip2? ( >=app-arch/bzip2-1.0.2 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - xml? ( >=dev-libs/expat-1.95.4 ) - X? ( x11-libs/libX11 x11-libs/libXt ) - zlib? ( >=sys-libs/zlib-1.1.4 ) - lua? ( >=dev-lang/lua-5:0= ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) + javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) + lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) tre? ( dev-libs/tre ) - javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )" + X? ( x11-libs/libX11 x11-libs/libXt ) + xml? ( >=dev-libs/expat-1.95.4 ) + zlib? ( >=sys-libs/zlib-1.1.4 )" RDEPEND="${DEPEND}" PATCHES=( @@ -54,21 +53,6 @@ src_unpack() { src_prepare() { default - cd "${WORKDIR}" || die - eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff - mv ${PN}-0.10.4.conf ${PN}.conf || die - if ! use ftp ; then - sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die - fi - sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die - cd "${S}" || die - - # Regenerate acinclude.m4 - based on autogen.sh. - cat > acinclude.m4 <<- _EOF || die - dnl Automatically generated from config/m4/ files. - dnl Do not modify! - _EOF - cat config/m4/*.m4 >> acinclude.m4 || die sed -i -e 's/-Werror//' configure* || die eautoreconf @@ -100,26 +84,26 @@ src_configure() { --enable-true-color \ --enable-html-highlight \ $(use_with gpm) \ - $(use_with zlib) \ $(use_with brotli) \ $(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_with lua) \ + $(use_with perl) \ + $(use_with ruby) \ $(use_with tre) \ + $(use_with X x) \ + $(use_with zlib) \ $(use_enable bittorrent) \ - $(use_enable nls) \ - $(use_enable ipv6) \ + $(use_enable finger) \ $(use_enable ftp) \ $(use_enable gopher) \ + $(use_enable ipv6) \ + $(use_enable mouse) \ + $(use_enable nls) \ $(use_enable nntp) \ - $(use_enable finger) \ $(use_enable samba smb) \ - $(use_enable mouse) \ $(use_enable xml xbel) \ ${myconf} } @@ -132,7 +116,6 @@ src_install() { emake V=1 DESTDIR="${D}" install insinto /etc/elinks - doins "${WORKDIR}"/elinks.conf newins contrib/keybind-full.conf keybind-full.sample newins contrib/keybind.conf keybind.conf.sample @@ -148,9 +131,6 @@ src_install() { } 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" |