commit: 6d3c386cca3b1ab7a65f4140e74790e81009ca23 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Aug 29 18:49:46 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Aug 29 19:23:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d3c386c
dev-embedded/arduino: drop 1.8.7, 1.8.13, EAPI-6-- Closes: https://bugs.gentoo.org/865449 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-embedded/arduino/Manifest | 8 -- dev-embedded/arduino/arduino-1.8.13.ebuild | 148 ----------------------------- dev-embedded/arduino/arduino-1.8.7.ebuild | 146 ---------------------------- 3 files changed, 302 deletions(-) diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest index 97976803f518..2c5e7ecab1bf 100644 --- a/dev-embedded/arduino/Manifest +++ b/dev-embedded/arduino/Manifest @@ -1,12 +1,4 @@ -DIST arduino-1.8.13.tar.gz 42634076 BLAKE2B 66755822da4cdb804e313730784d2824f919a09a8c93973ceda2c5964142f8c93081c9d79e0172b745cc938ed2f01b0279a1977284bde6e55f3a330fa113c21c SHA512 3481d1ed4ca4ffe038bdfc17acb6f2ec113ecc48d1a3967178738a852e5ba1d28044d2ea7cd4ae0984183a70ac8e6f8eb5a707624fd70e16561aa6cd6f4b9cd8 DIST arduino-1.8.19.tar.gz 34715155 BLAKE2B d0bb23548db5b5c402e418f85339c1ace9a21306f5866bd4923edabd188e9e8e273227927d2f45ce50cdc1ee7bb59dfa4d62b027ee0f723d5948ec9ba77c0d50 SHA512 65db7aec67d6bbb96eea83d60608dd4c138ff1f9dd3c02259f3ffa0ce51f59a9a073a1ddb48acc0208477ece92ec79b5a6a87b445110f59e698990d61300bbf9 -DIST arduino-1.8.7.tar.gz 38372798 BLAKE2B a59aac177bb95e17eec7ab85d88cf0a25737f21d4be88458abfd8ffa12f2215b82e2256fc2921a14583b60f51f3144f46d35d19ae83ba6dd726a2a8773839aea SHA512 6676e0a7e0383eb2addbfad05020cb54c1606f6920840c269625e58354fd950b57037f553e3f9661b462dfbb8afb40d6ba7390cbe0c4b96406871279939b5823 -DIST arduino-Edison_help_files-1.6.2.zip 3321743 BLAKE2B 5d760ba329741cac27253fb439cf98381c0c0d7327f0c22f61cffc23c48d655278280185e5a7f6c85f3d182cacad4626eb9fe6cc2aaf7d2965bb377e2f39bbaa SHA512 63d4005036b43f09347814433578e8c75a7af5caa0923516deab146ef0867af4e60aad0c9d5d47870dcec0ddb4e5396363e4312425f95a8d8da8725f77da8f3a -DIST arduino-Galileo_help_files-1.6.2.zip 4352077 BLAKE2B 16b99a57535ed77cdd69bb60dbb17085edfb2454b81a1b55b46310aa75e797bf784e39fb4642daf281ff92d9ade6f002cf359f98b95fc5225f66e63d189305fa SHA512 411fcfad9e9877078de62c02accd66ed5e44daf2979cad38c12962c22d73412d084670db77d5b50b3a32f35977961943e90d85ac80484f926468aa994f8b107b -DIST arduino-WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip 7229880 BLAKE2B 93729cf9fbbdab111a71020502cbe59b4a62217e90fa684977184e9de18cbd8e9a80d149184b794587385550a46aaef14a08057eb35b734146a911d5913496a7 SHA512 eacd20bfcc759f0b0744629073d1debd3d4fd8a36e5948314d149902568158839965755b833a263a71c65d7092d9091a5d05695c01854d4fb308fbec3711bd3c DIST arduino-WiFi101-Updater-ArduinoIDE-Plugin-0.12.0.zip 21873817 BLAKE2B ef2ee6291c452b58b990594a1cbae0daf86e1b6078b51225a7253d782554648610d39c2761ed67914e54a757d1345c7de4c8a63fbe12483f0134c21eac5dc303 SHA512 17e2d07fbdca491a8d80abb6f2ceb000c68af59b755da7db70dce2d5f781204340f43365c40e641acf0b084b2073b3b056f63d68990f405adefb76887f4c5b72 -DIST arduino-WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip 945515 BLAKE2B a2ab32b400f774f006e1afb69797951382f8768ee55216591baecc8fc0665c31b31df403ffd17825ae524dcd0bcba87bfecbdc82722f9105d68cf9d5c8298415 SHA512 2fd003b638133d9ff77d76952ce4a38c3c2ea78c0c0c849580883e5104c3a5c141313f74934eeda29a446388e3d502e69e65ded088e693b0ff5810a133001ba8 -DIST arduino-avr-1.6.23.tar.bz2 5001988 BLAKE2B 8b6ddc2d66e651a3a2b6bd6992cd1311aad223a6cefa1a1a4bc1fa05de449116511137f8cf13c50ca42b83477c66cf4aa3a7984f49905eb7a295eff7f2c3623e SHA512 70ff70446bfc0f036f7a2927e8e53861e60225a0a6c1eb993557278ec79b8337f3a5ee6fd6f6d200744d80104efb1783332eb8d6d53c9f1b6ea6dc3054d78fd4 DIST arduino-avr-1.8.3.tar.bz2 4941548 BLAKE2B 48d84a30f3ccf1074df6ec006ccc58d702a572dee51cff1753121055d660ad6cea4176e74488af93227a9eeea4d3a9c0c0856711ebded26ee14a755fb519dd6f SHA512 c8a63ad79f16c380def83b1215762f5cbddfc51480d658853370c3210724bb04627272f3affc0ad01af4463a68980665a4e1c37cc8fabcec16e97c4550d1bb03 DIST arduino-examples-1.9.1.zip 4810227 BLAKE2B 0781ecb330adc444e660f6db89533dfb01995ec87dec7b5f55e28e65bfaf7f505aa79362f5815193ea6500cb1d6a16a86d5f300acf70fc4eaff0265c2891d371 SHA512 c0e21dd374b2751a1e5f2b790202d4883879da2e26e9a23ccbaec478647e2b8160cbc085e76888deafc05b9b14b1aff4ce2a9b834a7b83e8226c3bc41801015c -DIST arduino-reference-1.6.6-3.zip 7004842 BLAKE2B 49d0d41fb499c15f06c8cb8d8211e5039ee9843a6629f305762b262a5bf199e4bbe7fea4716b7734403dc7e83ce35a963035b3a2c0d6a198a4218e7472b18d74 SHA512 65962322b6dcb15da6c119d47c382052d1183772c855b8e8fcdd108b54e730e2374d93741737f3b51e57288a0e8842a6a7f79dce4377ea3630293e6c3e7e8b73 diff --git a/dev-embedded/arduino/arduino-1.8.13.ebuild b/dev-embedded/arduino/arduino-1.8.13.ebuild deleted file mode 100644 index 21bfa76063be..000000000000 --- a/dev-embedded/arduino/arduino-1.8.13.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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_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 -> ${PN}-${docname}.zip" -done - -AVR_VERSION="1.8.3" -PLUGIN_VERSION="0.10.10" - -SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz - https://downloads.arduino.cc/cores/avr-${AVR_VERSION}.tar.bz2 -> ${PN}-avr-${AVR_VERSION}.tar.bz2 - https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v${PLUGIN_VERSION}/WiFi101-Updater-ArduinoIDE-Plugin-${PLUGIN_VERSION}.zip -> ${PN}-WiFi101-Updater-ArduinoIDE-Plugin-${PLUGIN_VERSION}.zip - doc? ( - ${ARDUINO_DOCS_URI} - )" - -LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -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} - app-arch/unzip - >=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=" -Dlight_bundle=1 -Dlocal_sources=1 -Dno_arduino_builder=1 -Dversion=${PV}" - -RESTRICT="strip" -QA_PREBUILT="usr/share/arduino/hardware/arduino/avr/firmwares/*" - -S="${WORKDIR}/Arduino-${PV}" - -PATCHES=( - # We need to load system astyle/listserialportsc instead of bundled ones. - "${FILESDIR}/${PN}-1.8.5-lib-loading.patch" -) - -src_unpack() { - # We don't want to unpack tools, just move zip files into the work dir - local a=( ${A} ) - unpack "${a[0]}" - - cp "${DISTDIR}/${PN}-avr-${AVR_VERSION}.tar.bz2" "${S}/build/avr-${AVR_VERSION}.tar.bz2" || die - cp "${DISTDIR}/${PN}-WiFi101-Updater-ArduinoIDE-Plugin-${PLUGIN_VERSION}.zip" "${S}/build/shared/WiFi101-Updater-ArduinoIDE-Plugin-${PLUGIN_VERSION}.zip" || die - - if use doc; then - local docname - for docname in "${ARDUINO_DOCS[@]}"; do - cp "${DISTDIR}/${PN}-${docname}.zip" "${S}/build/shared/${docname}.zip" || die - done - fi -} - -src_prepare() { - default - - # Unbundle libastyle - sed -i 's/\(target name="linux-libastyle-[a-zA-Z0-9]*"\)/\1 if="never"/g' "$S/build/build.xml" || die - - # Unbundle avr toolchain - sed -i 's/target name="avr-toolchain-bundle" unless="light_bundle"/target name="avr-toolchain-bundle" if="never"/' "$S/build/build.xml" || die - - # Install avr hardware - sed -i 's/target name="assemble-hardware" unless="light_bundle"/target name="assemble-hardware"/' "$S/build/build.xml" || die -} - -src_compile() { - use doc || EANT_EXTRA_ARGS+=" -Dno_docs=1" - java-pkg-2_src_compile -} - -src_install() { - cd "${S}"/build/linux/work || die - - # We need to replace relative paths for toolchain executable by paths to system ones. - sed -i -e 's@^compiler.path=.*@compiler.path=/usr/bin/@' -e 's@^tools.avrdude.path=.*@tools.avrdude.path=/usr@' \ - -e 's@^tools.avrdude.config.path=.*@tools.avrdude.config.path=/etc/avrdude.conf@' hardware/arduino/avr/platform.txt || die - - java-pkg_dojar lib/*.jar - java-pkg_dolauncher ${PN} \ - --pwd "/usr/share/${PN}" \ - --main "processing.app.Base" \ - --java_args "-DAPP_DIR=/usr/share/${PN} -Djava.library.path=${EPREFIX}/usr/$(get_libdir)" - - insinto "/usr/share/${PN}" - - doins -r examples hardware lib 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 "../../arduino-builder/platform.txt" "/usr/share/${PN}/hardware/platform.txt" - dosym "../../arduino-builder/platform.keys.rewrite.txt" "/usr/share/${PN}/hardware/platform.keys.rewrite.txt" - dosym "../../bin/arduino-builder" "/usr/share/${PN}/arduino-builder" - - # hardware/tools/avr needs to exist or arduino-builder will - # complain about missing required -tools arg - dodir "/usr/share/${PN}/hardware/tools/avr" - - if use doc; then - HTML_DOCS=( reference ) - einstalldocs - - # arduino expects its doc in its "main" directory. symlink it. - dosym "../doc/${PF}/html/reference" "/usr/share/${PN}/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.7.ebuild b/dev-embedded/arduino/arduino-1.8.7.ebuild deleted file mode 100644 index 03635acd39ef..000000000000 --- a/dev-embedded/arduino/arduino-1.8.7.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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_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 -> ${PN}-${docname}.zip" -done - -SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz - https://downloads.arduino.cc/cores/avr-1.6.23.tar.bz2 -> ${PN}-avr-1.6.23.tar.bz2 - https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.2/WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip -> ${PN}-WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip - doc? ( - ${ARDUINO_DOCS_URI} - )" - -LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="amd64 x86" -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} - app-arch/unzip - >=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=" -Dlight_bundle=1 -Dlocal_sources=1 -Dno_arduino_builder=1" - -RESTRICT="strip" -QA_PREBUILT="usr/share/arduino/hardware/arduino/avr/firmwares/*" - -S="${WORKDIR}/Arduino-${PV}" - -PATCHES=( - # We need to load system astyle/listserialportsc instead of bundled ones. - "${FILESDIR}/${PN}-1.8.5-lib-loading.patch" -) - -src_unpack() { - # We don't want to unpack tools, just move zip files into the work dir - unpack `echo ${A} | cut -d ' ' -f1` - - cp "${DISTDIR}/${PN}-avr-1.6.23.tar.bz2" "${S}/build/avr-1.6.23.tar.bz2" || die - cp "${DISTDIR}/${PN}-WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip" "${S}/build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip"|| die - - if use doc; then - local docname - for docname in "${ARDUINO_DOCS[@]}"; do - cp "${DISTDIR}/${PN}-${docname}.zip" "${S}/build/shared/${docname}.zip" || die - done - fi -} - -src_prepare() { - default - - # Unbundle libastyle - sed -i 's/\(target name="linux-libastyle-[a-zA-Z0-9]*"\)/\1 if="never"/g' "$S/build/build.xml" || die - - # Unbundle avr toolchain - sed -i 's/target name="avr-toolchain-bundle" unless="light_bundle"/target name="avr-toolchain-bundle" if="never"/' "$S/build/build.xml" || die - - # Install avr hardware - sed -i 's/target name="assemble-hardware" unless="light_bundle"/target name="assemble-hardware"/' "$S/build/build.xml" || die -} - -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 - - # We need to replace relative paths for toolchain executable by paths to system ones. - sed -i -e 's@^compiler.path=.*@compiler.path=/usr/bin/@' -e 's@^tools.avrdude.path=.*@tools.avrdude.path=/usr@' \ - -e 's@^tools.avrdude.config.path=.*@tools.avrdude.config.path=/etc/avrdude.conf@' hardware/arduino/avr/platform.txt || die - - java-pkg_dojar lib/*.jar - java-pkg_dolauncher ${PN} \ - --pwd "/usr/share/${PN}" \ - --main "processing.app.Base" \ - --java_args "-DAPP_DIR=/usr/share/${PN} -Djava.library.path=${EPREFIX}/usr/$(get_libdir)" - - insinto "/usr/share/${PN}" - - doins -r examples hardware lib 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 "../../arduino-builder/platform.txt" "/usr/share/${PN}/hardware/platform.txt" - dosym "../../arduino-builder/platform.keys.rewrite.txt" "/usr/share/${PN}/hardware/platform.keys.rewrite.txt" - dosym "../../bin/arduino-builder" "/usr/share/${PN}/arduino-builder" - - # hardware/tools/avr needs to exist or arduino-builder will - # complain about missing required -tools arg - dodir "/usr/share/${PN}/hardware/tools/avr" - - if use doc; then - HTML_DOCS=( reference ) - einstalldocs - - # arduino expects its doc in its "main" directory. symlink it. - dosym "../doc/${PF}/html/reference" "/usr/share/${PN}/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" -}
