[gentoo-commits] dev/bicatali:master commit in: net-fs/cvmfs/

[Sebastien Fabbro]

commit:     947d8ff2e04ce14ca78d740978acccb9fb4d7b20
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Tue Nov 10 23:04:55 2015 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 23:04:55 2015 +0000
URL:        https://gitweb.gentoo.org/dev/bicatali.git/commit/?id=947d8ff2

adding sha3 bundle

 net-fs/cvmfs/cvmfs-9999.ebuild | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/net-fs/cvmfs/cvmfs-9999.ebuild b/net-fs/cvmfs/cvmfs-9999.ebuild
index 6e832ae..859dddb 100644
--- a/net-fs/cvmfs/cvmfs-9999.ebuild
+++ b/net-fs/cvmfs/cvmfs-9999.ebuild
@@ -84,21 +84,22 @@ src_prepare() {
                -e "s:/etc/bash_completion.d:$(get_bashcompdir):" \
                cvmfs/CMakeLists.txt || die
 
-       # hack for bundled vjson and sha2
-       # vjson and sha2 not worth unbundling upstreams are flaky/dead
+       # hack for bundled packages
+       # not worth unbundling upstreams are flaky/dead
        local pkg
-       for pkg in vjson sha2; do
+       for pkg in vjson sha2 sha3; do
                # respect toolchain variables
                sed -i \
                        -e 's/g++/$(CXX)/g' \
                        -e 's/gcc/$(CC)/g' \
+                       -e 's/CFLAGS/MYCFLAGS/g' \
                        -e 's/-O2/$(CFLAGS)/g' \
                        -e 's/-O2/$(CXXFLAGS)/g' \
                        -e 's/ar/$(AR)/' \
                        -e 's/ranlib/$(RANLIB)/' \
                        externals/${pkg}/src/Makefile || die
                mkdir -p "${WORKDIR}/${P}_build"/externals/build_${pkg}
-               cp externals/${pkg}/src/* \
+               cp -r externals/${pkg}/src/* \
                   "${WORKDIR}/${P}_build"/externals/build_${pkg}/ || die
        done
 }