diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /app-crypt/libb2 | |
parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) |
gentoo resync : 14.05.2020
Diffstat (limited to 'app-crypt/libb2')
-rw-r--r-- | app-crypt/libb2/Manifest | 3 | ||||
-rw-r--r-- | app-crypt/libb2/files/libb2-0.98.1-distcc.patch | 16 | ||||
-rw-r--r-- | app-crypt/libb2/libb2-0.98.1-r3.ebuild (renamed from app-crypt/libb2/libb2-0.98.1-r1.ebuild) | 21 |
3 files changed, 30 insertions, 10 deletions
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest index a6fac6950a3c..955a10f8d7a5 100644 --- a/app-crypt/libb2/Manifest +++ b/app-crypt/libb2/Manifest @@ -1,4 +1,5 @@ +AUX libb2-0.98.1-distcc.patch 473 BLAKE2B 245a73813769d12c83089893d2a82fcb9f6f7f5a284b12997132d271484a4e5ca8df1891a83514a2c9aae984bd003424290ac4700c2e24a9885694c4e5bdedc3 SHA512 9684f9358dff01b23a799c74c0e72f3af9bec1a5577e66620c24b0a0e91a0e17fd6ab426b42e238375529eed4fbd47b5974764bd136907614abccd21c13d0c65 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b -EBUILD libb2-0.98.1-r1.ebuild 1744 BLAKE2B 21d757b2eb0d5d61620abd2a268389757cb38cbbb7e08953cdbf9070b588fba7ac59bd21121f4ab393fd482b25e82f5d2fefeae239d03e1066be295a1ab82d81 SHA512 69296789036f4d5e403f2d17c054c439a680ec8eeca1b483d88c24f27e13d44606ad7595d68fa9f5eeba1c9212f0f2553bf5c37f05484aa0b65bcec9f9e289d1 EBUILD libb2-0.98.1-r2.ebuild 1808 BLAKE2B b20f743e0ec0edd966ec8c1687a811c91c46c67dad1b066ac081ac9a33ef95ade63e7aea60719cf5717a1248eae926b074847f4ce4b0d03aeb8901538533142a SHA512 98e6f77472310acf180d7aae0bcd01881ac5c38147fd3839fdfa9c3b9d9a29fca8446094c40fdd2c40d5dd421825da0d5dffc9b2ca126580918a65ce11c75452 +EBUILD libb2-0.98.1-r3.ebuild 1862 BLAKE2B 497f383e92311492a64503af8ff15cdcce82ba0cea735b63115d19ac724fd4172d4ed1cc779d707b8cc60822e03211eb8e91fd916213455bf6e3a2e7be083ebc SHA512 8a5e4e74bffa44adcad06d76a8eb4c86d1dcd8404751ae3a82afe43c75dccd0bc0d5a2fafeda886d164408e58fff722d15bf4fe42379e5a827c0766059679715 MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11 diff --git a/app-crypt/libb2/files/libb2-0.98.1-distcc.patch b/app-crypt/libb2/files/libb2-0.98.1-distcc.patch new file mode 100644 index 000000000000..2e6a1671781b --- /dev/null +++ b/app-crypt/libb2/files/libb2-0.98.1-distcc.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/704044#c8 + +Patch by Alexey + +--- a/src/Makefile.am 2020-04-26 11:16:22.354103351 +0100 ++++ b/src/Makefile.am 2020-04-26 11:16:31.584080899 +0100 +@@ -18,8 +18,7 @@ LDFLAGS += -version-info $(B2_LIBRARY_VE + lib_LTLIBRARIES = libb2.la + libb2_la_LIBADD = # -lgomp -lpthread + libb2_la_CPPFLAGS = -DSUFFIX= \ +- $(LTDLINCL) \ +- ${top_builddir}/src/ ++ $(LTDLINCL) + + include_HEADERS = blake2.h + diff --git a/app-crypt/libb2/libb2-0.98.1-r1.ebuild b/app-crypt/libb2/libb2-0.98.1-r3.ebuild index a27fb95fcee3..930713363bac 100644 --- a/app-crypt/libb2/libb2-0.98.1-r1.ebuild +++ b/app-crypt/libb2/libb2-0.98.1-r3.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools toolchain-funcs +inherit autotools multilib-minimal toolchain-funcs DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp" HOMEPAGE="https://github.com/BLAKE2/libb2" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g LICENSE="CC0-1.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs native-cflags openmp" DEPEND=" @@ -24,6 +24,8 @@ RDEPEND="${DEPEND}" S=${WORKDIR}/${PN}-${GITHASH} +PATCHES=( "${FILESDIR}"/${P}-distcc.patch ) + pkg_setup() { if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && ! tc-has-openmp; then ewarn "You are using a compiler without OpenMP support" @@ -40,7 +42,8 @@ src_prepare() { eautoreconf # upstream doesn't make releases } -src_configure() { +multilib_src_configure() { + ECONF_SOURCE=${S} \ econf \ $(use_enable static-libs static) \ $(use_enable native-cflags native) \ @@ -53,15 +56,15 @@ do_make() { emake $(use native-cflags && echo no)CFLAGS="${CFLAGS} ${openmp}" "$@" } -src_compile() { +multilib_src_compile() { do_make } -src_test() { +multilib_src_test() { do_make check } -src_install() { - default - use static-libs || find "${ED}" -name '*.la' -type f -delete || die +multilib_src_install_all() { + einstalldocs + find "${ED}" -name '*.la' -type f -delete || die } |