diff options
-rw-r--r-- | dev-db/sqlite/sqlite-3.20.1-r1.ebuild | 2 | ||||
-rw-r--r-- | media-libs/spandsp/spandsp-0.0.6.ebuild | 2 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-2.4.1-r3.ebuild | 2 | ||||
-rw-r--r-- | net-dns/libidn2/libidn2-2.0.4.ebuild | 2 | ||||
-rw-r--r-- | net-ftp/lftp/Manifest | 3 | ||||
-rw-r--r-- | net-ftp/lftp/lftp-4.8.0.ebuild | 94 | ||||
-rw-r--r-- | net-ftp/lftp/lftp-4.8.2.ebuild (renamed from net-ftp/lftp/lftp-4.7.8.ebuild) | 9 |
7 files changed, 11 insertions, 103 deletions
diff --git a/dev-db/sqlite/sqlite-3.20.1-r1.ebuild b/dev-db/sqlite/sqlite-3.20.1-r1.ebuild index 6b547ffb208d..9cfbda6afa29 100644 --- a/dev-db/sqlite/sqlite-3.20.1-r1.ebuild +++ b/dev-db/sqlite/sqlite-3.20.1-r1.ebuild @@ -78,7 +78,7 @@ src_prepare() { preparation() { pushd "${BUILD_DIR}" > /dev/null || die - if [[ "${ABI}" == "x86" ]]; then + if full_tarball && [[ "${ABI}" == "x86" ]]; then # Disable tests broken on x86. sed -e "/^for {set i 0} {\$i<1000} {incr i} {$/,/^}$/d" -i test/date.test || die "sed failed" fi diff --git a/media-libs/spandsp/spandsp-0.0.6.ebuild b/media-libs/spandsp/spandsp-0.0.6.ebuild index 41119e8d7b77..042b3bcb6317 100644 --- a/media-libs/spandsp/spandsp-0.0.6.ebuild +++ b/media-libs/spandsp/spandsp-0.0.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.soft-switch.org/downloads/spandsp/${P/_}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~x86" IUSE="doc fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static-libs" RDEPEND="media-libs/tiff diff --git a/net-analyzer/wireshark/wireshark-2.4.1-r3.ebuild b/net-analyzer/wireshark/wireshark-2.4.1-r3.ebuild index 2413590812e0..82628ef1cff3 100644 --- a/net-analyzer/wireshark/wireshark-2.4.1-r3.ebuild +++ b/net-analyzer/wireshark/wireshark-2.4.1-r3.ebuild @@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE=" adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua diff --git a/net-dns/libidn2/libidn2-2.0.4.ebuild b/net-dns/libidn2/libidn2-2.0.4.ebuild index 0830e44f1de0..f2f21017ecf8 100644 --- a/net-dns/libidn2/libidn2-2.0.4.ebuild +++ b/net-dns/libidn2/libidn2-2.0.4.ebuild @@ -12,7 +12,7 @@ SRC_URI=" LICENSE="GPL-2+ LGPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" RDEPEND=" diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest index 046c6c760867..662cb83c7d26 100644 --- a/net-ftp/lftp/Manifest +++ b/net-ftp/lftp/Manifest @@ -1,4 +1,3 @@ DIST lftp-4.7.5.tar.xz 1567232 SHA256 53b5c5eba2e38b418bcf451776f2df596050dff4db90ab4ea73d872f8b1fd0d8 SHA512 e7d478367a3b79f61686a538827efe8afb807a587d2967189ae351927e3acb0d5b097d8707e0cb3997aa650f8f0787aa44038bb1d081e393bc7202b348249960 WHIRLPOOL 12d53a4c51ee52b67e57dc2e1c2c90443a65964073ee05ce123211096ea82813efbc51345ea488c24aa00600818ce6c0cd96beef27de619ff5d938bef3cabd06 -DIST lftp-4.7.8.tar.xz 1578672 SHA256 f18a166dc50e0e32d45b6d0128bad0e6970386f6a50cf5cadb0995b256d532a6 SHA512 3b2cd2e0af2090d9f0d4e3d436efed34e41c8852fb09003af82f0c2668bed5b5d37f4561271bd010dd141c2383a57ef52b6ec96b748bd389851b4f28ade9bfe3 WHIRLPOOL 93b3ff523e04366155852f704fc52c65cd9232ae34fee04e1290b1ce4c072f603de1ef7006397c0ae048142fa96649deb951964c4f1d85cdaf78d5610e6ebe97 -DIST lftp-4.8.0.tar.xz 1584196 SHA256 7a2880968088b4aeec43b6b6680fef0e065e1dddcce9b409390157e9766b690f SHA512 60b437cadbf15479ca1858f2f49d4414e4eb2a2db7af1bb26d82d6ce97652664be8e7c9683c34fb1168ef23950867aea379c3d7705f638bdced392184d890fd4 WHIRLPOOL ce5005182792cf0cba905b19681992196378403cdfdb7c18ea29df1b4c78ff5d41dca4cf49eb3036ffcfc23207e9d5894aed8d8d5f10af47b9746913efff94da DIST lftp-4.8.1.tar.xz 1598768 SHA256 e770daa5592ad21bd0b8a8915a0f4fdc2e15dec6c69e754a870ad9c18be57b27 SHA512 55c21a927c5bbfe2075b3f9baa1d19d1dafb0ade7e7a21f24f0a7d42fece5b760bc6cef033296318991926d227730d5f89ee9526d30fda95d54960c1e8079164 WHIRLPOOL d26d3c09ab2de41ec06bd2c970a42ffcec7aed55652a35a48f2548a1f7ae1ef175b209df68698381c0e2fc34a30a6ae9d21f0761c4f60c4deff39683bbed88cd +DIST lftp-4.8.2.tar.xz 1598920 SHA256 5c875b8476e05e856ebc8eec458e43317b2bebd6ed5f7725a733d4591548cd9c SHA512 582775c27f020a6864b960a06681698522842e147deee6dba18115738af56fc0094c2b21ed1eb4984626276472f707be795fcf4b23f451ba17a60e4bf8facd5e WHIRLPOOL 6cb2b3346c25159eaf0f6e5b630e94f254a1d2b27e64e443a4fd6c1d5e50806df458df432caa8a4152c7c3e43e585d6c4cae5a0808aaac0f24b18739e96bb8db diff --git a/net-ftp/lftp/lftp-4.8.0.ebuild b/net-ftp/lftp/lftp-4.8.0.ebuild deleted file mode 100644 index 800254e97559..000000000000 --- a/net-ftp/lftp/lftp-4.8.0.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils libtool - -DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" -HOMEPAGE="https://lftp.tech/" -SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" - -IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file" -LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW ) -IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}" -RESTRICT="test" - -RDEPEND=" - >=sys-libs/ncurses-5.1:= - >=sys-libs/readline-5.1:= - dev-libs/expat - sys-libs/zlib - convert-mozilla-cookies? ( dev-perl/DBI ) - idn? ( net-dns/libidn ) - socks5? ( - >=net-proxy/dante-1.1.12 - virtual/pam - ) - ssl? ( - gnutls? ( >=net-libs/gnutls-1.2.3:0= ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) - verify-file? ( - dev-perl/String-CRC32 - virtual/perl-Digest-MD5 - ) -" - -DEPEND=" - ${RDEPEND} - =sys-devel/libtool-2* - app-arch/xz-utils - nls? ( >=sys-devel/gettext-0.19 ) - virtual/pkgconfig -" - -DOCS=( - BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels - README.dnssec README.modules THANKS TODO -) - -PATCHES=( - "${FILESDIR}"/${PN}-4.0.2.91-lafile.patch - "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch - "${FILESDIR}"/${PN}-4.7.0-gettext.patch -) - -src_prepare() { - default - - eautoreconf - elibtoolize # for Darwin bundles - - # bug #536036 - printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die -} - -src_configure() { - econf \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_with idn libidn) \ - $(use_with socks5 socksdante "${EPREFIX}"/usr) \ - $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \ - $(usex ssl "$(use_with gnutls)" '--without-gnutls') \ - --enable-packager-mode \ - --sysconfdir="${EPREFIX}"/etc/${PN} \ - --with-modules \ - --with-readline="${EPREFIX}"/usr \ - --without-included-regex -} - -src_install() { - default - local script - for script in {convert-mozilla-cookies,verify-file}; do - use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;} - done -} diff --git a/net-ftp/lftp/lftp-4.7.8.ebuild b/net-ftp/lftp/lftp-4.8.2.ebuild index 800254e97559..90a9934a1bcd 100644 --- a/net-ftp/lftp/lftp-4.7.8.ebuild +++ b/net-ftp/lftp/lftp-4.8.2.ebuild @@ -6,7 +6,9 @@ inherit autotools eutils libtool DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" HOMEPAGE="https://lftp.tech/" -SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz" +SRC_URI=" + ${HOMEPAGE}ftp/${P}.tar.xz +" LICENSE="GPL-3" SLOT="0" @@ -23,7 +25,7 @@ RDEPEND=" dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) - idn? ( net-dns/libidn ) + idn? ( net-dns/libidn2 ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam @@ -64,6 +66,7 @@ src_prepare() { default eautoreconf + elibtoolize # for Darwin bundles # bug #536036 @@ -74,7 +77,7 @@ src_configure() { econf \ $(use_enable ipv6) \ $(use_enable nls) \ - $(use_with idn libidn) \ + $(use_with idn libidn2) \ $(use_with socks5 socksdante "${EPREFIX}"/usr) \ $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \ $(usex ssl "$(use_with gnutls)" '--without-gnutls') \ |