[gentoo-commits] repo/gentoo:master commit in: dev-embedded/arduino-builder/files/, dev-embedded/arduino-builder/

[Andreas Sturmlechner]

commit:     2c2c12c62e3b9396f718f50191c0691f0d5eb93a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 18:50:35 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 19:23:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c2c12c6

dev-embedded/arduino-builder: drop 1.3.25, 1.4.1-r1, EAPI-6--

Closes: https://bugs.gentoo.org/865449
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-embedded/arduino-builder/Manifest              |  15 ---
 .../arduino-builder/arduino-builder-1.3.25.ebuild  |  80 -------------
 .../arduino-builder-1.4.1-r1.ebuild                |  68 -----------
 .../arduino-builder-1.3.25-platform-paths.patch    |  19 ---
 .../files/arduino-builder-1.3.25-skip-tests.patch  | 109 -----------------
 .../arduino-builder-1.4.1-platform-paths.patch     |  19 ---
 .../files/arduino-builder-1.4.1-skip-tests.patch   | 129 ---------------------
 7 files changed, 439 deletions(-)

diff --git a/dev-embedded/arduino-builder/Manifest b/dev-embedded/arduino-builder/Manifest
index 40bc6880ebf0..18865c3359aa 100644
--- a/dev-embedded/arduino-builder/Manifest
+++ b/dev-embedded/arduino-builder/Manifest
@@ -1,5 +1,3 @@
-DIST arduino-builder-1.3.25.tar.gz 206905 BLAKE2B 6770b89607c1563b68a79d34e6e214586106c63a4b3c854b4f85a4b9eb2fc24ce5d4a97c29b0c05c19b6834e103f3c3c574bd8cefed0eb684d8aab7e4c71ee7f SHA512 3740530800f8a3cfe1fe20a91579e6b632b76c2c4ace68c7b178a2d234032d5887abee3d0360c3039f2fec912a0d5cabe948bf930a7d9ea23221625456ad5357
-DIST arduino-builder-1.4.1.tar.gz 220058 BLAKE2B b993ad508b81b3f05bb24747a63ac7b826739265aabc0437be403ca7154e6f3b580dacf235979fa4b395c6cc8c978e2cbdcab072822bd8fe61e42074ca4323e8 SHA512 d72f63d4235531310c412b096d154977d7d6ea2746e8703c8208e33e7bf3cac416817ccb5fbc47248bfe4a5858fa3a91117919b8cb636261c5cec28b8bc415bc
 DIST arduino-builder-1.5.4.tar.gz 38550 BLAKE2B 0dcf6097be6b42e52a74e8feeaa44f54c77a780a8fd0a2d046342b160d3eb6ef586e8b98c3058f11693991883acc83e3fd68f381cdab13c5fac410b2b0b8a27e SHA512 a5d117018e9eb3587564cfe49bbee95ac93eef742ce21ca49e4f1037b51fd64f1f2ffbac6fed282dfc79f307d6499222fab94f6c5472030cbb2a134fc553ea00
 DIST bou.ke%2Fmonkey%2F@v%2Fv1.0.1.mod 21 BLAKE2B cb370d962525feda03a1308de4d483ee6c5c21dd20dc9a364e4b62f3a5bbf4c01c4d02ba328a71648415cd00d2008b889067d9f5bebb24bb799049bd4aa3267c SHA512 bbfba4d582bb53a1d5bf3e73864937ffa7a8ab810b7daf2959f58fd369f88b62a02321b0a4d26b117ffe4a4f488180586613ddbabb342df077a72a7208528da3
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
@@ -330,19 +328,6 @@ DIST github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod 41 BLAKE2B b7c7dfaa
 DIST github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod 89 BLAKE2B 6dd7632179015369088b8e1271127271daac6a3af65032e723691e1d19ae50428b705a8f417950dd1b86c6aae63a0518636029f589eb4ef722e1c21ef0d0aa9a SHA512 02820d9107d43b1d41e74fb2281edb421bd95f852ae1062536d3f2ad9d6e97e2154b90a831f4618a0f83f9c4a828c176759132c0565a7a4d99dfe3b76e5f6d10
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
 DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
