Diff arduino-builder-1.3.25 with a arduino-builder-1.4.1

/usr/portage/dev-embedded/arduino-builder/arduino-builder-1.4.1.ebuild 2018-10-15 21:39:00.000000000 +0300
3 3

  
4 4
EAPI=6
5 5

  
6
EGO_PN="arduino.cc/arduino-builder/..."
6
EGO_PN="github.com/arduino/arduino-builder/..."
7 7

  
8 8
EGO_VENDOR=(
9
	"github.com/arduino/go-properties-map ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41"
10
	"github.com/arduino/go-timeutils d1dd9e313b1bfede35fe0bbf46d612e16a50e04e"
11
	"github.com/arduino/go-paths-helper 751652ddd9f0a98650e681673c2c73937002e889"
12
	"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
9 13
	"github.com/go-errors/errors a41850380601eeb43f4350f7d17c6bbd8944aaf8"
14
	"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
10 15
	"github.com/jstemmer/go-junit-report 833f8ea2b99d36d5f018698333834f3df200a0c2"
11 16
	"github.com/stretchr/testify 1661650f989674e3e5bcdcb805536e5d31481526"
17
	"google.golang.org/grpc 8dea3dc473e90c8179e519d91302d0597c0ca1d1 github.com/grpc/grpc-go"
18
	"google.golang.org/genproto af9cb2a35e7f169ec875002c1829c9b315cddc04 github.com/google/go-genproto"
12 19
)
13 20

  
14 21
inherit golang-build golang-vcs-snapshot
......
19 26
	${EGO_VENDOR_URI}"
20 27
LICENSE="GPL-2"
21 28
SLOT="0"
22
KEYWORDS="amd64 x86"
29
KEYWORDS="~amd64 ~x86"
23 30

  
24 31
RDEPEND="sys-devel/crossdev
25 32
	dev-embedded/avrdude
26 33
	dev-embedded/arduino-ctags"
27 34

  
28
DEPEND=">=dev-lang/go-1.9.2"
35
DEPEND=">=dev-lang/go-1.9.2
36
	dev-go/go-net
37
	dev-go/go-text"
38

  
39
PATCHES=(
40
	"${FILESDIR}/arduino-builder-1.4.1-platform-paths.patch"
41
	"${FILESDIR}/arduino-builder-1.4.1-skip-tests.patch"
42
)
29 43

  
30 44
src_unpack() {
31 45
	golang-vcs-snapshot_src_unpack
32 46
}
33 47

  
34
src_prepare() {
35
	# As we know, golang packages have to be compiled from namespace-aware paths which is the whole
36
	# point of the EGO_PN dance. arduino-builder goes a step further by re-creating its own
37
	# namespace inside its source package, messing up with our build process which can't find
38
	# packages. Also, our source package contains multiple namespaces which further messes with
39
	# messes with our vendoring process (each namespace needs its own vendor directory).
40
	# We do the following to try to work around this mess. It looks like upstream reworked this
41
	# in its master branch so we should be able to remove this in the upcoming major release.
42

  
43
	local deeppath="${S}/src/${EGO_PN%/...}"
44
	for pkgname in builder properties timeutils; do
45
		ln -s "${deeppath}/src/arduino.cc/${pkgname}" "${S}/src/arduino.cc/${pkgname}"
46
	done
47
	ln -s "${deeppath}/vendor/github.com" "${S}/src/github.com"
48

  
49
	# path paths so that they point to system ctags and avrdude
50
	eapply "${FILESDIR}/arduino-builder-1.3.25-platform-paths.patch"
51
	eapply "${FILESDIR}/arduino-builder-1.3.25-skip-tests.patch"
52

  
53
	default
54
}
55

  
56 48
src_install() {
57 49
	# we unfortunately have to copy/paste the contents of golang-build_src_install() here because
58 50
	# we *don't* want to call golang_install_pkgs() which installs all static libraries we've
......
66 58
	# END OF COPY/PASTE
67 59

  
68 60
	dobin bin/arduino-builder
69

  
70 61
	# In addition to the binary, we also want to install these two files below. They are needed by
71 62
	# the dev-embedded/arduino which copies those files in its "hardware" folder.
72 63
	insinto "/usr/share/${PN}"
73
	cd "src/arduino.cc/builder/hardware" || die
64
	cd "src/github.com/arduino/arduino-builder/hardware" || die
74 65
	doins "platform.txt"
75 66
	doins "platform.keys.rewrite.txt"
76 67
}
Thank you!