From 97c5fdbb53b08517f8e66a9bf9fc69dca3b8d889 Mon Sep 17 00:00:00 2001 From: layman Date: Thu, 25 Mar 2021 15:42:58 +0100 Subject: [PATCH] Updated pcb2gcode to compile w/ latest boost/gcc --- sci-electronics/pcb2gcode/Manifest | 2 +- sci-electronics/pcb2gcode/pcb2gcode-9999.ebuild | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/sci-electronics/pcb2gcode/Manifest b/sci-electronics/pcb2gcode/Manifest index 90a208a..2d6dd4d 100644 --- a/sci-electronics/pcb2gcode/Manifest +++ b/sci-electronics/pcb2gcode/Manifest @@ -1 +1 @@ -EBUILD pcb2gcode-9999.ebuild 866 BLAKE2B 21fc6440a0b3cb10fdc3c72ffb7f35a89ac90574454dab2987caadf0130ce02b088186ac085dab919c253701b6cf6aad433d10991d85862f261c9c3bd2c494ba SHA512 d09154d226c00d588d8db828b51d0aace92377bc5afb87491796899d91f7fe0c38476a3acf162ba92984c268f8f274cee1a9a561e06e063d641255352a954527 +EBUILD pcb2gcode-9999.ebuild 1045 BLAKE2B a4785bd2fbe01259704afa2a57726f98d49c0d36ca9b216c504429167db79c794edd37c9438f256e78fde74f8dcd7c8102bca37e1ed16d5a48311e6a09aab56c SHA512 5f7a3e983a34652b432583ecebf6d730f4c83f276b25fc8ff06b8ccf9f2d6a9d9c697977c822dc85cd3a049fca5a109a6fc7ab2e325b0ea59a1f0ead6dc9485a diff --git a/sci-electronics/pcb2gcode/pcb2gcode-9999.ebuild b/sci-electronics/pcb2gcode/pcb2gcode-9999.ebuild index 55ef407..d55c1d2 100644 --- a/sci-electronics/pcb2gcode/pcb2gcode-9999.ebuild +++ b/sci-electronics/pcb2gcode/pcb2gcode-9999.ebuild @@ -24,18 +24,30 @@ LICENSE="GPL-2" SLOT="0" IUSE="" -RDEPEND="sci-electronics/gerbv" +RDEPEND=">=sci-electronics/gerbv-2.1.0" DEPEND="dev-cpp/gtkmm:2.4 dev-libs/boost ${RDEPEND}" src_prepare() { if [[ ${PV} == "9999" ]] ; then - eautoreconf -i + eautoreconf fi default } +src_configure() { + default + + + # Workaround for GCC 10.2 / Boost 1.75 + sed -i "${S}"/Makefile \ + -e "/BOOST_CPPFLAGS_SYSTEM =/d" \ + -e "/GEOS_CFLAGS_SYSTEM =/d" || die +} + + + src_install() { cd "${BUILD_DIR}" exeinto /usr/bin