summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2015-04-16 23:04:19 +0000
committerJames Le Cuirot <chewi@gentoo.org>2015-04-16 23:04:19 +0000
commiteb224eae1ebc4b8bb7c13fddd29dd0f378c747fd (patch)
treeccc2a9b6d0a219bc03e21861e937b942ad9a75b1 /dev-embedded
parentFix building against Linux 4. Not sure if he wrote it but thanks to (diff)
downloadgentoo-2-eb224eae1ebc4b8bb7c13fddd29dd0f378c747fd.tar.gz
gentoo-2-eb224eae1ebc4b8bb7c13fddd29dd0f378c747fd.tar.bz2
gentoo-2-eb224eae1ebc4b8bb7c13fddd29dd0f378c747fd.zip
Fix slotting of Java dependencies, straight to stable to avoid
immediate breakage. Also remove older unstable version. (Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 9C6D7DE4)
Diffstat (limited to 'dev-embedded')
-rw-r--r--dev-embedded/arduino/ChangeLog11
-rw-r--r--dev-embedded/arduino/arduino-1.0.4.ebuild99
-rw-r--r--dev-embedded/arduino/arduino-1.0.5-r1.ebuild (renamed from dev-embedded/arduino/arduino-1.0.5.ebuild)8
3 files changed, 13 insertions, 105 deletions
diff --git a/dev-embedded/arduino/ChangeLog b/dev-embedded/arduino/ChangeLog
index 7c19e9df3f3e..2589d204eb0f 100644
--- a/dev-embedded/arduino/ChangeLog
+++ b/dev-embedded/arduino/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-embedded/arduino
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/ChangeLog,v 1.19 2013/08/18 13:27:35 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/ChangeLog,v 1.20 2015/04/16 23:04:19 chewi Exp $
+
+*arduino-1.0.5-r1 (16 Apr 2015)
+
+ 16 Apr 2015; James Le Cuirot <chewi@gentoo.org> +arduino-1.0.5-r1.ebuild,
+ -arduino-1.0.4.ebuild, -arduino-1.0.5.ebuild:
+ Fix slotting of Java dependencies, straight to stable to avoid immediate
+ breakage. Also remove older unstable version.
18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> arduino-1.0.5.ebuild:
Stable for x86, wrt bug #477092
diff --git a/dev-embedded/arduino/arduino-1.0.4.ebuild b/dev-embedded/arduino/arduino-1.0.4.ebuild
deleted file mode 100644
index afe440d4b029..000000000000
--- a/dev-embedded/arduino/arduino-1.0.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/arduino-1.0.4.ebuild,v 1.1 2013/04/03 20:18:11 miknix Exp $
-
-EAPI=4
-JAVA_PKG_IUSE="doc examples"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="An open-source AVR electronics prototyping platform"
-HOMEPAGE="http://arduino.cc/ http://arduino.googlecode.com/"
-SRC_URI="http://${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="~x86 ~amd64"
-RESTRICT="strip binchecks"
-IUSE=""
-
-COMMONDEP="
-dev-java/jna
->dev-java/rxtx-2.1"
-
-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/${P}/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.ebuild b/dev-embedded/arduino/arduino-1.0.5-r1.ebuild
index cf7865b675f0..47ed44ff45fa 100644
--- a/dev-embedded/arduino/arduino-1.0.5.ebuild
+++ b/dev-embedded/arduino/arduino-1.0.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/arduino-1.0.5.ebuild,v 1.3 2013/08/18 13:27:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/arduino/arduino-1.0.5-r1.ebuild,v 1.1 2015/04/16 23:04:19 chewi Exp $
EAPI=4
JAVA_PKG_IUSE="doc examples"
@@ -18,8 +18,8 @@ RESTRICT="strip binchecks"
IUSE=""
COMMONDEP="
-dev-java/jna
->dev-java/rxtx-2.1"
+dev-java/jna:0
+>dev-java/rxtx-2.1:2"
RDEPEND="${COMMONDEP}
dev-embedded/avrdude