From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5104B138330 for ; Sat, 8 Oct 2016 08:10:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A08E21C038; Sat, 8 Oct 2016 08:10:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 714D821C038 for ; Sat, 8 Oct 2016 08:10:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5980341475 for ; Sat, 8 Oct 2016 08:10:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B8B87E1 for ; Sat, 8 Oct 2016 08:10:47 +0000 (UTC) From: "Alon Bar-Lev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alon Bar-Lev" Message-ID: <1475914212.57e5f28a918bb8c926d294a2eb2acb406382f186.alonbl@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/crypto++/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/crypto++/crypto++-5.6.4-r1.ebuild dev-libs/crypto++/crypto++-5.6.4-r2.ebuild X-VCS-Directories: dev-libs/crypto++/ X-VCS-Committer: alonbl X-VCS-Committer-Name: Alon Bar-Lev X-VCS-Revision: 57e5f28a918bb8c926d294a2eb2acb406382f186 X-VCS-Branch: master Date: Sat, 8 Oct 2016 08:10:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f49ccdce-7d54-4362-8142-7ddb16a03061 X-Archives-Hash: 3e1e52dcb295ab3733a1f97d1f6a2984 commit: 57e5f28a918bb8c926d294a2eb2acb406382f186 Author: Alon Bar-Lev gentoo org> AuthorDate: Sat Oct 8 07:59:41 2016 +0000 Commit: Alon Bar-Lev gentoo org> CommitDate: Sat Oct 8 08:10:12 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e5f28a dev-libs/crypto++: fix symlink/directory collision for update Bug: 596500 Package-Manager: portage-2.3.0 .../{crypto++-5.6.4-r1.ebuild => crypto++-5.6.4-r2.ebuild} | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 ef46487..b21a004 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" +}