-DIST github.com-arduino-go-paths-helper-751652ddd9f0a98650e681673c2c73937002e889.tar.gz 14609 BLAKE2B f8a5b54f9898db7ea02d8aad779fc32cb6b21e430c84c5f77b985f9a23dc62de95a6a366956b7861b6b4b261ff5f30d3b20c92e51b256ed6f223a309a644302d SHA512 6116531448270b502187cd91d2a0847a8791c53b65729766291f1ddaa9bc2ce95b0d24a54dc895ad62e2d04c092081ce46300101b9f371db78b0204a541c8252
-DIST github.com-arduino-go-properties-map-ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41.tar.gz 16406 BLAKE2B f6afeb160114bfb221c882d1b2c8e7f6d6841585affbf349c82c421500d28cf2b09b28bef960048c357fac69ef5432cecc0a0098f7a4929aa0d3d566cbe56bd1 SHA512 5327e207b4a1a978585345d498f4af39bdd716686c058dacebada113cc07066834ebe19eb8f4d8388d400755dca7e8656bc053e7d8804a1d7e04a1cc6c4414ea
-DIST github.com-arduino-go-timeutils-d1dd9e313b1bfede35fe0bbf46d612e16a50e04e.tar.gz 8086 BLAKE2B d2e558b3c88e084c99cd0dd0ccaa0859e21b53671d4d28f57cce505f7fda0f89fdde7a08bcf7d2e4d8b57e4a760bdc608e97f0c27542fd0a396a548494bb7351 SHA512 e573f448c4b0b17882be98516abcdbbc4174e3ab041ce1390bc7e3e365932f1a4c7fe63cebf4e82b43bec5d5f4748511fa608a777a0cbc18b29e224041884fb8
-DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8
-DIST github.com-go-errors-errors-a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz 7835 BLAKE2B f4092b4ef5ebf996cb3c20183868dbdd154ea7cf02a4fd5a3375a3193e9ccacad08f0b6681b456786524b729ffb8c0b5c8af6ceec630eec22326d0fe1e00eb22 SHA512 b1d5e7c6f30f94f8a41b10d32b7f4ce7de8394f74ede6c14fb1f267a0514b24bc3bc7659c3baf6eacf424cea8451e7e57f5f72acc568342e90a447bd02f3e262
-DIST github.com-golang-net-ed066c81e75eba56dd9bd2139ade88125b855585.tar.gz 968328 BLAKE2B 14d5542bd808b9571a8305a5d2054df3205419249724851e976e354dab653de2266b0b9d7b46b4fd846a7d810bbd510be54d0d98e6d6c5cfea5d19e8df5ae528 SHA512 f63654665e7221b089f1dd9b9603670481b1a59137cf0b5c4cbe7c77a6a66b7537dc03b7c412328d9186edb8a661e66a82ee9839b594d176bee6e7377f13cca4
-DIST github.com-golang-protobuf-aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz 332903 BLAKE2B b05fa3e3316bd6adbad623ab239795172ee70c38380873ee52a32c10f8f3e750c26b27fc43da4a290d82eda5723fd56063bffe01fdedb2d3a65bf5349abdb376 SHA512 80407835aef3553f655c35e89aa884038c90a3667460af1db60b069ae31e870efc59d6907743ee080d85e167c20d778440b9a6d19ff79f9055bc666c8314fe30
-DIST github.com-golang-sys-11f53e03133963fb11ae0588e08b5e0b85be8be5.tar.gz 1222479 BLAKE2B a84f877365823217fa52d1e31b40016109b18816f2c53539278b217c92f877b4a0553f59904eb3e6a9286919dc5472fa8efeaac65a0662b9b88d866e75284df0 SHA512 46a1b9d4d48f808d2658b796ef84f4e6fe2469bd5ab6327715b47a44b28154bbe503dca8d0932a234ea554febe97025e4da7543bd3aca4342458d082567187a1
-DIST github.com-golang-text-e6919f6577db79269a6443b9dc46d18f2238fb5d.tar.gz 6588337 BLAKE2B f182e9a40157c43aa749fae5fd6aacadf994a7c2051fc23dfef8031b243f691446d4e5c93c9b363ab22df38f533b1635aa45e23f4d8de7947ad7ab0aa8e5898a SHA512 caae52905ffdaa8e712f6b92a03a8cf9d9eba227e04ee795977c2b76bd79bc16457f846c11e45525f3e3df557fab5e0279fe098c0145b5807c0e580dd339f452
-DIST github.com-google-go-genproto-af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.gz 2323831 BLAKE2B a614c74b60f8e347b47c8686807228ea76b021a918fc732b69293c8b59c1bc5396e320cbce6db87ab43b9a4fd649d19779874934bdd667f7cabf03165439c54a SHA512 a6524f31e8c4775195c245ffbe54c7f770591d46663ea86b8120ffd8efb3cf9269569fbf457b0d0272dc47177ccf3b413e858c2b437ee9892b5ac6698d07ed4d
-DIST github.com-grpc-grpc-go-8dea3dc473e90c8179e519d91302d0597c0ca1d1.tar.gz 506815 BLAKE2B 498909d0704b46d54571ad1f87d7636fafdf48f11fbf53e5e8ec6cd16aa6cd57cdfaedd8a7c00cd33ff60c99b0ab0dbf3f9c8df28155c75b2ceeaada3afabf92 SHA512 37970d20ce358d5186a9a152b1a0b1af816f7d53de8f2c35c901e8533e8191125e08ca60e1177bbab5e2585a1fa6e0fa9785ac70caadc5aa0fa58c189d26ca95
-DIST github.com-jstemmer-go-junit-report-833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz 6901 BLAKE2B 6138ac40810ad000a4336ffbca3bc5c1d0e96854c7918fb2aad9f7b2596ac66f285ac8c519e30b6e97cdb0009b31ab73b83ff2e1db2f464c2d88f2c1045a6bd9 SHA512 00f38f51c5f761b5a3e60a6e6b602f1246a746f081f2d8946d01387234270544692c6af54d0e69919c1af8aa753f848eeecc4421f2ddf881f21522ccf5545d75
-DIST github.com-stretchr-testify-1661650f989674e3e5bcdcb805536e5d31481526.tar.gz 81099 BLAKE2B 592a7c114b01bc5b1982135f310aa8619c2888ac36ccb5d876a38655a13f7dc4d468a7a42a44cf9cf69fc7bd6769a9ba010b48089d5ce866dcd564e20487e04a SHA512 f10255b0f47237c7583626a3bb213ca67d0db92c2a1531cc31dac089cdb13139b01647809503313a26f3e53a64a98cebc3bf9c4e1bd1ed975d9b81aa516ab5af
 DIST go.bug.st%2Fcleanup%2F@v%2Fv1.0.0.mod 171 BLAKE2B adb6afc74e58dbcfd7ed6d7b39ada2572791c2ea2a172e19c6668fc22a04be7bc434469f6508b5bc90b6e3e1d35a017b2b2accc59bc4b47fba234352d803824b SHA512 6009e40829e12a205fb4438d55a3c9856d0f9dcf675dad5099890ec9c89c82e1dde1e3b110eee85ab8838c2f2fa52bae67ff6b747dc7d768b5a7d97d3b9b4278
 DIST go.bug.st%2Fcleanup%2F@v%2Fv1.0.0.zip 3020 BLAKE2B 8addff8d095084fbfe64fae5c1ea15867e6c3b011db8c353913d1a5bd8a8f8ae55a6fdf252247ff771523a27fc635b6d223c2b78f7021c4923ab35ada0fb9c9a SHA512 06b5f5d9e4c36df5bd477ebc65b4661070c70391fdcf8d660ae558fef28f25fe635cc920d6ec2ee96f5b2b7d0af7cf65bb329db02543ec7ab6ff9b8a25e70e6f
 DIST go.bug.st%2Fdownloader%2Fv2%2F@v%2Fv2.0.1.mod 84 BLAKE2B ac7fbc551428259c64af58eea7024fd0777113d25e506b8ec73d50d9970548ce22eca9519db10ce4bbe01c84d9a149c27ca914f53cb2a0ac366d97095b07444c SHA512 8568f0a6835234576316a0d8ee5a136aa684007729e4f9e2223300db3c886695e41f9df1c3d46b30ac83beca8d6ab7efd99da9d1891a4084f22237d108e43472

