commit: c4c12cc9ea4ca269107df171634d8994c65db05e
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 1 11:41:38 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Thu Oct 1 11:48:04 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4c12cc9
dev-libs/openssl: fix file collision with app-misc/c_rehash
Although we didn't install our c_rehash script, the
default install rules from the openssl build system
installs a perl version, triggering a file collision.
Gentoo-Bug: 561852
.../openssl/{openssl-1.0.2d-r1.ebuild => openssl-1.0.2d-r2.ebuild} | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dev-libs/openssl/openssl-1.0.2d-r1.ebuild
b/dev-libs/openssl/openssl-1.0.2d-r2.ebuild
similarity index 98%
rename from dev-libs/openssl/openssl-1.0.2d-r1.ebuild
rename to dev-libs/openssl/openssl-1.0.2d-r2.ebuild
index 29aa83c..c7bf2e2 100644
--- a/dev-libs/openssl/openssl-1.0.2d-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2d-r2.ebuild
@@ -199,6 +199,10 @@ multilib_src_install() {
}
multilib_src_install_all() {
+ # openssl installs perl version of c_rehash by default, but
+ # we provide a shell version via app-misc/c_rehash
+ rm "${ED}"/usr/bin/c_rehash
+
dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
dohtml -r doc/*
use rfc3779 && dodoc engines/ccgost/README.gost
