| 1 |
commit: 1767004bbffe39fca63e3e1aeee361c4bdea4004 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 30 20:36:11 2020 +0000 |
| 4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 30 20:36:22 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1767004b |
| 7 |
|
| 8 |
dev-libs/leatherman: remove installing vendored boost library |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/721652 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
| 13 |
|
| 14 |
.../{leatherman-1.12.0.ebuild => leatherman-1.12.0-r1.ebuild} | 3 ++- |
| 15 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/leatherman/leatherman-1.12.0.ebuild b/dev-libs/leatherman/leatherman-1.12.0-r1.ebuild |
| 18 |
similarity index 89% |
| 19 |
rename from dev-libs/leatherman/leatherman-1.12.0.ebuild |
| 20 |
rename to dev-libs/leatherman/leatherman-1.12.0-r1.ebuild |
| 21 |
index aef4cd92309..30ead889cde 100644 |
| 22 |
--- a/dev-libs/leatherman/leatherman-1.12.0.ebuild |
| 23 |
+++ b/dev-libs/leatherman/leatherman-1.12.0-r1.ebuild |
| 24 |
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" |
| 25 |
SLOT="0/${PV}" |
| 26 |
|
| 27 |
RDEPEND="net-misc/curl" |
| 28 |
-DEPEND=">=dev-libs/boost-1.54:=[nls] |
| 29 |
+DEPEND=">=dev-libs/boost-1.73:=[nls] |
| 30 |
net-misc/curl |
| 31 |
>=sys-devel/gcc-4.8:*" |
| 32 |
|
| 33 |
@@ -24,6 +24,7 @@ PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch ) |
| 34 |
|
| 35 |
src_prepare() { |
| 36 |
sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die |
| 37 |
+ sed -i '/nowide/d' CMakeLists.txt || die # vendored boost lib conflicts with boost 1.73 and above |
| 38 |
cmake-utils_src_prepare |
| 39 |
} |
Archives