From 57e5f28a918bb8c926d294a2eb2acb406382f186 Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Sat, 8 Oct 2016 10:59:41 +0300 Subject: [PATCH] dev-libs/crypto++: fix symlink/directory collision for update Bug: 596500 Package-Manager: portage-2.3.0 --- ...ypto++-5.6.4-r1.ebuild => crypto++-5.6.4-r2.ebuild} | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) rename dev-libs/crypto++/{crypto++-5.6.4-r1.ebuild => crypto++-5.6.4-r2.ebuild} (89%) diff --git a/dev-libs/crypto++/crypto++-5.6.4-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.4-r2.ebuild similarity index 89% rename from dev-libs/crypto++/crypto++-5.6.4-r1.ebuild rename to dev-libs/crypto++/crypto++-5.6.4-r2.ebuild index ef464877de44..b21a0040628f 100644 --- a/dev-libs/crypto++/crypto++-5.6.4-r1.ebuild +++ b/dev-libs/crypto++/crypto++-5.6.4-r2.ebuild @@ -30,6 +30,7 @@ pkg_setup() { } src_configure() { + default cp config.recommend config.h || die } @@ -57,7 +58,7 @@ src_test() { } src_install() { - emake DESTDIR="${ED}" install + default # remove leftovers as build system sucks rm -fr "${ED}"/usr/bin "${ED}"/usr/share/cryptopp @@ -69,3 +70,10 @@ src_install() { ln -s "$(basename "${f}")" "$(echo "${f}" | sed 's/cryptopp/crypto++/')" || die done } + +pkg_preinst() { + # we switched directory to symlink + # make sure portage digests that + rm -fr "${EROOT}/usr/include/crypto++" + rm -fr "${EROOT}/usr/include/cryptopp" +} -- 2.26.2