From fe1c8b732bd548b699d4c2ef725f67f8b8c8911c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 4 May 2018 11:22:40 +0100 Subject: gentoo resync : 04.05.2018 --- dev-embedded/arduino/Manifest | 2 +- dev-embedded/arduino/arduino-1.8.5-r1.ebuild | 166 --------------------------- dev-embedded/arduino/arduino-1.8.5-r2.ebuild | 166 +++++++++++++++++++++++++++ 3 files changed, 167 insertions(+), 167 deletions(-) delete mode 100644 dev-embedded/arduino/arduino-1.8.5-r1.ebuild create mode 100644 dev-embedded/arduino/arduino-1.8.5-r2.ebuild (limited to 'dev-embedded/arduino') diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest index a1b359bc2573..f6491e4528b6 100644 --- a/dev-embedded/arduino/Manifest +++ b/dev-embedded/arduino/Manifest @@ -28,5 +28,5 @@ DIST arduino-icons.tar.bz2 58775 BLAKE2B 20f230394a8d725eaf7300f66105b09b31eb96a DIST arduino-src-1.0.5.tar.gz 235284641 BLAKE2B 7e7ed1305be468dff5ee32238e51b56c214bb993531c67a5ed178a267b5ff8b0f5303aa2a539b64ac40b20278d0206513c3b26f74dd9120058d97fabbbafef27 SHA512 0a40203b8a31c4d9288500962ada7f5083c280a84d8c56ab7da2d1326e1c02a908a96db589ab10bafc115abefe010bf23f6994c08e43c86a4ac10c2d4ab93ec2 EBUILD arduino-1.0.5-r1.ebuild 2583 BLAKE2B 78d8ff706d0bdeb6bcede5a70b8eabf862a91f38bb994218924ad01f6174bd181891e8d9e0237b3d2b8564ef519956f32393c6b61a161714ebf22b4f0181e1ea SHA512 40d26584bb9ac446fd29831774e476d984a900004128618883e161c1d2d39c185c2a4e8e34a66c961b2d8905186d67806a844d792f42d1b52c34eb840ea0badb EBUILD arduino-1.0.5-r2.ebuild 2602 BLAKE2B 1d32d6ad9581d02f2ba8d8844a19360d855a2ff1d1487898e77ad1b76e87679b8879cc928e0c30e362b22564fc9312b7c55e774f69f92d3bc0a22e18046336ae SHA512 c4a1a0d4ceafc9693c105995a0fae9696e9ed23c677588d9eee9ed25ecd43a011bfab27945201c89685dd3586607a33680ef938a37cc20bf0653c9d373f5b2d7 -EBUILD arduino-1.8.5-r1.ebuild 4942 BLAKE2B 6cecb282c20ed4065ff4933fd5090eaed4a9536aba81ffc2430a2492ac5e72ed2922a8beee546824e9b8f5ced2613267b99c4ba597f7b4234d88568d74ccbb3b SHA512 217e70d54d450ea33c3fc417d80f3351ca7ecdce6f83e5a356cdf860e7eeee72eab121ae551b7ae4f0d8706e2ef15782053507944674bdb791117886e4076524 +EBUILD arduino-1.8.5-r2.ebuild 4943 BLAKE2B b17f2cd800de63daa958a8a78f118ebd0f0476b893ce6255112148d12924faee9a76a648f538a04af3d678b227e2eee005872698a74d9d9d392f0e01c680a608 SHA512 39703d477d5592b6ee0836bbcb0c31b95f042c7fec6ef83c126f2140291cfdc56894f02d8ba3857eed6519b00dd148accc0469b0add969ac27df0aece6731dc2 MISC metadata.xml 331 BLAKE2B 5449a181e8d470cb80c1a32d50e79c9f912117df14673adc2d1d989f037b1fd89c8bb4a263b4a883e30ab034e0e1ef1e82f54fa9134511755f9ccd62acff9af9 SHA512 6966c4f97ca07b9ef925691abe06e3110d9901cf15fbc7ed07c5ac65dbe583d346186961f64fba71ff796b5d6ff187870b8db41b3f1836b3fefbcc3e54c7ba4e diff --git a/dev-embedded/arduino/arduino-1.8.5-r1.ebuild b/dev-embedded/arduino/arduino-1.8.5-r1.ebuild deleted file mode 100644 index 1ea4adfe2d4d..000000000000 --- a/dev-embedded/arduino/arduino-1.8.5-r1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-pkg-2 java-ant-2 gnome2-utils - -DESCRIPTION="An open-source AVR electronics prototyping platform" -HOMEPAGE="https://arduino.cc/ https://github.com/arduino/" - -ARDUINO_LIBRARIES=( - "Firmata 2.5.6" - "Bridge 1.6.3" - "Robot_Control 1.0.4" - "Robot_Motor 1.0.3" - "RobotIRremote 2.0.0" - "SpacebrewYun 1.0.1" - "Temboo 1.2.1" - "Esplora 1.0.4" - "Mouse 1.0.1" - "Keyboard 1.0.1" - "SD 1.1.1" - "Servo 1.1.2" - "LiquidCrystal 1.0.7" - "Adafruit_CircuitPlayground 1.6.8 https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip" - "WiFi101-Updater-ArduinoIDE-Plugin 0.9.1 https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip build/shared/" -) - -for lib in "${ARDUINO_LIBRARIES[@]}"; do - lib=( $lib ) - default_url="https://github.com/arduino-libraries/${lib[0]}/archive/${lib[1]}.zip" - url=${lib[2]:-$default_url} - ARDUINO_LIBRARIES_URI+=" ${url} -> ${P}-${lib[0]}-${lib[1]}.zip" -done - -ARDUINO_DOCS=( - "reference-1.6.6-3" - "Galileo_help_files-1.6.2" - "Edison_help_files-1.6.2" -) - -for docname in "${ARDUINO_DOCS[@]}"; do - ARDUINO_DOCS_URI+=" https://downloads.arduino.cc/${docname}.zip -> ${P}-${docname}.zip" -done - -SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz - ${ARDUINO_LIBRARIES_URI} - doc? ( - ${ARDUINO_DOCS_URI} - )" - -LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -# bincheck RESTRICT is needed because firmware that ships with arduino contains code that makes -# scanelf bark. It's also why we need a separate package for arduino-listserialportsc because if -# we install it in the context of this package, we will get QA notices telling us we're doing a -# bad thing. -RESTRICT="strip binchecks" -IUSE="doc" - -CDEPEND="dev-embedded/arduino-builder" - -RDEPEND="${CDEPEND} - >=dev-util/astyle-3.1[java] - dev-embedded/arduino-listserialportsc - >=virtual/jre-1.8" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.8" - -EANT_BUILD_TARGET="build" -# don't run the default "javadoc" target, we don't have one. -EANT_DOC_TARGET="" -EANT_BUILD_XML="build/build.xml" -EANT_EXTRA_ARGS="-Dno_arduino_builder=1 -Dlocal_sources=1" - -S="${WORKDIR}/Arduino-${PV}" -SHARE="/usr/share/${PN}" - -src_unpack() { - # We don't want to unpack libraries, just move zip files into the work dir - unpack `echo ${A} | cut -d ' ' -f1` - local lib - for lib in "${ARDUINO_LIBRARIES[@]}"; do - lib=( $lib ) - local destfolder=${lib[3]:-build/} - cp "${DISTDIR}/${P}-${lib[0]}-${lib[1]}.zip" "${S}/${destfolder}/${lib[0]}-${lib[1]}.zip" || die - done - if use doc; then - local docname - for docname in "${ARDUINO_DOCS[@]}"; do - cp "${DISTDIR}/${P}-${docname}.zip" "${S}/build/shared/${docname}.zip" || die - done - fi -} - -src_prepare() { - # We need to disable astyle/listserialportsc and toolchain (avr-gcc, avrdude) bundling. - eapply "${FILESDIR}/${PN}-1.8.5-build.xml.patch" - - # We need to replace relative paths for toolchain executable by paths to system ones. - eapply "${FILESDIR}/${PN}-1.8.5-avr-platform.txt.patch" - - # We need to load system astyle/listserialportsc instead of bundled ones. - eapply "${FILESDIR}/${PN}-1.8.5-lib-loading.patch" - default -} - -src_compile() { - if ! use doc; then - EANT_EXTRA_ARGS+=" -Dno_docs=1" - fi - java-pkg-2_src_compile -} - -src_install() { - cd "${S}"/build/linux/work || die - - java-pkg_dojar lib/*.jar - java-pkg_dolauncher ${PN} \ - --pwd "${SHARE}" \ - --main "processing.app.Base" \ - --java_args "-DAPP_DIR=${SHARE} -Djava.library.path=${EPREFIX}/usr/$(get_libdir)" - - # Install libraries - insinto "${SHARE}" - - doins -r examples hardware lib libraries tools - - # In upstream's build process, we copy these fiels below from the bundled arduino-builder. - # Here we do the same thing, but from the system arduino-builder. - dosym "${EPREFIX}/usr/share/arduino-builder/platform.txt" "${SHARE}/hardware/platform.txt" - dosym "${EPREFIX}/usr/share/arduino-builder/platform.keys.rewrite.txt" "${SHARE}/hardware/platform.keys.rewrite.txt" - dosym "${EPREFIX}/usr/bin/arduino-builder" "${SHARE}/arduino-builder" - - # hardware/tools/avr needs to exist or arduino-builder will - # complain about missing required -tools arg - dodir "${SHARE}/hardware/tools/avr" - - if use doc; then - HTML_DOCS=( reference ) - einstalldocs - - # arduino expects its doc in its "main" directory. symlink it. - dosym "${EPREFIX}/usr/share/doc/${P}/html/reference" "${SHARE}/reference" - fi - - # Install menu and icons - domenu "${FILESDIR}/${PN}.desktop" - cd lib/icons || die - local icondir - for icondir in *; do - # icondir name is something like "24x24" we want the "24" part - local iconsize=`cut -dx -f1 <<< "${icondir}"` - newicon -s $iconsize \ - "${icondir}/apps/arduino.png" \ - "${PN}.png" - done -} - -pkg_postinst() { - gnome2_icon_cache_update - [[ ! -x /usr/bin/avr-g++ ]] && ewarn "Missing avr-g++; you need to crossdev -s4 avr" -} diff --git a/dev-embedded/arduino/arduino-1.8.5-r2.ebuild b/dev-embedded/arduino/arduino-1.8.5-r2.ebuild new file mode 100644 index 000000000000..9bb3d4462bf3 --- /dev/null +++ b/dev-embedded/arduino/arduino-1.8.5-r2.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit java-pkg-2 java-ant-2 gnome2-utils + +DESCRIPTION="An open-source AVR electronics prototyping platform" +HOMEPAGE="https://arduino.cc/ https://github.com/arduino/" + +ARDUINO_LIBRARIES=( + "Firmata 2.5.6" + "Bridge 1.6.3" + "Robot_Control 1.0.4" + "Robot_Motor 1.0.3" + "RobotIRremote 2.0.0" + "SpacebrewYun 1.0.1" + "Temboo 1.2.1" + "Esplora 1.0.4" + "Mouse 1.0.1" + "Keyboard 1.0.1" + "SD 1.1.1" + "Servo 1.1.2" + "LiquidCrystal 1.0.7" + "Adafruit_CircuitPlayground 1.6.8 https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip" + "WiFi101-Updater-ArduinoIDE-Plugin 0.9.1 https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip build/shared/" +) + +for lib in "${ARDUINO_LIBRARIES[@]}"; do + lib=( $lib ) + default_url="https://github.com/arduino-libraries/${lib[0]}/archive/${lib[1]}.zip" + url=${lib[2]:-$default_url} + ARDUINO_LIBRARIES_URI+=" ${url} -> ${P}-${lib[0]}-${lib[1]}.zip" +done + +ARDUINO_DOCS=( + "reference-1.6.6-3" + "Galileo_help_files-1.6.2" + "Edison_help_files-1.6.2" +) + +for docname in "${ARDUINO_DOCS[@]}"; do + ARDUINO_DOCS_URI+=" https://downloads.arduino.cc/${docname}.zip -> ${P}-${docname}.zip" +done + +SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz + ${ARDUINO_LIBRARIES_URI} + doc? ( + ${ARDUINO_DOCS_URI} + )" + +LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +# bincheck RESTRICT is needed because firmware that ships with arduino contains code that makes +# scanelf bark. It's also why we need a separate package for arduino-listserialportsc because if +# we install it in the context of this package, we will get QA notices telling us we're doing a +# bad thing. +RESTRICT="strip binchecks" +IUSE="doc" + +CDEPEND="dev-embedded/arduino-builder" + +RDEPEND="${CDEPEND} + >=dev-util/astyle-3.1[java] + dev-embedded/arduino-listserialportsc + >=virtual/jre-1.8" + +DEPEND="${CDEPEND} + >=virtual/jdk-1.8" + +EANT_BUILD_TARGET="build" +# don't run the default "javadoc" target, we don't have one. +EANT_DOC_TARGET="" +EANT_BUILD_XML="build/build.xml" +EANT_EXTRA_ARGS="-Dno_arduino_builder=1 -Dlocal_sources=1" + +S="${WORKDIR}/Arduino-${PV}" +SHARE="/usr/share/${PN}" + +src_unpack() { + # We don't want to unpack libraries, just move zip files into the work dir + unpack `echo ${A} | cut -d ' ' -f1` + local lib + for lib in "${ARDUINO_LIBRARIES[@]}"; do + lib=( $lib ) + local destfolder=${lib[3]:-build/} + cp "${DISTDIR}/${P}-${lib[0]}-${lib[1]}.zip" "${S}/${destfolder}/${lib[0]}-${lib[1]}.zip" || die + done + if use doc; then + local docname + for docname in "${ARDUINO_DOCS[@]}"; do + cp "${DISTDIR}/${P}-${docname}.zip" "${S}/build/shared/${docname}.zip" || die + done + fi +} + +src_prepare() { + # We need to disable astyle/listserialportsc and toolchain (avr-gcc, avrdude) bundling. + eapply "${FILESDIR}/${PN}-1.8.5-build.xml.patch" + + # We need to replace relative paths for toolchain executable by paths to system ones. + eapply "${FILESDIR}/${PN}-1.8.5-avr-platform.txt.patch" + + # We need to load system astyle/listserialportsc instead of bundled ones. + eapply "${FILESDIR}/${PN}-1.8.5-lib-loading.patch" + default +} + +src_compile() { + if ! use doc; then + EANT_EXTRA_ARGS+=" -Dno_docs=1" + fi + java-pkg-2_src_compile +} + +src_install() { + cd "${S}"/build/linux/work || die + + java-pkg_dojar lib/*.jar + java-pkg_dolauncher ${PN} \ + --pwd "${SHARE}" \ + --main "processing.app.Base" \ + --java_args "-DAPP_DIR=${SHARE} -Djava.library.path=${EPREFIX}/usr/$(get_libdir)" + + # Install libraries + insinto "${SHARE}" + + doins -r examples hardware lib libraries tools + + # In upstream's build process, we copy these fiels below from the bundled arduino-builder. + # Here we do the same thing, but from the system arduino-builder. + dosym "${EPREFIX}/usr/share/arduino-builder/platform.txt" "${SHARE}/hardware/platform.txt" + dosym "${EPREFIX}/usr/share/arduino-builder/platform.keys.rewrite.txt" "${SHARE}/hardware/platform.keys.rewrite.txt" + dosym "${EPREFIX}/usr/bin/arduino-builder" "${SHARE}/arduino-builder" + + # hardware/tools/avr needs to exist or arduino-builder will + # complain about missing required -tools arg + dodir "${SHARE}/hardware/tools/avr" + + if use doc; then + HTML_DOCS=( reference ) + einstalldocs + + # arduino expects its doc in its "main" directory. symlink it. + dosym "${EPREFIX}/usr/share/doc/${PF}/html/reference" "${SHARE}/reference" + fi + + # Install menu and icons + domenu "${FILESDIR}/${PN}.desktop" + cd lib/icons || die + local icondir + for icondir in *; do + # icondir name is something like "24x24" we want the "24" part + local iconsize=`cut -dx -f1 <<< "${icondir}"` + newicon -s $iconsize \ + "${icondir}/apps/arduino.png" \ + "${PN}.png" + done +} + +pkg_postinst() { + gnome2_icon_cache_update + [[ ! -x /usr/bin/avr-g++ ]] && ewarn "Missing avr-g++; you need to crossdev -s4 avr" +} -- cgit v1.2.3