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