diff --git a/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
deleted file mode 100644
index 9eea737b208b..000000000000
--- a/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="arduino.cc/arduino-builder/..."
-
-EGO_VENDOR=(
-	"github.com/go-errors/errors a41850380601eeb43f4350f7d17c6bbd8944aaf8"
-	"github.com/jstemmer/go-junit-report 833f8ea2b99d36d5f018698333834f3df200a0c2"
-	"github.com/stretchr/testify 1661650f989674e3e5bcdcb805536e5d31481526"
-)
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="A command line tool for compiling Arduino sketches"
-HOMEPAGE="https://github.com/arduino/arduino-builder"
-SRC_URI="https://github.com/arduino/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="sys-devel/crossdev
-	dev-embedded/avrdude
-	dev-embedded/arduino-ctags"
-
-DEPEND=">=dev-lang/go-1.9.2"
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-}
-
-src_prepare() {
-	# As we know, golang packages have to be compiled from namespace-aware paths which is the whole
-	# point of the EGO_PN dance. arduino-builder goes a step further by re-creating its own
-	# namespace inside its source package, messing up with our build process which can't find
-	# packages. Also, our source package contains multiple namespaces which further messes with
-	# messes with our vendoring process (each namespace needs its own vendor directory).
-	# We do the following to try to work around this mess. It looks like upstream reworked this
-	# in its master branch so we should be able to remove this in the upcoming major release.
-
-	local deeppath="${S}/src/${EGO_PN%/...}"
-	for pkgname in builder properties timeutils; do
-		ln -s "${deeppath}/src/arduino.cc/${pkgname}" "${S}/src/arduino.cc/${pkgname}"
-	done
-	ln -s "${deeppath}/vendor/github.com" "${S}/src/github.com"
-
-	# path paths so that they point to system ctags and avrdude
-	eapply "${FILESDIR}/arduino-builder-1.3.25-platform-paths.patch"
-	eapply "${FILESDIR}/arduino-builder-1.3.25-skip-tests.patch"
-
-	default
-}
-
-src_install() {
-	# we unfortunately have to copy/paste the contents of golang-build_src_install() here because
-	# we *don't* want to call golang_install_pkgs() which installs all static libraries we've
-	# built. All we want is to install the final executable.
-
-	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
-	echo "$@"
-	"$@" || die
-
-	# END OF COPY/PASTE
-
-	dobin bin/arduino-builder
-
-	# In addition to the binary, we also want to install these two files below. They are needed by
-	# the dev-embedded/arduino which copies those files in its "hardware" folder.
-	insinto "/usr/share/${PN}"
-	cd "src/arduino.cc/builder/hardware" || die
-	doins "platform.txt"
-	doins "platform.keys.rewrite.txt"
-}
-
-pkg_postinst() {
-	[ ! -x /usr/bin/avr-gcc ] && ewarn "Missing avr-gcc; you need to crossdev -s4 avr"
-}

