chewi       15/04/16 23:04:19

  Modified:             ChangeLog
  Added:                arduino-1.0.5-r1.ebuild
  Removed:              arduino-1.0.5.ebuild arduino-1.0.4.ebuild
  Log:
  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)

Revision  Changes    Path
1.20                 dev-embedded/arduino/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/arduino/ChangeLog?rev=1.20&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/arduino/ChangeLog?rev=1.20&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/arduino/ChangeLog?r1=1.19&r2=1.20

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/arduino/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog   18 Aug 2013 13:27:35 -0000      1.19
+++ ChangeLog   16 Apr 2015 23:04:19 -0000      1.20
@@ -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 <[email protected]> +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 <[email protected]> arduino-1.0.5.ebuild:
   Stable for x86, wrt bug #477092



1.1                  dev-embedded/arduino/arduino-1.0.5-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/arduino/arduino-1.0.5-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/arduino/arduino-1.0.5-r1.ebuild?rev=1.1&content-type=text/plain

Index: arduino-1.0.5-r1.ebuild
===================================================================
# 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-r1.ebuild,v 1.1 
2015/04/16 23:04:19 chewi 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="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/${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"
}




Reply via email to