1 |
commit: 80d731cd86741c9e87fe3db4fb117b977d1c866b |
2 |
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 24 11:49:16 2018 +0000 |
4 |
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 24 11:49:16 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d731cd |
7 |
|
8 |
dev-embedded/arduino: remove old |
9 |
|
10 |
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
dev-embedded/arduino/Manifest | 3 - |
14 |
dev-embedded/arduino/arduino-1.0.5-r1.ebuild | 98 ------------------- |
15 |
dev-embedded/arduino/arduino-1.0.5-r2.ebuild | 107 --------------------- |
16 |
.../arduino/files/arduino-1.0.1-build.xml.patch | 38 -------- |
17 |
.../arduino/files/arduino-1.0.3-script.patch | 20 ---- |
18 |
5 files changed, 266 deletions(-) |
19 |
|
20 |
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest |
21 |
index ebb1d7f130e..3955a4b47f7 100644 |
22 |
--- a/dev-embedded/arduino/Manifest |
23 |
+++ b/dev-embedded/arduino/Manifest |
24 |
@@ -1,4 +1,3 @@ |
25 |
-DIST arduino-1.0.5-src.tar.gz 40526292 BLAKE2B 3844d5f644af94adbb8fb6fa2f80640ae823d2455d0c2e175bc614a281ce5ece0bd111ecd3661d8ab2f2017781b8b1753b215b705090e449be0525b5ec009a4b SHA512 0401bf6051a48d343f9e4e822446a846b2c6446c68949efe5daf5f5445114312eecb9c99a4565ab2e2f80831aaa32122ecc21f81c8a97136704482cd0f1f1c00 |
26 |
DIST arduino-1.8.5-Adafruit_CircuitPlayground-1.6.8.zip 404619 BLAKE2B 993ec1282cc711b814db99fe1e4b50a2a6e6559722872e8fbcbb42e022c0e3611e10a4a0285468f82241eb5e15c0f91ff49ae9f2e0190d80a674cba51c93eae6 SHA512 0f0d32841bb6987edfc0e9aa0af8d0f7cf68dd33bf07ff0ec4cdd0d9733bb092b97a4810d7a0828e1d38fb25ec58e8fd3c023f70dffa3b1397386a902c932491 |
27 |
DIST arduino-1.8.5-Bridge-1.6.3.zip 64717 BLAKE2B cb20da7b1db33ad89bd5fcadd01035592b664a7aaa98c27463fad643deba0b1d7e48b341f75f2564716f5b32e800b96934202c683b9a68c628d5af01662c9b7e SHA512 6836580af17b9fbc1ce39821c2e3891bb2f240904a30e66110a03837a24979093ad88819dc333fa5b47ceff6f6ef17552004356bc71200a2e7b09d2182e91fc5 |
28 |
DIST arduino-1.8.5-Edison_help_files-1.6.2.zip 3321743 BLAKE2B 5d760ba329741cac27253fb439cf98381c0c0d7327f0c22f61cffc23c48d655278280185e5a7f6c85f3d182cacad4626eb9fe6cc2aaf7d2965bb377e2f39bbaa SHA512 63d4005036b43f09347814433578e8c75a7af5caa0923516deab146ef0867af4e60aad0c9d5d47870dcec0ddb4e5396363e4312425f95a8d8da8725f77da8f3a |
29 |
@@ -18,5 +17,3 @@ DIST arduino-1.8.5-Temboo-1.2.1.zip 187499 BLAKE2B 4f26317b21492697fa3bbce1fe2cd |
30 |
DIST arduino-1.8.5-WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip 703748 BLAKE2B be9a0e2ac5a890121a0ef59700ee9a001711d7357d1c9aedfac7ca8593ed6bdef32219a88003846d4a793a532a3ebb47cde28dbe4c93dbeef8567ad6fb36bf00 SHA512 f107e5ee544450cc7cabfc7eb43462d374a59446418b5ce3a9f3eb545b03fe6383f42e79eb6919fb4b6e621902cbb84f4fa7119f23b51aa770ebd020ffffdee9 |
31 |
DIST arduino-1.8.5-reference-1.6.6-3.zip 7004842 BLAKE2B 49d0d41fb499c15f06c8cb8d8211e5039ee9843a6629f305762b262a5bf199e4bbe7fea4716b7734403dc7e83ce35a963035b3a2c0d6a198a4218e7472b18d74 SHA512 65962322b6dcb15da6c119d47c382052d1183772c855b8e8fcdd108b54e730e2374d93741737f3b51e57288a0e8842a6a7f79dce4377ea3630293e6c3e7e8b73 |
32 |
DIST arduino-1.8.5.tar.gz 48219839 BLAKE2B b031ccd601c42adce0ef06b69bd6103996d7a2a29a4640ab2518bb607e17d90524e1f7dc9861c096df90b0f0a439c5ee8867912b53cb925309dd7e0f6ddf3b54 SHA512 f01b0401edc7ea5d58cb475776b816d05f289060613dd452ca71ecaf4a3a95c5e9ddb5f2cf06d3c165e9e0540c895f9eaea896a7974c88834de569944c4adbd2 |
33 |
-DIST arduino-icons.tar.bz2 58775 BLAKE2B 20f230394a8d725eaf7300f66105b09b31eb96aad8798f325d9e5eec6a1aec8319deb561d1b76d47d08dc6663ec11b6b991e057b88d6619c16a80cf0e10959e1 SHA512 b750e79d6117f5df619f2b765dad6e64f0ba4aa3314b0b6e00801577e3ea1f15951ba15efe7a00f5317285a19ac29ac41c78b71342f45cd164c794a42bafcdd9 |
34 |
-DIST arduino-src-1.0.5.tar.gz 235284641 BLAKE2B 7e7ed1305be468dff5ee32238e51b56c214bb993531c67a5ed178a267b5ff8b0f5303aa2a539b64ac40b20278d0206513c3b26f74dd9120058d97fabbbafef27 SHA512 0a40203b8a31c4d9288500962ada7f5083c280a84d8c56ab7da2d1326e1c02a908a96db589ab10bafc115abefe010bf23f6994c08e43c86a4ac10c2d4ab93ec2 |
35 |
|
36 |
diff --git a/dev-embedded/arduino/arduino-1.0.5-r1.ebuild b/dev-embedded/arduino/arduino-1.0.5-r1.ebuild |
37 |
deleted file mode 100644 |
38 |
index 6dde62efe0a..00000000000 |
39 |
--- a/dev-embedded/arduino/arduino-1.0.5-r1.ebuild |
40 |
+++ /dev/null |
41 |
@@ -1,98 +0,0 @@ |
42 |
-# Copyright 1999-2018 Gentoo Foundation |
43 |
-# Distributed under the terms of the GNU General Public License v2 |
44 |
- |
45 |
-EAPI=4 |
46 |
-JAVA_PKG_IUSE="doc examples" |
47 |
- |
48 |
-inherit eutils java-pkg-2 java-ant-2 |
49 |
- |
50 |
-DESCRIPTION="An open-source AVR electronics prototyping platform" |
51 |
-HOMEPAGE="https://arduino.cc/ https://github.com/arduino/" |
52 |
-SRC_URI="https://${PN}.googlecode.com/files/${P}-src.tar.gz |
53 |
-mirror://gentoo/arduino-icons.tar.bz2" |
54 |
-LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0" |
55 |
-SLOT="0" |
56 |
-KEYWORDS="amd64 x86" |
57 |
-RESTRICT="strip binchecks" |
58 |
-IUSE="" |
59 |
- |
60 |
-COMMONDEP=" |
61 |
-dev-java/jna:0 |
62 |
->dev-java/rxtx-2.1:2" |
63 |
- |
64 |
-RDEPEND="${COMMONDEP} |
65 |
-dev-embedded/avrdude |
66 |
-dev-embedded/uisp |
67 |
-sys-devel/crossdev |
68 |
->=virtual/jre-1.5" |
69 |
- |
70 |
-DEPEND="${COMMONDEP} |
71 |
->=virtual/jdk-1.5" |
72 |
- |
73 |
-EANT_GENTOO_CLASSPATH="jna,rxtx-2" |
74 |
-EANT_EXTRA_ARGS="-Dversion=${PV}" |
75 |
-EANT_BUILD_TARGET="build" |
76 |
-JAVA_ANT_REWRITE_CLASSPATH="yes" |
77 |
- |
78 |
-java_prepare() { |
79 |
- # Remove the libraries to ensure the system |
80 |
- # libraries are used |
81 |
- rm build/linux/dist/tools/avrdude* || die |
82 |
- rm build/linux/dist/lib/* || die |
83 |
- rm app/lib/* || die |
84 |
- rm -rf app/src/processing/app/macosx || die |
85 |
- # Patch build/build.xml - remove local jar files |
86 |
- # for rxtx and ecj (use system wide versions) |
87 |
- epatch "${FILESDIR}"/${PN}-1.0.1-build.xml.patch |
88 |
- |
89 |
- # Patch launcher script to include rxtx class/ld paths |
90 |
- epatch "${FILESDIR}"/${PN}-1.0.3-script.patch |
91 |
-} |
92 |
- |
93 |
-src_compile() { |
94 |
- eant -f core/build.xml |
95 |
- EANT_GENTOO_CLASSPATH_EXTRA="../core/core.jar" |
96 |
- eant -f app/build.xml |
97 |
- eant "${EANT_EXTRA_ARGS}" -f build/build.xml |
98 |
-} |
99 |
- |
100 |
-src_install() { |
101 |
- cd "${S}"/build/linux/work || die |
102 |
- java-pkg_dojar lib/core.jar lib/pde.jar |
103 |
- java-pkg_dolauncher ${PN} --pwd /usr/share/${PN} --main processing.app.Base |
104 |
- |
105 |
- if use examples; then |
106 |
- java-pkg_doexamples examples |
107 |
- docompress -x /usr/share/doc/${PF}/examples/ |
108 |
- fi |
109 |
- |
110 |
- if use doc; then |
111 |
- dodoc revisions.txt "${S}"/readme.txt |
112 |
- dohtml -r reference |
113 |
- java-pkg_dojavadoc "${S}"/build/javadoc/everything |
114 |
- fi |
115 |
- |
116 |
- insinto "/usr/share/${PN}/" |
117 |
- doins -r hardware libraries |
118 |
- fowners -R root:uucp "/usr/share/${PN}/hardware" |
119 |
- |
120 |
- insinto "/usr/share/${PN}/lib" |
121 |
- doins -r lib/*.txt lib/theme lib/*.jpg |
122 |
- |
123 |
- # use system avrdude |
124 |
- # patching class files is too hard |
125 |
- dosym /usr/bin/avrdude "/usr/share/${PN}/hardware/tools/avrdude" |
126 |
- dosym /etc/avrdude.conf "/usr/share/${PN}/hardware/tools/avrdude.conf" |
127 |
- |
128 |
- # install menu and icons |
129 |
- domenu "${FILESDIR}/${PN}.desktop" |
130 |
- for sz in 16 24 32 48 128 256; do |
131 |
- newicon -s $sz \ |
132 |
- "${WORKDIR}/${PN}-icons/debian_icons_${sz}x${sz}_apps_${PN}.png" \ |
133 |
- "${PN}.png" |
134 |
- done |
135 |
-} |
136 |
- |
137 |
-pkg_postinst() { |
138 |
- [ ! -x /usr/bin/avr-g++ ] && ewarn "Missing avr-g++; you need to crossdev -s4 avr" |
139 |
-} |
140 |
|
141 |
diff --git a/dev-embedded/arduino/arduino-1.0.5-r2.ebuild b/dev-embedded/arduino/arduino-1.0.5-r2.ebuild |
142 |
deleted file mode 100644 |
143 |
index 7ca3ff60793..00000000000 |
144 |
--- a/dev-embedded/arduino/arduino-1.0.5-r2.ebuild |
145 |
+++ /dev/null |
146 |
@@ -1,107 +0,0 @@ |
147 |
-# Copyright 1999-2018 Gentoo Foundation |
148 |
-# Distributed under the terms of the GNU General Public License v2 |
149 |
- |
150 |
-EAPI=6 |
151 |
-JAVA_PKG_IUSE="doc examples" |
152 |
- |
153 |
-inherit java-pkg-2 java-ant-2 |
154 |
- |
155 |
-DESCRIPTION="An open-source AVR electronics prototyping platform" |
156 |
-HOMEPAGE="https://arduino.cc/ https://github.com/arduino/" |
157 |
-SRC_URI=" |
158 |
- https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> arduino-src-${PV}.tar.gz |
159 |
- mirror://gentoo/arduino-icons.tar.bz2 |
160 |
-" |
161 |
- |
162 |
-LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0" |
163 |
-SLOT="0" |
164 |
-KEYWORDS="~amd64 ~x86" |
165 |
-RESTRICT="strip binchecks" |
166 |
- |
167 |
-S="${WORKDIR}/Arduino-${PV}" |
168 |
- |
169 |
-CDEPEND=" |
170 |
- dev-java/jna:0 |
171 |
- >dev-java/rxtx-2.1:2" |
172 |
- |
173 |
-RDEPEND=" |
174 |
- ${CDEPEND} |
175 |
- dev-embedded/avrdude |
176 |
- dev-embedded/uisp |
177 |
- sys-devel/crossdev |
178 |
- >=virtual/jre-1.6" |
179 |
- |
180 |
-DEPEND=" |
181 |
- ${CDEPEND} |
182 |
- >=virtual/jdk-1.6" |
183 |
- |
184 |
-EANT_GENTOO_CLASSPATH="jna,rxtx-2" |
185 |
-EANT_EXTRA_ARGS="-Dversion=${PV}" |
186 |
-EANT_BUILD_TARGET="build" |
187 |
-JAVA_ANT_REWRITE_CLASSPATH="yes" |
188 |
- |
189 |
-src_prepare() { |
190 |
- # Remove the libraries to ensure the system |
191 |
- # libraries are used |
192 |
- rm -rv \ |
193 |
- build/linux/dist/tools/avrdude* \ |
194 |
- build/linux/dist/lib/* \ |
195 |
- app/lib/* \ |
196 |
- app/src/processing/app/macosx || die |
197 |
- # Patch build/build.xml - remove local jar files |
198 |
- # for rxtx and ecj (use system wide versions) |
199 |
- epatch \ |
200 |
- "${FILESDIR}"/${PN}-1.0.1-build.xml.patch \ |
201 |
- "${FILESDIR}"/${PN}-1.0.3-script.patch |
202 |
- |
203 |
- default |
204 |
-} |
205 |
- |
206 |
-src_compile() { |
207 |
- eant -f core/build.xml |
208 |
- EANT_GENTOO_CLASSPATH_EXTRA="../core/core.jar" |
209 |
- eant -f app/build.xml |
210 |
- eant "${EANT_EXTRA_ARGS}" -f build/build.xml |
211 |
-} |
212 |
- |
213 |
-src_install() { |
214 |
- cd "${S}"/build/linux/work || die |
215 |
- java-pkg_dojar lib/core.jar lib/pde.jar |
216 |
- java-pkg_dolauncher ${PN} --pwd /usr/share/${PN} --main processing.app.Base |
217 |
- |
218 |
- if use examples; then |
219 |
- java-pkg_doexamples examples |
220 |
- docompress -x /usr/share/doc/${PF}/examples/ |
221 |
- fi |
222 |
- |
223 |
- if use doc; then |
224 |
- DOCS=( revisions.txt "${S}"/readme.txt ) |
225 |
- HTML_DOCS=( reference ) |
226 |
- einstalldocs |
227 |
- java-pkg_dojavadoc "${S}"/build/javadoc/everything |
228 |
- fi |
229 |
- |
230 |
- insinto "/usr/share/${PN}/" |
231 |
- doins -r hardware libraries |
232 |
- fowners -R root:uucp "/usr/share/${PN}/hardware" |
233 |
- |
234 |
- insinto "/usr/share/${PN}/lib" |
235 |
- doins -r lib/*.txt lib/theme lib/*.jpg |
236 |
- |
237 |
- # use system avrdude |
238 |
- # patching class files is too hard |
239 |
- dosym /usr/bin/avrdude "/usr/share/${PN}/hardware/tools/avrdude" |
240 |
- dosym /etc/avrdude.conf "/usr/share/${PN}/hardware/tools/avrdude.conf" |
241 |
- |
242 |
- # install menu and icons |
243 |
- domenu "${FILESDIR}/${PN}.desktop" |
244 |
- for sz in 16 24 32 48 128 256; do |
245 |
- newicon -s $sz \ |
246 |
- "${WORKDIR}/${PN}-icons/debian_icons_${sz}x${sz}_apps_${PN}.png" \ |
247 |
- "${PN}.png" |
248 |
- done |
249 |
-} |
250 |
- |
251 |
-pkg_postinst() { |
252 |
- [[ ! -x /usr/bin/avr-g++ ]] && ewarn "Missing avr-g++; you need to crossdev -s4 avr" |
253 |
-} |
254 |
|
255 |
diff --git a/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch b/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch |
256 |
deleted file mode 100644 |
257 |
index afde2e05b66..00000000000 |
258 |
--- a/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch |
259 |
+++ /dev/null |
260 |
@@ -1,38 +0,0 @@ |
261 |
---- arduino-1.0.1/build/build.xml 2012-04-09 00:16:12.000000000 +0100 |
262 |
-+++ arduino-1.0.1/build/build.xml 2012-06-25 06:12:09.000000000 +0100 |
263 |
-@@ -24,9 +24,9 @@ |
264 |
- <fileset dir=".." id="runtime.jars"> |
265 |
- <include name="core/core.jar" /> |
266 |
- <include name="app/pde.jar" /> |
267 |
-- <include name="app/lib/ecj.jar" /> |
268 |
-+<!-- <include name="app/lib/ecj.jar" /> --> |
269 |
- <include name="app/lib/jna.jar" /> |
270 |
-- <include name="app/lib/RXTXcomm.jar" /> |
271 |
-+<!-- <include name="app/lib/RXTXcomm.jar" /> --> |
272 |
- <include name="app/lib/ant.jar" /> |
273 |
- <include name="app/lib/ant-launcher.jar" /> |
274 |
- </fileset> |
275 |
-@@ -361,16 +361,18 @@ |
276 |
- </target> |
277 |
- |
278 |
- <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version"> |
279 |
-- <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" /> |
280 |
-- <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" /> |
281 |
-+<!-- <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" /> --> |
282 |
-+<!-- <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" /> --> |
283 |
- |
284 |
-- <chmod perm="755" file="linux/work/hardware/tools/avrdude" /> |
285 |
-+<!-- <chmod perm="755" file="linux/work/hardware/tools/avrdude" /> --> |
286 |
- |
287 |
- <!-- Unzip AVR tools --> |
288 |
-- <exec executable="tar" dir="linux/work/hardware"> |
289 |
-+<!-- Removed by Paulj - use system installed instead --> |
290 |
-+<!-- <exec executable="tar" dir="linux/work/hardware"> |
291 |
- <arg value="-xjf"/> |
292 |
- <arg value="../../avr_tools_linux64.tar.bz2"/> |
293 |
-- </exec> |
294 |
-+ </exec> |
295 |
-+--> |
296 |
- </target> |
297 |
- |
298 |
- <target name="linux32-run" depends="linux32-build" |
299 |
|
300 |
diff --git a/dev-embedded/arduino/files/arduino-1.0.3-script.patch b/dev-embedded/arduino/files/arduino-1.0.3-script.patch |
301 |
deleted file mode 100644 |
302 |
index b4accc8959a..00000000000 |
303 |
--- a/dev-embedded/arduino/files/arduino-1.0.3-script.patch |
304 |
+++ /dev/null |
305 |
@@ -1,20 +0,0 @@ |
306 |
-diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino |
307 |
-index b5eb9db..3f3b4aa 100644 |
308 |
---- a/build/linux/dist/arduino |
309 |
-+++ b/build/linux/dist/arduino |
310 |
-@@ -10,11 +10,13 @@ for LIB in \ |
311 |
- lib/*.jar \ |
312 |
- ; |
313 |
- do |
314 |
-- CLASSPATH="${CLASSPATH}:${LIB}" |
315 |
-+ CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}" |
316 |
-+ |
317 |
- done |
318 |
-+CLASSPATH="${CLASSPATH+$CLASSPATH:}:$(java-config -dp rxtx-2)" |
319 |
- export CLASSPATH |
320 |
- |
321 |
--LD_LIBRARY_PATH=`pwd`/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} |
322 |
-+LD_LIBRARY_PATH="$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" |
323 |
- export LD_LIBRARY_PATH |
324 |
- |
325 |
- export PATH="${APPDIR}/java/bin:${PATH}" |