diff --git a/dev-embedded/arduino-builder/arduino-builder-1.4.1-r1.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.4.1-r1.ebuild
deleted file mode 100644
index b47674849f04..000000000000
--- a/dev-embedded/arduino-builder/arduino-builder-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/arduino/arduino-builder/..."
-
-EGO_VENDOR=(
-	"github.com/arduino/go-properties-map ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41"
-	"github.com/arduino/go-timeutils d1dd9e313b1bfede35fe0bbf46d612e16a50e04e"
-	"github.com/arduino/go-paths-helper 751652ddd9f0a98650e681673c2c73937002e889"
-	"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
-	"github.com/go-errors/errors a41850380601eeb43f4350f7d17c6bbd8944aaf8"
-	"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
-	"github.com/jstemmer/go-junit-report 833f8ea2b99d36d5f018698333834f3df200a0c2"
-	"github.com/stretchr/testify 1661650f989674e3e5bcdcb805536e5d31481526"
-	"google.golang.org/grpc 8dea3dc473e90c8179e519d91302d0597c0ca1d1 github.com/grpc/grpc-go"
-	"google.golang.org/genproto af9cb2a35e7f169ec875002c1829c9b315cddc04 github.com/google/go-genproto"
-	"golang.org/x/net ed066c81e75eba56dd9bd2139ade88125b855585 github.com/golang/net"
-	"golang.org/x/text e6919f6577db79269a6443b9dc46d18f2238fb5d github.com/golang/text"
-	"golang.org/x/sys 11f53e03133963fb11ae0588e08b5e0b85be8be5 github.com/golang/sys"
-)
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="A command line tool for compiling Arduino sketches"
-HOMEPAGE="https://github.com/arduino/arduino-builder"
-SRC_URI="https://github.com/arduino/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-devel/crossdev
-	dev-embedded/avrdude
-	dev-embedded/arduino-ctags"
-
-DEPEND=">=dev-lang/go-1.9.2"
-
-PATCHES=(
-	"${FILESDIR}/arduino-builder-1.4.1-platform-paths.patch"
-	"${FILESDIR}/arduino-builder-1.4.1-skip-tests.patch"
-)
-
-src_install() {
-	# we unfortunately have to copy/paste the contents of golang-build_src_install() here because
-	# we *don't* want to call golang_install_pkgs() which installs all static libraries we've
-	# built. All we want is to install the final executable.
-
-	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
-	echo "$@"
-	"$@" || die
-
-	# END OF COPY/PASTE
-
-	dobin bin/arduino-builder
-	# In addition to the binary, we also want to install these two files below. They are needed by
-	# the dev-embedded/arduino which copies those files in its "hardware" folder.
-	insinto "/usr/share/${PN}"
-	cd "src/github.com/arduino/arduino-builder/hardware" || die
-	doins "platform.txt"
-	doins "platform.keys.rewrite.txt"
-}
-
-pkg_postinst() {
-	[ ! -x /usr/bin/avr-gcc ] && ewarn "Missing avr-gcc; you need to crossdev -s4 avr"
-}

diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch
deleted file mode 100644
index 854dc886af01..000000000000
--- a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/arduino.cc/builder/hardware/platform.txt b/src/arduino.cc/builder/hardware/platform.txt
-index ca8df1f..17ce03f 100644
---- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/hardware/platform.txt
-+++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/hardware/platform.txt
-@@ -1,11 +1,11 @@
- # ctags
- # ------------------------------
--tools.ctags.path={runtime.tools.ctags.path}
--tools.ctags.cmd.path={path}/ctags
-+tools.ctags.path=/usr/bin
-+tools.ctags.cmd.path={path}/arduino-ctags
- tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
- 
- # additional entries
--tools.avrdude.path={runtime.tools.avrdude.path}
-+tools.avrdude.path=/usr/bin
- 
- preproc.macros.flags=-w -x c++ -E -CC
- #preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}

diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch
deleted file mode 100644
index 4ed170061c16..000000000000
--- a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Skip tests that can't run on Gentoo because of the network sandbox
-diff --git a/src/arduino.cc/builder/test/hardware_loader_test.go b/src/arduino.cc/builder/test/hardware_loader_test.go
-index c9ea1d5..e7c68d2 100644
---- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/hardware_loader_test.go
-+++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/hardware_loader_test.go
-@@ -41,6 +41,7 @@ import (
- )
- 
- func TestLoadHardware(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware"},
- 	}
-@@ -85,6 +86,7 @@ func TestLoadHardware(t *testing.T) {
- }
- 
- func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
- 	}
-@@ -155,6 +157,7 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
- }
- 
- func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_board_manager_stuff"},
- 	}
-@@ -203,6 +206,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
- }
- 
- func TestLoadLotsOfHardware(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_board_manager_stuff", "downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
- 	}
-diff --git a/src/arduino.cc/builder/test/helper_tools_downloader.go b/src/arduino.cc/builder/test/helper_tools_downloader.go
-index 3642510..e6391b6 100644
---- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/helper_tools_downloader.go
-+++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/helper_tools_downloader.go
-@@ -83,6 +83,7 @@ type Core struct {
- }
- 
- func DownloadCoresAndToolsAndLibraries(t *testing.T) {
-+    t.Skip("Gentoo skips tests requiring network");
- 	cores := []Core{
- 		Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.10"},
- 		Core{Maintainer: "arduino", Arch: "sam", Version: "1.6.7"},
-@@ -165,6 +166,7 @@ func patchFiles(t *testing.T) {
- }
- 
- func download(t *testing.T, cores, boardsManagerCores, boardsManagerRedBearCores []Core, tools, toolsMultipleVersions, boardsManagerTools, boardsManagerRFduinoTools []Tool, libraries []Library) {
-+    t.Skip("Gentoo skips tests requiring network");
- 	allCoresDownloaded, err := allCoresAlreadyDownloadedAndUnpacked(HARDWARE_FOLDER, cores)
- 	NoError(t, err)
- 	if allCoresDownloaded &&
-diff --git a/src/arduino.cc/builder/test/target_board_resolver_test.go b/src/arduino.cc/builder/test/target_board_resolver_test.go
-index 274eb92..d6973e3 100644
---- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/target_board_resolver_test.go
-+++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/target_board_resolver_test.go
-@@ -39,6 +39,7 @@ import (
- )
- 
- func TestTargetBoardResolverUno(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:avr:uno",
-@@ -64,6 +65,7 @@ func TestTargetBoardResolverUno(t *testing.T) {
- }
- 
- func TestTargetBoardResolverDue(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:sam:arduino_due_x",
-@@ -89,6 +91,7 @@ func TestTargetBoardResolverDue(t *testing.T) {
- }
- 
- func TestTargetBoardResolverMega1280(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:avr:mega:cpu=atmega1280",
-@@ -115,6 +118,7 @@ func TestTargetBoardResolverMega1280(t *testing.T) {
- }
- 
- func TestTargetBoardResolverMega2560(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:avr:mega:cpu=atmega2560",
-@@ -141,6 +145,7 @@ func TestTargetBoardResolverMega2560(t *testing.T) {
- }
- 
- func TestTargetBoardResolverCustomYun(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
- 		FQBN:            "my_avr_platform:avr:custom_yun",
-@@ -167,6 +172,7 @@ func TestTargetBoardResolverCustomYun(t *testing.T) {
- }
- 
- func TestTargetBoardResolverCustomCore(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
- 		FQBN:            "watterott:avr:attiny841:core=spencekonde,info=info",

diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch
deleted file mode 100644
index be1f2b5edda1..000000000000
--- a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/arduino.cc/builder/hardware/platform.txt b/src/arduino.cc/builder/hardware/platform.txt
-index ca8df1f..17ce03f 100644
---- a/src/github.com/arduino/arduino-builder/hardware/platform.txt
-+++ b/src/github.com/arduino/arduino-builder/hardware/platform.txt
-@@ -1,11 +1,11 @@
- # ctags
- # ------------------------------
--tools.ctags.path={runtime.tools.ctags.path}
--tools.ctags.cmd.path={path}/ctags
-+tools.ctags.path=/usr/bin
-+tools.ctags.cmd.path={path}/arduino-ctags
- tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
- 
- # additional entries
--tools.avrdude.path={runtime.tools.avrdude.path}
-+tools.avrdude.path=/usr/bin
- 
- preproc.macros.flags=-w -x c++ -E -CC
- #preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}

diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch
deleted file mode 100644
index f66e829e4b01..000000000000
--- a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-Skip tests that can't run on Gentoo because of the network sandbox
-diff --git a/test/hardware_loader_test.go b/test/hardware_loader_test.go
-index 147396e..da6c8ef 100644
---- a/src/github.com/arduino/arduino-builder/test/hardware_loader_test.go
-+++ b/src/github.com/arduino/arduino-builder/test/hardware_loader_test.go
-@@ -41,6 +41,7 @@ import (
- )
- 
- func TestLoadHardware(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware"},
- 	}
-@@ -85,6 +86,7 @@ func TestLoadHardware(t *testing.T) {
- }
- 
- func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
- 	}
-@@ -155,6 +157,7 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
- }
- 
- func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_board_manager_stuff"},
- 	}
-@@ -203,6 +206,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
- }
- 
- func TestLoadLotsOfHardware(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{"downloaded_board_manager_stuff", "downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
- 	}
-diff --git a/test/helper_tools_downloader.go b/test/helper_tools_downloader.go
-index 49aa847..ba77a57 100644
---- a/src/github.com/arduino/arduino-builder/test/helper_tools_downloader.go
-+++ b/src/github.com/arduino/arduino-builder/test/helper_tools_downloader.go
-@@ -83,6 +83,7 @@ type Core struct {
- }
- 
- func DownloadCoresAndToolsAndLibraries(t *testing.T) {
-+    t.Skip("Gentoo skips tests requiring network");
- 	cores := []Core{
- 		Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.10"},
- 		Core{Maintainer: "arduino", Arch: "sam", Version: "1.6.7"},
-@@ -177,6 +178,7 @@ func patchFiles(t *testing.T) {
- }
- 
- func download(t *testing.T, cores, boardsManagerCores, boardsManagerRedBearCores []Core, tools, toolsMultipleVersions, boardsManagerTools, boardsManagerRFduinoTools []Tool, libraries []Library) {
-+    t.Skip("Gentoo skips tests requiring network");
- 	allCoresDownloaded, err := allCoresAlreadyDownloadedAndUnpacked(HARDWARE_FOLDER, cores)
- 	NoError(t, err)
- 	if allCoresDownloaded &&
-diff --git a/test/target_board_resolver_test.go b/test/target_board_resolver_test.go
-index 49e0abe..7a50fe1 100644
---- a/src/github.com/arduino/arduino-builder/test/target_board_resolver_test.go
-+++ b/src/github.com/arduino/arduino-builder/test/target_board_resolver_test.go
-@@ -39,6 +39,7 @@ import (
- )
- 
- func TestTargetBoardResolverUno(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:avr:uno",
-@@ -64,6 +65,7 @@ func TestTargetBoardResolverUno(t *testing.T) {
- }
- 
- func TestTargetBoardResolverDue(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:sam:arduino_due_x",
-@@ -89,6 +91,7 @@ func TestTargetBoardResolverDue(t *testing.T) {
- }
- 
- func TestTargetBoardResolverMega1280(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:avr:mega:cpu=atmega1280",
-@@ -115,6 +118,7 @@ func TestTargetBoardResolverMega1280(t *testing.T) {
- }
- 
- func TestTargetBoardResolverMega2560(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- 		FQBN:            "arduino:avr:mega:cpu=atmega2560",
-@@ -141,6 +145,7 @@ func TestTargetBoardResolverMega2560(t *testing.T) {
- }
- 
- func TestTargetBoardResolverCustomYun(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
- 		FQBN:            "my_avr_platform:avr:custom_yun",
-@@ -167,6 +172,7 @@ func TestTargetBoardResolverCustomYun(t *testing.T) {
- }
- 
- func TestTargetBoardResolverCustomCore(t *testing.T) {
-+    t.Skip("Can't run on Gentoo")
- 	ctx := &types.Context{
- 		HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
- 		FQBN:            "watterott:avr:attiny841:core=spencekonde,info=info",
-diff --git a/test/wipeout_build_path_if_build_options_changed_test.go b/test/wipeout_build_path_if_build_options_changed_test.go
-index 51bfe80..8501fb6 100644
---- a/src/github.com/arduino/arduino-builder/test/wipeout_build_path_if_build_options_changed_test.go
-+++ b/src/github.com/arduino/arduino-builder/test/wipeout_build_path_if_build_options_changed_test.go
-@@ -42,6 +42,7 @@ import (
- )
- 
- func TestWipeoutBuildPathIfBuildOptionsChanged(t *testing.T) {
-+    t.Skip("Can't run in Gentoo")
- 	ctx := &types.Context{}
- 
- 	buildPath := SetupBuildPath(t, ctx)
-@@ -73,6 +74,7 @@ func TestWipeoutBuildPathIfBuildOptionsChanged(t *testing.T) {
- }
- 
- func TestWipeoutBuildPathIfBuildOptionsChangedNoPreviousBuildOptions(t *testing.T) {
-+    t.Skip("Can't run in Gentoo")
- 	ctx := &types.Context{}
- 
- 	buildPath := SetupBuildPath(t, ctx)