| 1 |
commit: b1ea7fb609c127ae28294574c3d95861951f2616 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 31 07:52:59 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 31 08:07:59 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ea7fb6 |
| 7 |
|
| 8 |
dev-embedded/arduino: Fix AbsoluteSymlink |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-embedded/arduino/arduino-1.8.5-r2.ebuild | 10 +++++----- |
| 13 |
dev-embedded/arduino/arduino-1.8.7.ebuild | 10 +++++----- |
| 14 |
2 files changed, 10 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-embedded/arduino/arduino-1.8.5-r2.ebuild b/dev-embedded/arduino/arduino-1.8.5-r2.ebuild |
| 17 |
index f058950e8fc..e958a4d4191 100644 |
| 18 |
--- a/dev-embedded/arduino/arduino-1.8.5-r2.ebuild |
| 19 |
+++ b/dev-embedded/arduino/arduino-1.8.5-r2.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2018 Gentoo Authors |
| 22 |
+# Copyright 1999-2020 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=6 |
| 26 |
@@ -134,9 +134,9 @@ src_install() { |
| 27 |
|
| 28 |
# In upstream's build process, we copy these fiels below from the bundled arduino-builder. |
| 29 |
# Here we do the same thing, but from the system arduino-builder. |
| 30 |
- dosym "${EPREFIX}/usr/share/arduino-builder/platform.txt" "${SHARE}/hardware/platform.txt" |
| 31 |
- dosym "${EPREFIX}/usr/share/arduino-builder/platform.keys.rewrite.txt" "${SHARE}/hardware/platform.keys.rewrite.txt" |
| 32 |
- dosym "${EPREFIX}/usr/bin/arduino-builder" "${SHARE}/arduino-builder" |
| 33 |
+ dosym "../../arduino-builder/platform.txt" "${SHARE}/hardware/platform.txt" |
| 34 |
+ dosym "../../arduino-builder/platform.keys.rewrite.txt" "${SHARE}/hardware/platform.keys.rewrite.txt" |
| 35 |
+ dosym "../../../bin/arduino-builder" "${SHARE}/arduino-builder" |
| 36 |
|
| 37 |
# hardware/tools/avr needs to exist or arduino-builder will |
| 38 |
# complain about missing required -tools arg |
| 39 |
@@ -147,7 +147,7 @@ src_install() { |
| 40 |
einstalldocs |
| 41 |
|
| 42 |
# arduino expects its doc in its "main" directory. symlink it. |
| 43 |
- dosym "${EPREFIX}/usr/share/doc/${PF}/html/reference" "${SHARE}/reference" |
| 44 |
+ dosym "../doc/${PF}/html/reference" "${SHARE}/reference" |
| 45 |
fi |
| 46 |
|
| 47 |
# Install menu and icons |
| 48 |
|
| 49 |
diff --git a/dev-embedded/arduino/arduino-1.8.7.ebuild b/dev-embedded/arduino/arduino-1.8.7.ebuild |
| 50 |
index 6a1c9a5f055..8872bdc6b90 100644 |
| 51 |
--- a/dev-embedded/arduino/arduino-1.8.7.ebuild |
| 52 |
+++ b/dev-embedded/arduino/arduino-1.8.7.ebuild |
| 53 |
@@ -1,4 +1,4 @@ |
| 54 |
-# Copyright 1999-2019 Gentoo Authors |
| 55 |
+# Copyright 1999-2020 Gentoo Authors |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
|
| 58 |
EAPI=6 |
| 59 |
@@ -111,9 +111,9 @@ src_install() { |
| 60 |
|
| 61 |
# In upstream's build process, we copy these fiels below from the bundled arduino-builder. |
| 62 |
# Here we do the same thing, but from the system arduino-builder. |
| 63 |
- dosym "${EPREFIX}/usr/share/arduino-builder/platform.txt" "/usr/share/${PN}/hardware/platform.txt" |
| 64 |
- dosym "${EPREFIX}/usr/share/arduino-builder/platform.keys.rewrite.txt" "/usr/share/${PN}/hardware/platform.keys.rewrite.txt" |
| 65 |
- dosym "${EPREFIX}/usr/bin/arduino-builder" "/usr/share/${PN}/arduino-builder" |
| 66 |
+ dosym "../../arduino-builder/platform.txt" "/usr/share/${PN}/hardware/platform.txt" |
| 67 |
+ dosym "../../arduino-builder/platform.keys.rewrite.txt" "/usr/share/${PN}/hardware/platform.keys.rewrite.txt" |
| 68 |
+ dosym "../../../bin/arduino-builder" "/usr/share/${PN}/arduino-builder" |
| 69 |
|
| 70 |
# hardware/tools/avr needs to exist or arduino-builder will |
| 71 |
# complain about missing required -tools arg |
| 72 |
@@ -124,7 +124,7 @@ src_install() { |
| 73 |
einstalldocs |
| 74 |
|
| 75 |
# arduino expects its doc in its "main" directory. symlink it. |
| 76 |
- dosym "${EPREFIX}/usr/share/doc/${PF}/html/reference" "/usr/share/${PN}/reference" |
| 77 |
+ dosym "../doc/${PF}/html/reference" "/usr/share/${PN}/reference" |
| 78 |
fi |
| 79 |
|
| 80 |
# Install menu and icons |
Archives