From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-libs/botan/Manifest | 7 - dev-libs/botan/botan-1.10.17.ebuild | 158 ---------------------- dev-libs/botan/botan-2.6.0.ebuild | 92 ------------- dev-libs/botan/files/botan-1.10.17-build.patch | 25 ---- dev-libs/botan/files/botan-1.10.17-libressl.patch | 40 ------ dev-libs/botan/metadata.xml | 22 --- 6 files changed, 344 deletions(-) delete mode 100644 dev-libs/botan/Manifest delete mode 100644 dev-libs/botan/botan-1.10.17.ebuild delete mode 100644 dev-libs/botan/botan-2.6.0.ebuild delete mode 100644 dev-libs/botan/files/botan-1.10.17-build.patch delete mode 100644 dev-libs/botan/files/botan-1.10.17-libressl.patch delete mode 100644 dev-libs/botan/metadata.xml (limited to 'dev-libs/botan') diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest deleted file mode 100644 index 71f1dfb12cef..000000000000 --- a/dev-libs/botan/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432ee7af503dd2fc8a59185c5406b659629ee5a0c4f73c2c090dfccf64757baea196fcca4f60379a2b2f04baf81ee6 SHA512 bccb615e832ef31381afd0996a06cfb4c37f29bd8d7691435d592f2ec88f525f3e9e19adf84c78ebd6f24f60e407e29ef99bdff11103ef1344250fe5251fca0a -AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642 -DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649 -DIST Botan-2.6.0.tgz 6599127 BLAKE2B c45a974f89571c1050e28108267ca6ec094171be3d7dbcb033b86b7dac3f8074703c40c42d5737074a86c19266b4b47c266d0864ce08ee26fad05116a50c48a8 SHA512 2082b4aaac0802f117a5f75c67a69e6d364b436a0ebe543032e370c3f085752bbe1ca48051462066e13bd42e47573ebc532d1d45074fe406df032f33346ee645 -EBUILD botan-1.10.17.ebuild 4221 BLAKE2B 463e3e2b0893b5c9330c7d317fb089f70cc8adf2f60654711674bfb1eeb3c2b34e44e5695b230078510821cb7f45a23745016ebfd6c30cc660d6a132f4ef3223 SHA512 00065423d5f3600a08542e8722ce63dcf6147bce0b2104e466acf444c7e107f191652b588d7b7054652099cb89973b646987084c39678a8472d565249e064f6b -EBUILD botan-2.6.0.ebuild 2339 BLAKE2B f3871202e70810f7003a16a02befc4bf69ff04baa451a80a2bfb13a96cb1cbc645a1f622941c9af27b2a6b8617fe69f81d601a1fc0738ac4f922465a8014277a SHA512 f46c844b7df21647876f933f4263427625fc2da6a6688c5333f4205fad06da0c99a68de152036778ba0a6b4890b772c8e41f95687786e6153ace2d52856be3b2 -MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561 diff --git a/dev-libs/botan/botan-1.10.17.ebuild b/dev-libs/botan/botan-1.10.17.ebuild deleted file mode 100644 index 76f17bc19eef..000000000000 --- a/dev-libs/botan/botan-1.10.17.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit multilib python-r1 toolchain-funcs - -MY_PN="Botan" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="A C++ crypto library" -HOMEPAGE="https://botan.randombit.net/" -SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz" - -KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos" -SLOT="0" -LICENSE="BSD" -IUSE="bindist doc python bzip2 gmp libressl ssl static-libs threads zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) - zlib? ( >=sys-libs/zlib-1.2.3 ) - python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] ) - gmp? ( >=dev-libs/gmp-4.2.2:* ) - ssl? ( - !libressl? ( /dev/null - insinto /usr/share/doc/${PF}/html - doins -r [a-z]* _static - popd > /dev/null - fi -} diff --git a/dev-libs/botan/botan-2.6.0.ebuild b/dev-libs/botan/botan-2.6.0.ebuild deleted file mode 100644 index 9ff13b7881c5..000000000000 --- a/dev-libs/botan/botan-2.6.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit multilib python-r1 toolchain-funcs versionator - -MY_PN="Botan" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="A C++ crypto library" -HOMEPAGE="https://botan.randombit.net/" -SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz" - -KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos" -SLOT="2/$(get_version_component_range 2)" # soname version -LICENSE="BSD" -IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib" - -S="${WORKDIR}/${MY_P}" - -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) - zlib? ( >=sys-libs/zlib-1.2.3 ) - boost? ( >=dev-libs/boost-1.48 ) - lzma? ( app-arch/xz-utils ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( - !libressl? ( dev-libs/openssl:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= ) - )" -DEPEND="${RDEPEND} - dev-lang/python:* - doc? ( dev-python/sphinx )" - -src_configure() { - local disable_modules=() - use boost || disable_modules+=( "boost" ) - use bindist && disable_modules+=( "ecdsa" ) - elog "Disabling modules: ${disable_modules[@]}" - - # Enable v9 instructions for sparc64 - if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then - CHOSTARCH="sparc32-v9" - else - CHOSTARCH="${CHOST%%-*}" - fi - - local myos= - case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; - esac - - local pythonvers=() - if use python; then - append() { - pythonvers+=( ${EPYTHON/python/} ) - } - python_foreach_impl append - fi - - CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \ - --prefix="${EPREFIX}/usr" \ - --libdir=$(get_libdir) \ - --docdir=share/doc \ - --cc=gcc \ - --os=${myos} \ - --cpu=${CHOSTARCH} \ - --with-endian="$(tc-endian)" \ - --without-doxygen \ - $(use_with bzip2) \ - $(use_with lzma) \ - $(use_with sqlite sqlite3) \ - $(use_with ssl openssl) \ - $(use_with zlib) \ - $(use_with boost) \ - $(use_with doc sphinx) \ - $(use_with doc documentation) \ - $(use_enable static-libs static-library) \ - --with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \ - --disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \ - || die "configure.py failed" -} - -src_test() { - LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed" -} - -src_install() { - default - use python && python_foreach_impl python_optimize -} diff --git a/dev-libs/botan/files/botan-1.10.17-build.patch b/dev-libs/botan/files/botan-1.10.17-build.patch deleted file mode 100644 index 43877972211a..000000000000 --- a/dev-libs/botan/files/botan-1.10.17-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c7963d28d03e5f65f4021a5b764dc4bff9417eda Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Wed, 4 Oct 2017 01:50:33 +0300 -Subject: [PATCH] gost_3411: use correct type for build to pass - ---- - src/hash/gost_3411/gost_3411.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hash/gost_3411/gost_3411.cpp b/src/hash/gost_3411/gost_3411.cpp -index 97aa399..7ca22dc 100644 ---- a/src/hash/gost_3411/gost_3411.cpp -+++ b/src/hash/gost_3411/gost_3411.cpp -@@ -91,7 +91,7 @@ void GOST_34_11::compress_n(const byte input[], size_t blocks) - // P transformation - for(size_t k = 0; k != 4; ++k) - { -- const uint64_t UVk = U[k] ^ V[k]; -+ const u64bit UVk = U[k] ^ V[k]; - for(size_t l = 0; l != 8; ++l) - key[4*l+k] = get_byte(l, UVk); - } --- -2.13.6 - diff --git a/dev-libs/botan/files/botan-1.10.17-libressl.patch b/dev-libs/botan/files/botan-1.10.17-libressl.patch deleted file mode 100644 index 5913bfd30494..000000000000 --- a/dev-libs/botan/files/botan-1.10.17-libressl.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e61a5f56fb404db3655909be4ce23c3a816cbb60 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Wed, 4 Oct 2017 22:16:31 +0300 -Subject: [PATCH] openssl: support libressl - -Signed-off-by: Alon Bar-Lev ---- - src/engine/openssl/ossl_bc.cpp | 2 +- - src/engine/openssl/ossl_md.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/engine/openssl/ossl_bc.cpp b/src/engine/openssl/ossl_bc.cpp -index 74660c7b5..cb184c202 100644 ---- a/src/engine/openssl/ossl_bc.cpp -+++ b/src/engine/openssl/ossl_bc.cpp -@@ -8,7 +8,7 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) - #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x" - #endif - -diff --git a/src/engine/openssl/ossl_md.cpp b/src/engine/openssl/ossl_md.cpp -index 2fcb2b0e5..9c43d616e 100644 ---- a/src/engine/openssl/ossl_md.cpp -+++ b/src/engine/openssl/ossl_md.cpp -@@ -8,7 +8,7 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) - #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x" - #endif - --- -2.13.6 - diff --git a/dev-libs/botan/metadata.xml b/dev-libs/botan/metadata.xml deleted file mode 100644 index dfd9dcf6cba7..000000000000 --- a/dev-libs/botan/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - lloyd@randombit.net - Jack Lloyd - - - crypto@gentoo.org - Crypto - - - proxy-maint@gentoo.org - Proxy Maintainers Project - - - use dev-libs/boost - - - botan soname version - - -- cgit v1.2.3