diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
| commit | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch) | |
| tree | 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /dev-libs/leatherman | |
| parent | f516638b7fe9592837389826a6152a7e1b251c54 (diff) | |
gentoo resync : 13.06.2020
Diffstat (limited to 'dev-libs/leatherman')
| -rw-r--r-- | dev-libs/leatherman/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/leatherman/leatherman-1.12.0-r1.ebuild (renamed from dev-libs/leatherman/leatherman-1.12.0.ebuild) | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest index 94ab3634eccd..06787a33b371 100644 --- a/dev-libs/leatherman/Manifest +++ b/dev-libs/leatherman/Manifest @@ -3,6 +3,6 @@ DIST leatherman-1.11.0.tar.gz 815946 BLAKE2B 73afb7c517ea93d0c3dc1c88adb3e5041c7 DIST leatherman-1.12.0.tar.gz 815947 BLAKE2B cc268275f7ef7e9bddca9a2ca25c1a6b0bca64d57f90a485b83103a2477d476a39fe91ccf46798f1885b29c697de6556890131c7aac2a9e61590edab66fd6ea7 SHA512 2ceb16f94bf3d06bfe477a40e15db5a1d3d3999eaa7023245a08ab4e0054179f28308d9bf6ba73a839ca3a68130259894593fc8e77664b672ac5f3d20511a4d2 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b EBUILD leatherman-1.11.0.ebuild 1147 BLAKE2B c267b48f61cc2aa9f9c20ba4359c6bfe32454992d3604a6f09840eea6f009917ffe189f6571749d1955f0376233a1094f154dc7a329c88ad22ffcced7e7004e9 SHA512 d39ca1b889b5cb42125f52ffdd510712914041e0ad66835ad16a452989acf5636c66154ae29528ceefbb801e72e8c8206e741872403977d5d0865d22a891671f -EBUILD leatherman-1.12.0.ebuild 1149 BLAKE2B fda0e19074801348d21878b2384d3e798fc5052ec95f504fd25345d73df8b3c9d07a4c68757429468218d73c9014a66ba6dc849f86c28c7778ee2a69cc5eea22 SHA512 79d9503051af852eadc7b97957d13ebe6c585480664951a09f0b18635025e3f796c99e54c7fb2bc7cac932b68d36ff4e6f1dc8ab062e278728855046d6eb4e7b +EBUILD leatherman-1.12.0-r1.ebuild 1493 BLAKE2B df12a29ba362646dba648b0208a8d96cb2b7f5766626a32020618fdac4bb903457ab7ab12c5f23ffdfe8cbc2599eee8a29914559f1015a2fcb41ac707e465370 SHA512 60bb18f8c4b580d64e49eb594fa321e06b3167b8bea9edc4d019e639964ff02fe7ab2329518b0c0ef26cfa5e93db1f994ea1da4ccde62cd947e86eb0780e605b EBUILD leatherman-1.3.0.ebuild 1061 BLAKE2B 256d795d7d96de0cbdc2da569049d4a9378c25b440b364d79d3e2144b25b565ca729028a63a21e5f9493effb252daf7f38ce693a90e5b06eaf0aea24206cc829 SHA512 a2cde05565eb7eca2410f556d87f999e098f8e17ad51686d0225be193da2e3a367137630461564c51fb1cc0b8b429f912a0defbeec823e89e842187737c14b87 MISC metadata.xml 340 BLAKE2B 01f27cfaa9f6a13507f19e336f6171dd9b7321bd3ab7954b381d8200614a5e5e3706ab40d2472b6aaf2c0b2191c7d49c36fe9f8b218824101f85577fb700470c SHA512 f4b877e9d23996a6fca8d3c72c90bdc4a80e5218dcaea4f4c461473dff3d30db2aacc389bb156db6085ba02766ca69868842514ee6317c58373372cca4c48cf1 diff --git a/dev-libs/leatherman/leatherman-1.12.0.ebuild b/dev-libs/leatherman/leatherman-1.12.0-r1.ebuild index aef4cd923095..9a442087026a 100644 --- a/dev-libs/leatherman/leatherman-1.12.0.ebuild +++ b/dev-libs/leatherman/leatherman-1.12.0-r1.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" SLOT="0/${PV}" RDEPEND="net-misc/curl" -DEPEND=">=dev-libs/boost-1.54:=[nls] +DEPEND=">=dev-libs/boost-1.73:=[nls] net-misc/curl >=sys-devel/gcc-4.8:*" @@ -24,6 +24,13 @@ PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch ) src_prepare() { sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die + # vendored boost lib conflicts with boost 1.73 and above + sed -i '/nowide/d' CMakeLists.txt + sed -i '/nowide/d' file_util/CMakeLists.txt || die + sed -i '/nowide/d' windows/CMakeLists.txt || die + sed -i '/nowide/d' execution/CMakeLists.txt || die + sed -i '/nowide/d' logging/CMakeLists.txt || die + sed -i '/nowide/d' util/CMakeLists.txt || die cmake-utils_src_prepare } |