diff options
Diffstat (limited to 'dev-libs/botan')
| -rw-r--r-- | dev-libs/botan/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/botan/botan-1.10.17-r2.ebuild (renamed from dev-libs/botan/botan-1.10.17.ebuild) | 12 | ||||
| -rw-r--r-- | dev-libs/botan/botan-2.7.0.ebuild | 39 |
3 files changed, 30 insertions, 25 deletions
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest index 79ed6fe545e4..93b4c954c86c 100644 --- a/dev-libs/botan/Manifest +++ b/dev-libs/botan/Manifest @@ -2,6 +2,6 @@ AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432e 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.7.0.tgz 7021654 BLAKE2B 3f18b7ba660a72a409beeaba8bd1b1bd021f645c135bed56d75b6ba906b7c28d1e14eac9550862500dda9c4b3ac3135cfc9c340e073c573deb66b236e09f8054 SHA512 992138d83e18aedf80337d825f80c34dd3d2177eb30967573c57cf9fb7e7f9a9965ae3d75f23635f4c93b4efb7bb5adbb3423702663c78a5eb905dd567561858 -EBUILD botan-1.10.17.ebuild 4274 BLAKE2B d88abeb1a9bfc04c121836a5a77a9b07ddb34c45244a85b0b74fe9346689736b882d489ff42a1b0726242771a90cdcacb053ba24b5a83c7d69ef8f6ea7f08ed5 SHA512 7cfd69bf005f0653793b4ece07bdba09b7b8ae8098da17b7ed028acfbd8fbef63a9568134f9ce3f7660761e5baa75f13f40f5d0c651acf7a00670907af85a534 -EBUILD botan-2.7.0.ebuild 2393 BLAKE2B 26b85ca13ac9f98c014fc58665df5331c0e6f56a4ca5823c1ad953e50c9b295c594b68740492ce6aa7e7b5433599d62bb90dce782b85bf3a972f1bcbbfd167c7 SHA512 494abf5e37c78ac82bf2e3f00efa0ef1cea54d62f54cad7883e46bf4339865223f495c0133b5ee9d0b4f2d9c33a89f363b3f3b5c37b62d3e32a1319c51b5d58e +EBUILD botan-1.10.17-r2.ebuild 4274 BLAKE2B cc2cc4d510a95803463c477848e09cfec79a11e5246d9c9d5678502f1f279989b0ebb92840e62c445bc13a0fe1276a41b63a3c1a14ad4b8bde058f51ac91e586 SHA512 5e256c4785e2560bcb151d687136688b3a2daa11e8f87a46965aa9e687b781c7fb00cabce5ee90b6fba6aca800ff636ee9921093d1de8d22a1780d809f0613de +EBUILD botan-2.7.0.ebuild 2480 BLAKE2B 3207ded4663f1cf2cd55153f4369fef6a4a93967703a1afbe8f91b2dc0cca944a89eeaef3dd64b3ee8253deb034b8c69e4adcc0c018f80b3dafbe145d0955ce1 SHA512 e5cd37b8ff517686c295b094e66305d5b3d5741d95ee42e62c03dc6e0d5b452257033bd7c740c59bc65e47b179c2e4b2ade7cd11ebbf629f12a0c2c842590ff7 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-r2.ebuild index 3288e91d07f7..6e97aaa2be67 100644 --- a/dev-libs/botan/botan-1.10.17.ebuild +++ b/dev-libs/botan/botan-1.10.17-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -128,15 +128,15 @@ src_test() { } src_install() { - emake DESTDIR="${ED}usr" install + emake DESTDIR="${ED}/usr" install if ! use static-libs; then - rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed' + rm "${ED}/usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed' fi # Add compatibility symlinks. - [[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed" - [[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed" + [[ -e "${ED}/usr/bin/botan-config" ]] && die "Compatibility code no longer needed" + [[ -e "${ED}/usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed" dosym botan-config-1.10 /usr/bin/botan-config dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc @@ -145,7 +145,7 @@ src_install() { rm -fr build/python ln -s "${BUILD_DIR}" build/python emake -f Makefile.python \ - PYTHON_SITE_PACKAGE_DIR="${ED}$(python_get_sitedir)" \ + PYTHON_SITE_PACKAGE_DIR="${D}$(python_get_sitedir)" \ install } python_foreach_impl installation diff --git a/dev-libs/botan/botan-2.7.0.ebuild b/dev-libs/botan/botan-2.7.0.ebuild index 9763cbe67a68..10f8cd214c78 100644 --- a/dev-libs/botan/botan-2.7.0.ebuild +++ b/dev-libs/botan/botan-2.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ 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" +KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos" SLOT="2/$(ver_cut 1-2)" # soname version LICENSE="BSD" IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib" @@ -49,8 +49,12 @@ src_configure() { local myos= case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; + *-darwin*) myos=darwin ;; + *) myos=linux ;; + esac + + case ${CHOST} in + hppa*) CHOSTARCH=parisc ;; esac local pythonvers=() @@ -62,25 +66,26 @@ src_configure() { 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_enable static-libs static-library) \ + $(use_with boost) \ $(use_with bzip2) \ + $(use_with doc documentation) \ + $(use_with doc sphinx) \ $(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[*]}" ) \ + $(usex hppa --without-stack-protector '') \ + --cc=gcc \ + --cpu=${CHOSTARCH} \ --disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \ + --docdir=share/doc \ + --libdir=$(get_libdir) \ + --os=${myos} \ + --prefix="${EPREFIX}/usr" \ + --with-endian="$(tc-endian)" \ + --with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \ + --without-doxygen \ || die "configure.py failed" } |