From: "Virgil Dupras" <vdupras@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/arduino/files/, dev-embedded/arduino/
Date: Wed, 24 Oct 2018 11:49:32 +0000 (UTC) [thread overview]
Message-ID: <1540381756.80d731cd86741c9e87fe3db4fb117b977d1c866b.vdupras@gentoo> (raw)
commit: 80d731cd86741c9e87fe3db4fb117b977d1c866b
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 24 11:49:16 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 11:49:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d731cd
dev-embedded/arduino: remove old
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-embedded/arduino/Manifest | 3 -
dev-embedded/arduino/arduino-1.0.5-r1.ebuild | 98 -------------------
dev-embedded/arduino/arduino-1.0.5-r2.ebuild | 107 ---------------------
.../arduino/files/arduino-1.0.1-build.xml.patch | 38 --------
.../arduino/files/arduino-1.0.3-script.patch | 20 ----
5 files changed, 266 deletions(-)
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index ebb1d7f130e..3955a4b47f7 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -1,4 +1,3 @@
-DIST arduino-1.0.5-src.tar.gz 40526292 BLAKE2B 3844d5f644af94adbb8fb6fa2f80640ae823d2455d0c2e175bc614a281ce5ece0bd111ecd3661d8ab2f2017781b8b1753b215b705090e449be0525b5ec009a4b SHA512 0401bf6051a48d343f9e4e822446a846b2c6446c68949efe5daf5f5445114312eecb9c99a4565ab2e2f80831aaa32122ecc21f81c8a97136704482cd0f1f1c00
DIST arduino-1.8.5-Adafruit_CircuitPlayground-1.6.8.zip 404619 BLAKE2B 993ec1282cc711b814db99fe1e4b50a2a6e6559722872e8fbcbb42e022c0e3611e10a4a0285468f82241eb5e15c0f91ff49ae9f2e0190d80a674cba51c93eae6 SHA512 0f0d32841bb6987edfc0e9aa0af8d0f7cf68dd33bf07ff0ec4cdd0d9733bb092b97a4810d7a0828e1d38fb25ec58e8fd3c023f70dffa3b1397386a902c932491
DIST arduino-1.8.5-Bridge-1.6.3.zip 64717 BLAKE2B cb20da7b1db33ad89bd5fcadd01035592b664a7aaa98c27463fad643deba0b1d7e48b341f75f2564716f5b32e800b96934202c683b9a68c628d5af01662c9b7e SHA512 6836580af17b9fbc1ce39821c2e3891bb2f240904a30e66110a03837a24979093ad88819dc333fa5b47ceff6f6ef17552004356bc71200a2e7b09d2182e91fc5
DIST arduino-1.8.5-Edison_help_files-1.6.2.zip 3321743 BLAKE2B 5d760ba329741cac27253fb439cf98381c0c0d7327f0c22f61cffc23c48d655278280185e5a7f6c85f3d182cacad4626eb9fe6cc2aaf7d2965bb377e2f39bbaa SHA512 63d4005036b43f09347814433578e8c75a7af5caa0923516deab146ef0867af4e60aad0c9d5d47870dcec0ddb4e5396363e4312425f95a8d8da8725f77da8f3a
@@ -18,5 +17,3 @@ DIST arduino-1.8.5-Temboo-1.2.1.zip 187499 BLAKE2B 4f26317b21492697fa3bbce1fe2cd
DIST arduino-1.8.5-WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip 703748 BLAKE2B be9a0e2ac5a890121a0ef59700ee9a001711d7357d1c9aedfac7ca8593ed6bdef32219a88003846d4a793a532a3ebb47cde28dbe4c93dbeef8567ad6fb36bf00 SHA512 f107e5ee544450cc7cabfc7eb43462d374a59446418b5ce3a9f3eb545b03fe6383f42e79eb6919fb4b6e621902cbb84f4fa7119f23b51aa770ebd020ffffdee9
DIST arduino-1.8.5-reference-1.6.6-3.zip 7004842 BLAKE2B 49d0d41fb499c15f06c8cb8d8211e5039ee9843a6629f305762b262a5bf199e4bbe7fea4716b7734403dc7e83ce35a963035b3a2c0d6a198a4218e7472b18d74 SHA512 65962322b6dcb15da6c119d47c382052d1183772c855b8e8fcdd108b54e730e2374d93741737f3b51e57288a0e8842a6a7f79dce4377ea3630293e6c3e7e8b73
DIST arduino-1.8.5.tar.gz 48219839 BLAKE2B b031ccd601c42adce0ef06b69bd6103996d7a2a29a4640ab2518bb607e17d90524e1f7dc9861c096df90b0f0a439c5ee8867912b53cb925309dd7e0f6ddf3b54 SHA512 f01b0401edc7ea5d58cb475776b816d05f289060613dd452ca71ecaf4a3a95c5e9ddb5f2cf06d3c165e9e0540c895f9eaea896a7974c88834de569944c4adbd2
-DIST arduino-icons.tar.bz2 58775 BLAKE2B 20f230394a8d725eaf7300f66105b09b31eb96aad8798f325d9e5eec6a1aec8319deb561d1b76d47d08dc6663ec11b6b991e057b88d6619c16a80cf0e10959e1 SHA512 b750e79d6117f5df619f2b765dad6e64f0ba4aa3314b0b6e00801577e3ea1f15951ba15efe7a00f5317285a19ac29ac41c78b71342f45cd164c794a42bafcdd9
-DIST arduino-src-1.0.5.tar.gz 235284641 BLAKE2B 7e7ed1305be468dff5ee32238e51b56c214bb993531c67a5ed178a267b5ff8b0f5303aa2a539b64ac40b20278d0206513c3b26f74dd9120058d97fabbbafef27 SHA512 0a40203b8a31c4d9288500962ada7f5083c280a84d8c56ab7da2d1326e1c02a908a96db589ab10bafc115abefe010bf23f6994c08e43c86a4ac10c2d4ab93ec2
diff --git a/dev-embedded/arduino/arduino-1.0.5-r1.ebuild b/dev-embedded/arduino/arduino-1.0.5-r1.ebuild
deleted file mode 100644
index 6dde62efe0a..00000000000
--- a/dev-embedded/arduino/arduino-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-JAVA_PKG_IUSE="doc examples"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="An open-source AVR electronics prototyping platform"
-HOMEPAGE="https://arduino.cc/ https://github.com/arduino/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}-src.tar.gz
-mirror://gentoo/arduino-icons.tar.bz2"
-LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="strip binchecks"
-IUSE=""
-
-COMMONDEP="
-dev-java/jna:0
->dev-java/rxtx-2.1:2"
-
-RDEPEND="${COMMONDEP}
-dev-embedded/avrdude
-dev-embedded/uisp
-sys-devel/crossdev
->=virtual/jre-1.5"
-
-DEPEND="${COMMONDEP}
->=virtual/jdk-1.5"
-
-EANT_GENTOO_CLASSPATH="jna,rxtx-2"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_BUILD_TARGET="build"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-java_prepare() {
- # Remove the libraries to ensure the system
- # libraries are used
- rm build/linux/dist/tools/avrdude* || die
- rm build/linux/dist/lib/* || die
- rm app/lib/* || die
- rm -rf app/src/processing/app/macosx || die
- # Patch build/build.xml - remove local jar files
- # for rxtx and ecj (use system wide versions)
- epatch "${FILESDIR}"/${PN}-1.0.1-build.xml.patch
-
- # Patch launcher script to include rxtx class/ld paths
- epatch "${FILESDIR}"/${PN}-1.0.3-script.patch
-}
-
-src_compile() {
- eant -f core/build.xml
- EANT_GENTOO_CLASSPATH_EXTRA="../core/core.jar"
- eant -f app/build.xml
- eant "${EANT_EXTRA_ARGS}" -f build/build.xml
-}
-
-src_install() {
- cd "${S}"/build/linux/work || die
- java-pkg_dojar lib/core.jar lib/pde.jar
- java-pkg_dolauncher ${PN} --pwd /usr/share/${PN} --main processing.app.Base
-
- if use examples; then
- java-pkg_doexamples examples
- docompress -x /usr/share/doc/${PF}/examples/
- fi
-
- if use doc; then
- dodoc revisions.txt "${S}"/readme.txt
- dohtml -r reference
- java-pkg_dojavadoc "${S}"/build/javadoc/everything
- fi
-
- insinto "/usr/share/${PN}/"
- doins -r hardware libraries
- fowners -R root:uucp "/usr/share/${PN}/hardware"
-
- insinto "/usr/share/${PN}/lib"
- doins -r lib/*.txt lib/theme lib/*.jpg
-
- # use system avrdude
- # patching class files is too hard
- dosym /usr/bin/avrdude "/usr/share/${PN}/hardware/tools/avrdude"
- dosym /etc/avrdude.conf "/usr/share/${PN}/hardware/tools/avrdude.conf"
-
- # install menu and icons
- domenu "${FILESDIR}/${PN}.desktop"
- for sz in 16 24 32 48 128 256; do
- newicon -s $sz \
- "${WORKDIR}/${PN}-icons/debian_icons_${sz}x${sz}_apps_${PN}.png" \
- "${PN}.png"
- done
-}
-
-pkg_postinst() {
- [ ! -x /usr/bin/avr-g++ ] && ewarn "Missing avr-g++; you need to crossdev -s4 avr"
-}
diff --git a/dev-embedded/arduino/arduino-1.0.5-r2.ebuild b/dev-embedded/arduino/arduino-1.0.5-r2.ebuild
deleted file mode 100644
index 7ca3ff60793..00000000000
--- a/dev-embedded/arduino/arduino-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-JAVA_PKG_IUSE="doc examples"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="An open-source AVR electronics prototyping platform"
-HOMEPAGE="https://arduino.cc/ https://github.com/arduino/"
-SRC_URI="
- https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> arduino-src-${PV}.tar.gz
- mirror://gentoo/arduino-icons.tar.bz2
-"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/Arduino-${PV}"
-
-CDEPEND="
- dev-java/jna:0
- >dev-java/rxtx-2.1:2"
-
-RDEPEND="
- ${CDEPEND}
- dev-embedded/avrdude
- dev-embedded/uisp
- sys-devel/crossdev
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-EANT_GENTOO_CLASSPATH="jna,rxtx-2"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_BUILD_TARGET="build"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
- # Remove the libraries to ensure the system
- # libraries are used
- rm -rv \
- build/linux/dist/tools/avrdude* \
- build/linux/dist/lib/* \
- app/lib/* \
- app/src/processing/app/macosx || die
- # Patch build/build.xml - remove local jar files
- # for rxtx and ecj (use system wide versions)
- epatch \
- "${FILESDIR}"/${PN}-1.0.1-build.xml.patch \
- "${FILESDIR}"/${PN}-1.0.3-script.patch
-
- default
-}
-
-src_compile() {
- eant -f core/build.xml
- EANT_GENTOO_CLASSPATH_EXTRA="../core/core.jar"
- eant -f app/build.xml
- eant "${EANT_EXTRA_ARGS}" -f build/build.xml
-}
-
-src_install() {
- cd "${S}"/build/linux/work || die
- java-pkg_dojar lib/core.jar lib/pde.jar
- java-pkg_dolauncher ${PN} --pwd /usr/share/${PN} --main processing.app.Base
-
- if use examples; then
- java-pkg_doexamples examples
- docompress -x /usr/share/doc/${PF}/examples/
- fi
-
- if use doc; then
- DOCS=( revisions.txt "${S}"/readme.txt )
- HTML_DOCS=( reference )
- einstalldocs
- java-pkg_dojavadoc "${S}"/build/javadoc/everything
- fi
-
- insinto "/usr/share/${PN}/"
- doins -r hardware libraries
- fowners -R root:uucp "/usr/share/${PN}/hardware"
-
- insinto "/usr/share/${PN}/lib"
- doins -r lib/*.txt lib/theme lib/*.jpg
-
- # use system avrdude
- # patching class files is too hard
- dosym /usr/bin/avrdude "/usr/share/${PN}/hardware/tools/avrdude"
- dosym /etc/avrdude.conf "/usr/share/${PN}/hardware/tools/avrdude.conf"
-
- # install menu and icons
- domenu "${FILESDIR}/${PN}.desktop"
- for sz in 16 24 32 48 128 256; do
- newicon -s $sz \
- "${WORKDIR}/${PN}-icons/debian_icons_${sz}x${sz}_apps_${PN}.png" \
- "${PN}.png"
- done
-}
-
-pkg_postinst() {
- [[ ! -x /usr/bin/avr-g++ ]] && ewarn "Missing avr-g++; you need to crossdev -s4 avr"
-}
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
deleted file mode 100644
index afde2e05b66..00000000000
--- a/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- arduino-1.0.1/build/build.xml 2012-04-09 00:16:12.000000000 +0100
-+++ arduino-1.0.1/build/build.xml 2012-06-25 06:12:09.000000000 +0100
-@@ -24,9 +24,9 @@
- <fileset dir=".." id="runtime.jars">
- <include name="core/core.jar" />
- <include name="app/pde.jar" />
-- <include name="app/lib/ecj.jar" />
-+<!-- <include name="app/lib/ecj.jar" /> -->
- <include name="app/lib/jna.jar" />
-- <include name="app/lib/RXTXcomm.jar" />
-+<!-- <include name="app/lib/RXTXcomm.jar" /> -->
- <include name="app/lib/ant.jar" />
- <include name="app/lib/ant-launcher.jar" />
- </fileset>
-@@ -361,16 +361,18 @@
- </target>
-
- <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
-- <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />
-- <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" />
-+<!-- <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" /> -->
-+<!-- <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" /> -->
-
-- <chmod perm="755" file="linux/work/hardware/tools/avrdude" />
-+<!-- <chmod perm="755" file="linux/work/hardware/tools/avrdude" /> -->
-
- <!-- Unzip AVR tools -->
-- <exec executable="tar" dir="linux/work/hardware">
-+<!-- Removed by Paulj - use system installed instead -->
-+<!-- <exec executable="tar" dir="linux/work/hardware">
- <arg value="-xjf"/>
- <arg value="../../avr_tools_linux64.tar.bz2"/>
-- </exec>
-+ </exec>
-+-->
- </target>
-
- <target name="linux32-run" depends="linux32-build"
diff --git a/dev-embedded/arduino/files/arduino-1.0.3-script.patch b/dev-embedded/arduino/files/arduino-1.0.3-script.patch
deleted file mode 100644
index b4accc8959a..00000000000
--- a/dev-embedded/arduino/files/arduino-1.0.3-script.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
-index b5eb9db..3f3b4aa 100644
---- a/build/linux/dist/arduino
-+++ b/build/linux/dist/arduino
-@@ -10,11 +10,13 @@ for LIB in \
- lib/*.jar \
- ;
- do
-- CLASSPATH="${CLASSPATH}:${LIB}"
-+ CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}"
-+
- done
-+CLASSPATH="${CLASSPATH+$CLASSPATH:}:$(java-config -dp rxtx-2)"
- export CLASSPATH
-
--LD_LIBRARY_PATH=`pwd`/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-+LD_LIBRARY_PATH="$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
- export LD_LIBRARY_PATH
-
- export PATH="${APPDIR}/java/bin:${PATH}"
next reply other threads:[~2018-10-24 11:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-24 11:49 Virgil Dupras [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-03-06 19:59 [gentoo-commits] repo/gentoo:master commit in: dev-embedded/arduino/files/, dev-embedded/arduino/ Amy Liffey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1540381756.80d731cd86741c9e87fe3db4fb117b977d1c866b.vdupras@gentoo \
--to=vdupras@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox