* [gentoo-commits] repo/gentoo:master commit in: net-misc/aria2/, net-misc/aria2/files/
@ 2016-05-24 12:45 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2016-05-24 12:45 UTC (permalink / raw
To: gentoo-commits
commit: 5641a2af8c6942e3db3699665f5e56219ded1016
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 11:59:25 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 24 12:45:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5641a2af
net-misc/aria2: Clean up old
net-misc/aria2/Manifest | 6 -
net-misc/aria2/aria2-1.16.3.ebuild | 135 -------------------
net-misc/aria2/aria2-1.16.5.ebuild | 136 -------------------
net-misc/aria2/aria2-1.18.0.ebuild | 140 -------------------
net-misc/aria2/aria2-1.18.5.ebuild | 148 ---------------------
net-misc/aria2/aria2-1.18.7.ebuild | 147 --------------------
net-misc/aria2/aria2-1.18.9.ebuild | 147 --------------------
...aria2-1.18.5-fix-gnutls-2.x-compatibility.patch | 37 ------
8 files changed, 896 deletions(-)
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index af146cb..bc99f8e 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,10 +1,4 @@
DIST aria2-1.15.2.tar.bz2 2043212 SHA256 6400431f4248f7a779ae8216ec2711b56ad7481fc659f06db1f22ed97b260836 SHA512 6fc09ba1f682d13db829a3f5881a06ea0d0d2c1622511408f149cc109a12a01b19cec34caeeac10982061e9633bbb67e9ec40c23ee39a418fec6fb604af23bbe WHIRLPOOL b9544bb5359fc22dca5ba4e5328086deb0cf7d40fc69e7528ed57f14a89b30ffa6022ab7bfbe5f2fbd150b3974272286ff2f26d011bccaf5f973ccca00f2a44e
-DIST aria2-1.16.3.tar.bz2 2082238 SHA256 989f8eb5599394681d75e18acf3d4261870cc2dce70b813ce84305dc3c9e50a2 SHA512 c9d09a8f45df6e3a472709460ec42ed5db189a72652b2dbdb515b84e1acd221bffb151baf0b2036b180e07a5b6a82350327cb6dbad9268cf5eaeed9c47abe21e WHIRLPOOL 60523ce102dac5e6e4bbd1a8eecf8fcf6059aed5e8d7b01db551e64bc9244fcd75efc14a29840ffdb84b74d5809bed494fb707eba9f5189ff613f54b4d2bf6b3
-DIST aria2-1.16.5.tar.bz2 2152749 SHA256 06aee1f296b984a8aed54ac7d7bc52eb2b4315273ec555bf3b06c10214528eed SHA512 44544daad15b0f9fb63eccff855d0775bad7131f427d7ad75326cd875392a445ca36e1f1cb1a870276d554e708dd1850b20be1b4bbcf8e7fc9874478c848a754 WHIRLPOOL e49383afd04a5d7d55152cdfb9026885cea39d843b49d864d78c372559bd3706391d2748931da5b96839a92826775292c5e925e947d500653899f8eb1d9be819
-DIST aria2-1.18.0.tar.bz2 2080003 SHA256 ad811508d5153d138de2c43228c36fa046574bf2e94e108af558db7722f6513a SHA512 bb52ef1c6963db6649fbcde2110d6ba659a7f8f5851c7f5d9bdbebbdff7e68cc5e435a8a1ae32c5e78bb812d6e84caab9d14ee8cc435c24902c6499a3df1aca8 WHIRLPOOL 0e6f022719c05991033ef4651c8d58cafcd14a6a81d7e476aa168e3d52293abe148958ed00b92552d6e9a4fb7ffd10634658e6c2820c2c8654b493ea14a4e82a
-DIST aria2-1.18.5.tar.bz2 2102797 SHA256 25e21f94bb278a8624e0e4e131e740d105f7d5570290053beb8ae6c33fb9ce3f SHA512 bb08305026db77c9e58d7b059d7b68a0bfbffcbdcf2898117ed37f7e23b95675c9744de50b789658cc9cad81f40ef422f0936499ccdbeb37eaa2f7281c8adff9 WHIRLPOOL 483a75d4efb28839b85de06dc18b5ed05f3e49b91f24dde189add4ce9a5912d7587b3ba2309b2a394addf7676ed121f9707da240e5c33e8a4757341f27c6efde
-DIST aria2-1.18.7.tar.bz2 2141933 SHA256 358bda2a7b1d5aca1acc4b528f32bd01f5db819c067e7a4bbfab08d23500368f SHA512 d8b70d0235eb96289ebeb4adc4c5a917785dcd15ebae884b367b3645717bc969ded9c0f520be773fc80ed5dd112fd5937bee6cb0e8c238dc39debbf8862b25a3 WHIRLPOOL 714c2d88ef5a66e3d08970aa02dfa1a2da284042faf5e6e8ad6bb6f6706c8c4ba1d44681ef0f6c58ced052debb000cebcc0266b45226f31983bb3e3790149d7c
-DIST aria2-1.18.9.tar.bz2 2151923 SHA256 e24bca91edbe8fff52615420085317ce22faec4a0a9c34843f86dbcc2a79c4b2 SHA512 6a701f23167255a8ea135c6c9455a11d0eddf007fbcc1c3af663dd98825c0812d7db0214be963a06740e60d8b6fdae92bee5062aa4864b212b959e97ac857d74 WHIRLPOOL 0996dbbcd9828e8a977275f889e14a0e5a8fc0dc5d1a05a7550542cab27de252597389a796da98590935d02a81fdf302f9d078c8c0068af0587a2437ee01e85a
DIST aria2-1.19.0.tar.bz2 2155310 SHA256 ae2b6fce7a0974c9156415cccf2395cd258580ab34eec2b34a8e76120b7240ce SHA512 ba505b45f84266543cb403752cc3592469545dea806e77bd7b7fec1fbe7ed5baf14372cf6dea840ccbdd054cd0c92cdeb4516eb52b167aca03909000f02aec95 WHIRLPOOL b13502f9dd646832799af6a0db199e87abae042c0e48b778f9b782d56d838c5b9d36bc04c487534f3fe1c59e970dc34702facc5508927325e34bcffa39946519
DIST aria2-1.19.2.tar.xz 1377356 SHA256 3605486dd495cd8c2f672b7d0b763397989d831396862f15730697ebcf0ad53e SHA512 ae3fb231fa9f989a8c4f8015d7e64db2b62b922548839a884454ef1fc6dc024363b482268200efa234ac71a1dba969aaefbeb81c811223e2e117f3adae9a8468 WHIRLPOOL 10f4ad709e26f29685b05e5db4fde687c733404a994649d4f5c5a8f66bf60142ae3bc65179db7b83766e32663100b5c7c58f1b6e4a6f6a4d2f089176604a8c95
DIST aria2-1.21.0.tar.xz 1438608 SHA256 225c5f2c8acc899e0a802cdf198f82bd0d3282218e80cdce251b1f9ffacf6580 SHA512 2862d82f064de160b64705ee5ae9180e7402859c7c0d9bc5421b1368cebd143e0a0e2e971713cd27f11efbeffe6618e801309ff34b12aeb00060b9de58652251 WHIRLPOOL 07030ec26b002c98f8a76984bec1594b76dba404c40dbda8d4d80d682ee41ac7667c45c9fb723fa335906ebf0f462f4d2bd924ce64422a26d23d7da4ae5b62d9
diff --git a/net-misc/aria2/aria2-1.16.3.ebuild b/net-misc/aria2/aria2-1.16.3.ebuild
deleted file mode 100644
index 13d72b6..0000000
--- a/net-misc/aria2/aria2-1.16.3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="http://aria2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-SLOT="0"
-IUSE="adns bittorrent +gnutls +libxml2 metalink +nettle nls sqlite scripts ssl test xmlrpc"
-
-CDEPEND="sys-libs/zlib
- ssl? (
- app-misc/ca-certificates
- gnutls? ( >=net-libs/gnutls-1.2.9 )
- !gnutls? ( dev-libs/openssl ) )
- adns? ( >=net-dns/c-ares-1.5.0 )
- bittorrent? (
- ssl? (
- gnutls? (
- nettle? ( >=dev-libs/nettle-2.4[gmp] >=dev-libs/gmp-5 )
- !nettle? ( >=dev-libs/libgcrypt-1.2.2:0 ) ) )
- !ssl? (
- nettle? ( >=dev-libs/nettle-2.4[gmp] >=dev-libs/gmp-5 )
- !nettle? ( >=dev-libs/libgcrypt-1.2.2:0 ) ) )
- metalink? (
- libxml2? ( >=dev-libs/libxml2-2.6.26 )
- !libxml2? ( dev-libs/expat ) )
- sqlite? ( dev-db/sqlite:3 )
- xmlrpc? (
- libxml2? ( >=dev-libs/libxml2-2.6.26 )
- !libxml2? ( dev-libs/expat ) )"
-
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
- nls? ( virtual/libiconv virtual/libintl )
- scripts? ( dev-lang/ruby )"
-
-pkg_setup() {
- if use scripts && use !xmlrpc && use !metalink; then
- ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
- ewarn "and aria2mon scripts against the local aria2."
- fi
-}
-
-src_prepare() {
- epatch_user
- sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
- # Notes:
- # - always enable gzip/http compression since zlib should always be available anyway
- # - always enable epoll since we can assume kernel 2.6.x
- # - other options for threads: solaris, pth, win32
- local myconf=(
- --enable-epoll
- --enable-threads=posix
- --with-libz
- --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
- $(use_enable nls)
- $(use_enable metalink)
- $(use_with sqlite sqlite3)
- $(use_enable bittorrent)
- $(use_with adns libcares)
- )
-
- # SSL := gnutls / openssl
- # USE=ssl
- # + USE=gnutls -> gnutls
- # + USE=-gnutls -> openssl
-
- if use ssl; then
- myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
- else
- myconf+=( --without-gnutls --without-openssl )
- fi
-
- # message-digest := nettle / gcrypt / openssl
- # bignum := nettle+gmp / gcrypt / openssl
- # bittorrent := message-digest + bignum
- # USE=bittorrent
- # + USE=(ssl -gnutls) -> openssl
- # + USE=nettle -> nettle+gmp
- # + USE=-nettle -> gcrypt
-
- if use !bittorrent || use ssl && use !gnutls; then
- myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
- else
- myconf+=( $(use_with !nettle libgcrypt)
- $(use_with nettle libnettle) $(use_with nettle libgmp) )
- fi
-
- # metalink+xmlrpc := libxml2 / expat
- # USE=(metalink || xmlrpc)
- # + USE=libxml2 -> libxml2
- # + USE=-libxml2 -> expat
-
- if use metalink || use xmlrpc; then
- myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
- else
- myconf+=( --without-libexpat --without-libxml2 )
- fi
-
- # Note:
- # - always enable gzip/http compression since zlib should always be available anyway
- # - always enable epoll since we can assume kernel 2.6.x
- # - other options for threads: solaris, pth, win32
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/usr/share/doc/aria2 \
- "${D}"/usr/share/doc/${PF}/README{,.html}
-
- dobashcomp doc/bash_completion/aria2c
- use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
- if use xmlrpc || use metalink; then
- elog "If you would like to use the additional aria2mon and aria2rpc tools,"
- elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
- fi
-}
diff --git a/net-misc/aria2/aria2-1.16.5.ebuild b/net-misc/aria2/aria2-1.16.5.ebuild
deleted file mode 100644
index 4f3360c..0000000
--- a/net-misc/aria2/aria2-1.16.5.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="http://aria2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-SLOT="0"
-IUSE="adns bittorrent +gnutls +libxml2 metalink +nettle nls sqlite scripts ssl test xmlrpc"
-
-CDEPEND="sys-libs/zlib
- ssl? (
- app-misc/ca-certificates
- gnutls? ( >=net-libs/gnutls-1.2.9 )
- !gnutls? ( dev-libs/openssl ) )
- adns? ( >=net-dns/c-ares-1.5.0 )
- bittorrent? (
- ssl? (
- gnutls? (
- nettle? ( >=dev-libs/nettle-2.4[gmp] >=dev-libs/gmp-5 )
- !nettle? ( >=dev-libs/libgcrypt-1.2.2:0 ) ) )
- !ssl? (
- nettle? ( >=dev-libs/nettle-2.4[gmp] >=dev-libs/gmp-5 )
- !nettle? ( >=dev-libs/libgcrypt-1.2.2:0 ) ) )
- metalink? (
- libxml2? ( >=dev-libs/libxml2-2.6.26 )
- !libxml2? ( dev-libs/expat ) )
- sqlite? ( dev-db/sqlite:3 )
- xmlrpc? (
- libxml2? ( >=dev-libs/libxml2-2.6.26 )
- !libxml2? ( dev-libs/expat ) )"
-
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
- nls? ( virtual/libiconv virtual/libintl )
- scripts? ( dev-lang/ruby )"
-
-pkg_setup() {
- if use scripts && use !xmlrpc && use !metalink; then
- ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
- ewarn "and aria2mon scripts against the local aria2."
- fi
-}
-
-src_prepare() {
- epatch_user
- sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
- local myconf=(
- # threads, epoll: check for best portability
-
- # do not try to compile and run a test LIBXML program
- --disable-xmltest
- # zlib should always be available anyway
- --with-libz
- --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
- # optional features
- $(use_enable bittorrent)
- $(use_enable metalink)
- $(use_enable nls)
- $(use_with sqlite sqlite3)
- $(use_with adns libcares)
- )
-
- # SSL := gnutls / openssl
- # USE=ssl
- # + USE=gnutls -> gnutls
- # + USE=-gnutls -> openssl
-
- if use ssl; then
- myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
- else
- myconf+=( --without-gnutls --without-openssl )
- fi
-
- # message-digest := nettle / gcrypt / openssl
- # bignum := nettle+gmp / gcrypt / openssl
- # bittorrent := message-digest + bignum
- # USE=bittorrent
- # + USE=(ssl -gnutls) -> openssl
- # + USE=nettle -> nettle+gmp
- # + USE=-nettle -> gcrypt
-
- if use !bittorrent || use ssl && use !gnutls; then
- myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
- else
- myconf+=( $(use_with !nettle libgcrypt)
- $(use_with nettle libnettle) $(use_with nettle libgmp) )
- fi
-
- # metalink+xmlrpc := libxml2 / expat
- # USE=(metalink || xmlrpc)
- # + USE=libxml2 -> libxml2
- # + USE=-libxml2 -> expat
-
- if use metalink || use xmlrpc; then
- myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
- else
- myconf+=( --without-libexpat --without-libxml2 )
- fi
-
- # Note:
- # - always enable gzip/http compression since zlib should always be available anyway
- # - always enable epoll since we can assume kernel 2.6.x
- # - other options for threads: solaris, pth, win32
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/usr/share/doc/aria2 \
- "${D}"/usr/share/doc/${PF}/README{,.html}
-
- dobashcomp doc/bash_completion/aria2c
- use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
- if use xmlrpc || use metalink; then
- elog "If you would like to use the additional aria2mon and aria2rpc tools,"
- elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
- fi
-}
diff --git a/net-misc/aria2/aria2-1.18.0.ebuild b/net-misc/aria2/aria2-1.18.0.ebuild
deleted file mode 100644
index 8f9dd49..0000000
--- a/net-misc/aria2/aria2-1.18.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="http://aria2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls libuv +libxml2 metalink +nettle nls sqlite scripts ssl test xmlrpc"
-
-CDEPEND="sys-libs/zlib:0=
- ssl? (
- app-misc/ca-certificates
- gnutls? ( >=net-libs/gnutls-1.2.9:0= )
- !gnutls? ( dev-libs/openssl:0= ) )
- adns? ( >=net-dns/c-ares-1.5.0:0= )
- bittorrent? (
- ssl? (
- gnutls? (
- nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
- !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
- !ssl? (
- nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
- !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
- libuv? ( dev-libs/libuv:0= )
- metalink? (
- libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
- !libxml2? ( dev-libs/expat:0= ) )
- sqlite? ( dev-db/sqlite:3= )
- xmlrpc? (
- libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
- !libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
- nls? ( virtual/libiconv virtual/libintl )
- scripts? ( dev-lang/ruby )"
-
-pkg_setup() {
- if use scripts && use !xmlrpc && use !metalink; then
- ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
- ewarn "and aria2mon scripts against the local aria2."
- fi
-}
-
-src_prepare() {
- epatch_user
- sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
- local myconf=(
- # threads, epoll: check for best portability
-
- # do not try to compile and run a test LIBXML program
- --disable-xmltest
- # enable the shared library
- --enable-libaria2
- # zlib should always be available anyway
- --with-libz
- --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
- # optional features
- $(use_enable bittorrent)
- $(use_enable metalink)
- $(use_enable nls)
- $(use_with sqlite sqlite3)
- $(use_with adns libcares)
- $(use_with libuv)
- )
-
- # SSL := gnutls / openssl
- # USE=ssl
- # + USE=gnutls -> gnutls
- # + USE=-gnutls -> openssl
-
- if use ssl; then
- myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
- else
- myconf+=( --without-gnutls --without-openssl )
- fi
-
- # message-digest := nettle / gcrypt / openssl
- # bignum := nettle+gmp / gcrypt / openssl
- # bittorrent := message-digest + bignum
- # USE=bittorrent
- # + USE=(ssl -gnutls) -> openssl
- # + USE=nettle -> nettle+gmp
- # + USE=-nettle -> gcrypt
-
- if use !bittorrent || use ssl && use !gnutls; then
- myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
- else
- myconf+=( $(use_with !nettle libgcrypt)
- $(use_with nettle libnettle) $(use_with nettle libgmp) )
- fi
-
- # metalink+xmlrpc := libxml2 / expat
- # USE=(metalink || xmlrpc)
- # + USE=libxml2 -> libxml2
- # + USE=-libxml2 -> expat
-
- if use metalink || use xmlrpc; then
- myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
- else
- myconf+=( --without-libexpat --without-libxml2 )
- fi
-
- # Note:
- # - always enable gzip/http compression since zlib should always be available anyway
- # - always enable epoll since we can assume kernel 2.6.x
- # - other options for threads: solaris, pth, win32
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/usr/share/doc/aria2 \
- "${D}"/usr/share/doc/${PF}/README{,.html}
-
- dobashcomp doc/bash_completion/aria2c
- use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
- if use xmlrpc || use metalink; then
- elog "If you would like to use the additional aria2mon and aria2rpc tools,"
- elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
- fi
-}
diff --git a/net-misc/aria2/aria2-1.18.5.ebuild b/net-misc/aria2/aria2-1.18.5.ebuild
deleted file mode 100644
index 391a622..0000000
--- a/net-misc/aria2/aria2-1.18.5.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="http://aria2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssl tcmalloc test xmlrpc"
-
-CDEPEND="sys-libs/zlib:0=
- ssl? (
- app-misc/ca-certificates
- gnutls? ( >=net-libs/gnutls-1.2.9:0= )
- !gnutls? ( dev-libs/openssl:0= ) )
- adns? ( >=net-dns/c-ares-1.5.0:0= )
- bittorrent? (
- ssl? (
- gnutls? (
- nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
- !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
- !ssl? (
- nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
- !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
- jemalloc? ( dev-libs/jemalloc )
- libuv? ( dev-libs/libuv:0= )
- metalink? (
- libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
- !libxml2? ( dev-libs/expat:0= ) )
- sqlite? ( dev-db/sqlite:3= )
- tcmalloc? ( dev-util/google-perftools )
- xmlrpc? (
- libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
- !libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
- nls? ( virtual/libiconv virtual/libintl )
- scripts? ( dev-lang/ruby )"
-
-REQUIRED_USE="jemalloc? ( !tcmalloc )
- tcmalloc? ( !jemalloc )"
-
-pkg_setup() {
- if use scripts && use !xmlrpc && use !metalink; then
- ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
- ewarn "and aria2mon scripts against the local aria2."
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-fix-gnutls-2.x-compatibility.patch"
- epatch_user
- sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
- local myconf=(
- # threads, epoll: check for best portability
-
- # do not try to compile and run a test LIBXML program
- --disable-xmltest
- # enable the shared library
- --enable-libaria2
- # zlib should always be available anyway
- --with-libz
- --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
- # optional features
- $(use_enable bittorrent)
- $(use_enable metalink)
- $(use_enable nls)
- $(use_with sqlite sqlite3)
- $(use_with adns libcares)
- $(use_with libuv)
- $(use_with jemalloc)
- $(use_with tcmalloc)
- )
-
- # SSL := gnutls / openssl
- # USE=ssl
- # + USE=gnutls -> gnutls
- # + USE=-gnutls -> openssl
-
- if use ssl; then
- myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
- else
- myconf+=( --without-gnutls --without-openssl )
- fi
-
- # message-digest := nettle / gcrypt / openssl
- # bignum := nettle+gmp / gcrypt / openssl
- # bittorrent := message-digest + bignum
- # USE=bittorrent
- # + USE=(ssl -gnutls) -> openssl
- # + USE=nettle -> nettle+gmp
- # + USE=-nettle -> gcrypt
-
- if use !bittorrent || use ssl && use !gnutls; then
- myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
- else
- myconf+=( $(use_with !nettle libgcrypt)
- $(use_with nettle libnettle) $(use_with nettle libgmp) )
- fi
-
- # metalink+xmlrpc := libxml2 / expat
- # USE=(metalink || xmlrpc)
- # + USE=libxml2 -> libxml2
- # + USE=-libxml2 -> expat
-
- if use metalink || use xmlrpc; then
- myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
- else
- myconf+=( --without-libexpat --without-libxml2 )
- fi
-
- # Note:
- # - always enable gzip/http compression since zlib should always be available anyway
- # - always enable epoll since we can assume kernel 2.6.x
- # - other options for threads: solaris, pth, win32
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/usr/share/doc/aria2 \
- "${D}"/usr/share/doc/${PF}/README{,.html}
-
- dobashcomp doc/bash_completion/aria2c
- use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
- if use xmlrpc || use metalink; then
- elog "If you would like to use the additional aria2mon and aria2rpc tools,"
- elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
- fi
-}
diff --git a/net-misc/aria2/aria2-1.18.7.ebuild b/net-misc/aria2/aria2-1.18.7.ebuild
deleted file mode 100644
index 897ac32..0000000
--- a/net-misc/aria2/aria2-1.18.7.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="http://aria2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssl tcmalloc test xmlrpc"
-
-CDEPEND="sys-libs/zlib:0=
- ssl? (
- app-misc/ca-certificates
- gnutls? ( >=net-libs/gnutls-1.2.9:0= )
- !gnutls? ( dev-libs/openssl:0= ) )
- adns? ( >=net-dns/c-ares-1.5.0:0= )
- bittorrent? (
- ssl? (
- gnutls? (
- nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
- !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
- !ssl? (
- nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
- !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
- jemalloc? ( dev-libs/jemalloc )
- libuv? ( dev-libs/libuv:0= )
- metalink? (
- libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
- !libxml2? ( dev-libs/expat:0= ) )
- sqlite? ( dev-db/sqlite:3= )
- tcmalloc? ( dev-util/google-perftools )
- xmlrpc? (
- libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
- !libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
- nls? ( virtual/libiconv virtual/libintl )
- scripts? ( dev-lang/ruby )"
-
-REQUIRED_USE="jemalloc? ( !tcmalloc )
- tcmalloc? ( !jemalloc )"
-
-pkg_setup() {
- if use scripts && use !xmlrpc && use !metalink; then
- ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
- ewarn "and aria2mon scripts against the local aria2."
- fi
-}
-
-src_prepare() {
- epatch_user
- sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
- local myconf=(
- # threads, epoll: check for best portability
-
- # do not try to compile and run a test LIBXML program
- --disable-xmltest
- # enable the shared library
- --enable-libaria2
- # zlib should always be available anyway
- --with-libz
- --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
- # optional features
- $(use_enable bittorrent)
- $(use_enable metalink)
- $(use_enable nls)
- $(use_with sqlite sqlite3)
- $(use_with adns libcares)
- $(use_with libuv)
- $(use_with jemalloc)
- $(use_with tcmalloc)
- )
-
- # SSL := gnutls / openssl
- # USE=ssl
- # + USE=gnutls -> gnutls
- # + USE=-gnutls -> openssl
-
- if use ssl; then
- myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
- else
- myconf+=( --without-gnutls --without-openssl )
- fi
-
- # message-digest := nettle / gcrypt / openssl
- # bignum := nettle+gmp / gcrypt / openssl
- # bittorrent := message-digest + bignum
- # USE=bittorrent
- # + USE=(ssl -gnutls) -> openssl
- # + USE=nettle -> nettle+gmp
- # + USE=-nettle -> gcrypt
-
- if use !bittorrent || use ssl && use !gnutls; then
- myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
- else
- myconf+=( $(use_with !nettle libgcrypt)
- $(use_with nettle libnettle) $(use_with nettle libgmp) )
- fi
-
- # metalink+xmlrpc := libxml2 / expat
- # USE=(metalink || xmlrpc)
- # + USE=libxml2 -> libxml2
- # + USE=-libxml2 -> expat
-
- if use metalink || use xmlrpc; then
- myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
- else
- myconf+=( --without-libexpat --without-libxml2 )
- fi
-
- # Note:
- # - always enable gzip/http compression since zlib should always be available anyway
- # - always enable epoll since we can assume kernel 2.6.x
- # - other options for threads: solaris, pth, win32
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/usr/share/doc/aria2 \
- "${D}"/usr/share/doc/${PF}/README{,.html}
-
- dobashcomp doc/bash_completion/aria2c
- use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
- if use xmlrpc || use metalink; then
- elog "If you would like to use the additional aria2mon and aria2rpc tools,"
- elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
- fi
-}
diff --git a/net-misc/aria2/aria2-1.18.9.ebuild b/net-misc/aria2/aria2-1.18.9.ebuild
deleted file mode 100644
index 493e87f..0000000
--- a/net-misc/aria2/aria2-1.18.9.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="http://aria2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssl tcmalloc test xmlrpc"
-
-CDEPEND="sys-libs/zlib:0=
- ssl? (
- app-misc/ca-certificates
- gnutls? ( >=net-libs/gnutls-1.2.9:0= )
- !gnutls? ( dev-libs/openssl:0= ) )
- adns? ( >=net-dns/c-ares-1.5.0:0= )
- bittorrent? (
- ssl? (
- gnutls? (
- nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
- !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
- !ssl? (
- nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
- !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
- jemalloc? ( dev-libs/jemalloc )
- libuv? ( dev-libs/libuv:0= )
- metalink? (
- libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
- !libxml2? ( dev-libs/expat:0= ) )
- sqlite? ( dev-db/sqlite:3= )
- tcmalloc? ( dev-util/google-perftools )
- xmlrpc? (
- libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
- !libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
- nls? ( virtual/libiconv virtual/libintl )
- scripts? ( dev-lang/ruby )"
-
-REQUIRED_USE="jemalloc? ( !tcmalloc )
- tcmalloc? ( !jemalloc )"
-
-pkg_setup() {
- if use scripts && use !xmlrpc && use !metalink; then
- ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
- ewarn "and aria2mon scripts against the local aria2."
- fi
-}
-
-src_prepare() {
- epatch_user
- sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
- local myconf=(
- # threads, epoll: check for best portability
-
- # do not try to compile and run a test LIBXML program
- --disable-xmltest
- # enable the shared library
- --enable-libaria2
- # zlib should always be available anyway
- --with-libz
- --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
- # optional features
- $(use_enable bittorrent)
- $(use_enable metalink)
- $(use_enable nls)
- $(use_with sqlite sqlite3)
- $(use_with adns libcares)
- $(use_with libuv)
- $(use_with jemalloc)
- $(use_with tcmalloc)
- )
-
- # SSL := gnutls / openssl
- # USE=ssl
- # + USE=gnutls -> gnutls
- # + USE=-gnutls -> openssl
-
- if use ssl; then
- myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
- else
- myconf+=( --without-gnutls --without-openssl )
- fi
-
- # message-digest := nettle / gcrypt / openssl
- # bignum := nettle+gmp / gcrypt / openssl
- # bittorrent := message-digest + bignum
- # USE=bittorrent
- # + USE=(ssl -gnutls) -> openssl
- # + USE=nettle -> nettle+gmp
- # + USE=-nettle -> gcrypt
-
- if use !bittorrent || use ssl && use !gnutls; then
- myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
- else
- myconf+=( $(use_with !nettle libgcrypt)
- $(use_with nettle libnettle) $(use_with nettle libgmp) )
- fi
-
- # metalink+xmlrpc := libxml2 / expat
- # USE=(metalink || xmlrpc)
- # + USE=libxml2 -> libxml2
- # + USE=-libxml2 -> expat
-
- if use metalink || use xmlrpc; then
- myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
- else
- myconf+=( --without-libexpat --without-libxml2 )
- fi
-
- # Note:
- # - always enable gzip/http compression since zlib should always be available anyway
- # - always enable epoll since we can assume kernel 2.6.x
- # - other options for threads: solaris, pth, win32
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/usr/share/doc/aria2 \
- "${D}"/usr/share/doc/${PF}/README{,.html}
-
- dobashcomp doc/bash_completion/aria2c
- use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
- if use xmlrpc || use metalink; then
- elog "If you would like to use the additional aria2mon and aria2rpc tools,"
- elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
- fi
-}
diff --git a/net-misc/aria2/files/aria2-1.18.5-fix-gnutls-2.x-compatibility.patch b/net-misc/aria2/files/aria2-1.18.5-fix-gnutls-2.x-compatibility.patch
deleted file mode 100644
index 2c3628c..0000000
--- a/net-misc/aria2/files/aria2-1.18.5-fix-gnutls-2.x-compatibility.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 13a202df070dd58bb930549c62627dcd97b02b86 Mon Sep 17 00:00:00 2001
-From: Nils Maier <maierman@web.de>
-Date: Sat, 12 Apr 2014 02:51:21 +0200
-Subject: [PATCH] Fix GnuTLS 2.x compatiblity
-
-Closes GH-216
----
- src/LibgnutlsTLSSession.cc | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/LibgnutlsTLSSession.cc b/src/LibgnutlsTLSSession.cc
-index 61c4550..94abf6f 100644
---- a/src/LibgnutlsTLSSession.cc
-+++ b/src/LibgnutlsTLSSession.cc
-@@ -75,6 +75,7 @@ GnuTLSSession::~GnuTLSSession()
-
- int GnuTLSSession::init(sock_t sockfd)
- {
-+#if GNUTLS_VERSION_NUMBER >= 0x030000
- unsigned int flags = tlsContext_->getSide() == TLS_CLIENT ?
- GNUTLS_CLIENT : GNUTLS_SERVER;
- #ifdef A2_DISABLE_OCSP
-@@ -84,6 +85,11 @@ int GnuTLSSession::init(sock_t sockfd)
- #endif // A2_DISABLE_OCSP
-
- rv_ = gnutls_init(&sslSession_, flags);
-+#else // GNUTLS_VERSION_NUMBER >= 0x030000
-+ rv_ = gnutls_init(
-+ &sslSession_,
-+ tlsContext_->getSide() == TLS_CLIENT ? GNUTLS_CLIENT : GNUTLS_SERVER);
-+#endif // GNUTLS_VERSION_NUMBER >= 0x030000
- if(rv_ != GNUTLS_E_SUCCESS) {
- return TLS_ERR_ERROR;
- }
---
-1.9.3
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/aria2/, net-misc/aria2/files/
@ 2018-05-30 6:38 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2018-05-30 6:38 UTC (permalink / raw
To: gentoo-commits
commit: c3d0fdfb770b1c5d4ffdba023b7085cf7ff3b5a6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 30 06:36:04 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 30 06:38:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d0fdfb
net-misc/aria2: Backport make_unique fix
Closes: https://bugs.gentoo.org/655892
net-misc/aria2/aria2-1.34.0.ebuild | 1 +
.../aria2/files/aria2-1.34.0-make_unique.patch | 44 ++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/net-misc/aria2/aria2-1.34.0.ebuild b/net-misc/aria2/aria2-1.34.0.ebuild
index 330ad0add54..aa58515c9fb 100644
--- a/net-misc/aria2/aria2-1.34.0.ebuild
+++ b/net-misc/aria2/aria2-1.34.0.ebuild
@@ -63,6 +63,7 @@ pkg_setup() {
}
src_prepare() {
+ eapply "${FILESDIR}"/${P}-make_unique.patch
default
sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
}
diff --git a/net-misc/aria2/files/aria2-1.34.0-make_unique.patch b/net-misc/aria2/files/aria2-1.34.0-make_unique.patch
new file mode 100644
index 00000000000..448d6cfe775
--- /dev/null
+++ b/net-misc/aria2/files/aria2-1.34.0-make_unique.patch
@@ -0,0 +1,44 @@
+From e8e04d6f22a507e8374651d3d2343cd9fb986993 Mon Sep 17 00:00:00 2001
+From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
+Date: Thu, 17 May 2018 18:39:44 +0900
+Subject: [PATCH] Fix build failure when InternalDHKeyExchange is used
+
+---
+ src/bignum.h | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/bignum.h b/src/bignum.h
+index e59ab6bbf..5fb4402bc 100644
+--- a/src/bignum.h
++++ b/src/bignum.h
+@@ -19,6 +19,8 @@
+ #include <memory>
+ #include <stdint.h>
+
++#include "a2functional.h"
++
+ namespace bignum {
+
+ template <size_t dim> class ulong {
+@@ -31,17 +33,17 @@ template <size_t dim> class ulong {
+ std::unique_ptr<char_t[]> buf_;
+
+ public:
+- inline ulong() : buf_(make_unique<char_t[]>(dim)) {}
+- inline ulong(size_t t) : buf_(make_unique<char_t[]>(dim))
++ inline ulong() : buf_(aria2::make_unique<char_t[]>(dim)) {}
++ inline ulong(size_t t) : buf_(aria2::make_unique<char_t[]>(dim))
+ {
+ memcpy(buf_.get(), (char_t*)&t, sizeof(t));
+ }
+- inline ulong(const ulong<dim>& rhs) : buf_(make_unique<char_t[]>(dim))
++ inline ulong(const ulong<dim>& rhs) : buf_(aria2::make_unique<char_t[]>(dim))
+ {
+ memcpy(buf_.get(), rhs.buf_.get(), dim);
+ }
+ explicit inline ulong(const char_t* data, size_t size)
+- : buf_(make_unique<char_t[]>(dim))
++ : buf_(aria2::make_unique<char_t[]>(dim))
+ {
+ if (size > dim) {
+ throw std::bad_alloc();
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-05-30 6:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-24 12:45 [gentoo-commits] repo/gentoo:master commit in: net-misc/aria2/, net-misc/aria2/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2018-05-30 6:38 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox