diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index 7bf3a55..2cead55 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -1,4 +1,6 @@
-AUX arduino-1.6.6-script.patch 660 SHA256 f80ffc3cf2f2a333862b5a1826c747aa92efbf8e90c92cb339d31cd5b27b07b2 SHA512 bbdae2bd2adcb461962308ef9ed6c86005fb2ae214bb9fb755554b440a87063562a79da9492308c6e614b771c4d9c3721e369dbb1df63534d5238a2b151ddb00 WHIRLPOOL 31b5319dc111e50f925e9dc3bd2819317e2f7d2b02cd451f9b41fddb855655d4589c106bffbb832c9ce7fc5f0dbebd2f62aa06ba37131135fcdc2c2767e072de
-DIST arduino-1.6.6.tar.gz 76746610 SHA256 5feda6d10d430498bea4a13b1d0e2106018e2fe175be657b451428d9e3547d8f SHA512 9532d5d4b52457baa6a89233662e4d647352f49875ecab3abb059222583229c34b80994eb3445eb93145cf126222f473bb6583bd023637f64585caf17f00dfd2 WHIRLPOOL f6a21e7e1390f5d8de8d4f343e01e6e21b505f49b0836035e78bbf1221402e5a5068c618ca437d6e319e91283a1eea39c22b55431ef52ceeca0df6661b56dccc
+AUX arduino-1.6.7-Do-Not-ThinkDifferent.patch 832 SHA256 f3be70a62f24a91ba5de4350772fe365983b23c1ff12dc4add555954d499b997 SHA512 cfcb1a7fb9ea89fb48b0795a64c80e22962a8db3417ab51aaef140e76d7d2d27f311ab9463d530e190e06b0ad4412460af71a263dd93115cb2cb89c21ba8107c WHIRLPOOL da06bde9ef309fb0a55ef0c94a1427410ce0aea875ee577fc00f9171905dffe6748bd1777639408f4e10e6d1f1fbc8beaf753379e8ad6ae64f4eb7d099585531
+AUX arduino-1.6.7-build.xml.patch 27270 SHA256 143a1a1698280378166d00a69e21ca2d8d31b294ce15ed3f4ce9593c20db0227 SHA512 7bca2efb434a41d0f6f4594bb11f940584896dcd647eff5f621358a679402ff07673c7b7c8fb38dfdc53c724bc3add674af934680a814aff1053c296ab1e4182 WHIRLPOOL abcad8468201020cb6c2244fdacd2f11c8d77849974970b41b99bf404151fc588fa4ecdc2f4e5a084e238860b6905d40250197c250f81e8f02e72dc16cb79f23
+AUX arduino-1.6.7-script.patch 580 SHA256 553335d62134c9ca66e7b9f0b9496f187c76a3223438f2659e29d51cdd55776d SHA512 65b2868a18201f738a64377d965601dda77cee9713720e1d91de4378038083669370e3353b82f48f41c27d0ff65a859a8acc9b15bb20ba55bb7685daa98db173 WHIRLPOOL 2b9de5c030c05f48a52fd67f54d2ae1a25b1f95b1e02a69a172fe286d9b1c6912a652954b3e6d35b1c0cf252ba2ccaffa86e844e9f8075323ef1e413a0a988af
+DIST arduino-1.6.7.tar.gz 77578555 SHA256 ae524c19c3b6fcd00cbf709e693321a13e694316fea5642a54b02d4170213586 SHA512 2f76aedad6f8bb9c3e17c4b02ecf816f5fe628b4856a6bd9a3d7c0fe3d9999a39df60a4794d99b1e62c3ae41695350f27d148a0925f7f59b8071359d33be2b00 WHIRLPOOL c5bdf2a67ff37fc8bc4a002ea24f003d97f6ae04632d906fc4d37d2af64c113f698e26720c73b40afc39925f03206a41a4ec0faba0d80756427714102ad47f90
DIST arduino-icons.tar.bz2 58775 SHA256 9086ae27a13cc19e428ed7e6434366752b33a7d066b5620bfdd371709277390e SHA512 b750e79d6117f5df619f2b765dad6e64f0ba4aa3314b0b6e00801577e3ea1f15951ba15efe7a00f5317285a19ac29ac41c78b71342f45cd164c794a42bafcdd9 WHIRLPOOL b53ab3ff2981ca9f6d45311b9f885ca831700a7a49fef4a376cdc489f7cc3a6c39fbb93994b962b6854b0833d7342b951b5c6327422aafce762f92952b7a5876
-EBUILD arduino-1.6.6.ebuild 2482 SHA256 65bcf71185b0791df775e18ea33c742e73fbb2a012a7ea3817c68303413d26eb SHA512 230860accb8604ff5594c44943e09498acaa87352326e12cf3e163366aa173af27896ed9d4e34ad870c172369f6a43ccacdd07117877aecf4085115d4191ca18 WHIRLPOOL d68b3cfe8c81fd00502f08cb2e8bc74f71ba6fb5a1d54d9583ea3e80e38cffc73b3bcbb4ff3ced9fdbd99b7cca74fec9dd995f5ebfc817532bdce731bfd3dce7
+EBUILD arduino-1.6.7.ebuild 3617 SHA256 c078fd90e9d0eed48b0757dc1df7a1d078feef5abfcde907bd42317d1f146d9e SHA512 6f193f84325863969546350d6c10378aeaade1eb6f5207e824c9546ae500da3e93b003d52ef752a8c8e25371ba8838cc32659df0c9ef879a8956762dc24fa9eb WHIRLPOOL d67cc32dea2c31f3ed1dc130ea8a3e1c6d006d40e069c4efa00fdea46c40a00d92ab6c0b5205a03a5386ab6452cf040e03bc2e23dec0dfae302b2aeefd34b0ad
diff --git a/dev-embedded/arduino/arduino-1.6.6.ebuild b/dev-embedded/arduino/arduino-1.6.6.ebuild
deleted file mode 100644
index 2f50a10..0000000
--- a/dev-embedded/arduino/arduino-1.6.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc examples"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_P="Arduino"
-DESCRIPTION="An open-source AVR electronics prototyping platform"
-HOMEPAGE="http://arduino.cc/ https://arduino.googlecode.com/"
-SRC_URI="https://github.com/arduino/${MY_P}/archive/${PV}.tar.gz -> ${P}.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
-sys-devel/crossdev
->=virtual/jre-1.8"
-
-DEPEND="${COMMONDEP}
->=virtual/jdk-1.8"
-
-S="${WORKDIR}/${MY_P}-${PV}"
-EANT_GENTOO_CLASSPATH="jna,rxtx-2"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_BUILD_TARGET="build"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-java_prepare() {
- # Patch launcher script to include rxtx class/ld paths
- epatch "${FILESDIR}/${P}-script.patch"
-}
-
-src_compile() {
- eant -f arduino-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/*.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.md
- dohtml -r reference
- fi
-
- insinto "/usr/share/${PN}/"
- doins -r hardware libraries tools tools-builder dist
- fowners -R root:uucp "/usr/share/${PN}/hardware"
-
- insinto "/usr/share/${PN}/lib"
- doins -r lib/*.txt lib/theme lib/*.png lib/*.bmp lib/*.key lib/*.so lib/*.ico lib/*.conf
-
- # 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
- sed -e 's/Exec=FULL_PATH\/arduino/Exec=arduino/g' -i arduino.desktop
- sed -e 's/Icon=FULL_PATH\/lib\/arduino.png/Icon=arduino/g' -i arduino.desktop
- sed -e 's/x-arduino/x-arduino;/g' -i arduino.desktop
- domenu "${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.6.7.ebuild b/dev-embedded/arduino/arduino-1.6.7.ebuild
new file mode 100644
index 0000000..e47409d
--- /dev/null
+++ b/dev-embedded/arduino/arduino-1.6.7.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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/ https://github.com/arduino/Arduino"
+SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.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
+dev-util/astyle"
+
+RDEPEND="${COMMONDEP}
+dev-embedded/avrdude
+dev-embedded/uisp
+sys-devel/crossdev
+>=virtual/jre-1.8"
+
+DEPEND="${COMMONDEP}
+>=virtual/jdk-1.8"
+
+EANT_GENTOO_CLASSPATH="jna,rxtx-2"
+EANT_EXTRA_ARGS="-Dversion=${PV}"
+EANT_BUILD_TARGET="build"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_unpack() {
+ unpack ${A}
+ # cd ../"${S}"
+ mv Arduino-${PV} arduino-${PV}
+
+}
+
+java_prepare() {
+ # Remove the libraries to ensure the system
+ # libraries are used
+ # 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}"/${P}-build.xml.patch
+
+ # Patch launcher script to include rxtx class/ld paths
+ epatch "${FILESDIR}"/${P}-script.patch
+
+ # Some OS X ThinkDifferent stuff from processing library
+ epatch "${FILESDIR}"/${P}-Do-Not-ThinkDifferent.patch
+}
+
+src_compile() {
+ eant -f arduino-core/build.xml
+ EANT_GENTOO_CLASSPATH_EXTRA="../arduino-core/arduino-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/arduino-core.jar lib/pde.jar
+ java-pkg_dojar lib/*.jar
+ java-pkg_dolauncher ${PN} --pwd /usr/share/${PN} --main processing.app.Base
+
+ # This doesn't seem to be optional, it just hangs when starting without
+ # examples in correct place
+ #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 dist examples hardware libraries
+ fowners -R root:uucp "/usr/share/${PN}/hardware"
+
+ exeinto "/usr/share/${PN}/"
+ doexe arduino-builder
+
+ insinto "/usr/share/${PN}/lib"
+ doins -r lib/*.txt lib/theme lib/*.png lib/*.conf lib/*.key
+
+ # For TeensyDuino
+ dosym /usr/bin/arduino "/usr/share/${PN}/arduino"
+
+ # use system avrdude
+ # patching class files is too hard
+ dosym /usr/bin/avrdude "/usr/share/${PN}/hardware/tools/avrdude"
+ dodir "/usr/share/${PN}/hardware/tools/avr/etc/"
+ dosym /etc/avrdude.conf "/usr/share/${PN}/hardware/tools/avr/etc/avrdude.conf"
+
+ dosym /usr/lib64/libastyle.so "/usr/share/${PN}/lib/libastylej.so"
+ dodir "/usr/share/${PN}/hardware/tools/avr/bin/"
+ dosym /usr/bin/avr-g++ "/usr/share/${PN}/hardware/tools/avr/bin/avr-g++"
+ dosym /usr/bin/avr-gcc "/usr/share/${PN}/hardware/tools/avr/bin/avr-gcc"
+ dosym /usr/bin/avr-ar "/usr/share/${PN}/hardware/tools/avr/bin/avr-ar"
+ dosym /usr/bin/avr-objcopy "/usr/share/${PN}/hardware/tools/avr/bin/avr-objcopy"
+ dosym /usr/bin/avr-size "/usr/share/${PN}/hardware/tools/avr/bin/avr-size"
+
+ # 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.6.7-Do-Not-ThinkDifferent.patch b/dev-embedded/arduino/files/arduino-1.6.7-Do-Not-ThinkDifferent.patch
new file mode 100644
index 0000000..8a7a92f
--- /dev/null
+++ b/dev-embedded/arduino/files/arduino-1.6.7-Do-Not-ThinkDifferent.patch
@@ -0,0 +1,22 @@
+diff -uNr a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
+--- a/app/src/processing/app/Base.java 2015-11-07 16:00:54.614383789 +0100
++++ b/app/src/processing/app/Base.java 2015-11-07 16:01:09.486384112 +0100
+@@ -49,7 +49,6 @@
+ import processing.app.helpers.filefilters.OnlyFilesWithExtension;
+ import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
+ import processing.app.legacy.PApplet;
+-import processing.app.macosx.ThinkDifferent;
+ import processing.app.packages.LibraryList;
+ import processing.app.packages.UserLibrary;
+ import processing.app.syntax.PdeKeywords;
+@@ -129,10 +128,6 @@
+
+ splashScreenHelper.splashText(_("Loading configuration..."));
+
+- if (OSUtils.isMacOS()) {
+- ThinkDifferent.init();
+- }
+-
+ try {
+ guardedMain(args);
+ } catch (Throwable e) {
diff --git a/dev-embedded/arduino/files/arduino-1.6.7-build.xml.patch b/dev-embedded/arduino/files/arduino-1.6.7-build.xml.patch
new file mode 100644
index 0000000..95a28ab
--- /dev/null
+++ b/dev-embedded/arduino/files/arduino-1.6.7-build.xml.patch
@@ -0,0 +1,590 @@
+diff -urN arduino-1.6.7.orig/build/build.xml arduino-1.6.7/build/build.xml
+--- arduino-1.6.7.orig/build/build.xml 2015-12-17 15:36:35.000000000 +0100
++++ arduino-1.6.7/build/build.xml 2016-01-15 14:26:19.661246847 +0100
+@@ -8,35 +8,18 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
++
+
+
+
+-
+-
+
+
+
+
+
+-
+-
+
+
+
+-
+-
+
+
+
+@@ -47,7 +30,6 @@
+
+
+
+-
+
+
+
+@@ -268,249 +250,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+- =======================================================
+- Arduino for Mac OS X can only be built on Mac OS X.
+-
+- Bye.
+- =======================================================
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+- =======================================================
+- Arduino for Mac OS X built and signed.
+-
+- macosx/arduino-${full-version}-signed.zip
+- =======================================================
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+- =======================================================
+- Arduino for Mac OS X was built. Grab the image from
+-
+- macosx/arduino-${full-version}.zip
+- =======================================================
+-
+-
+-
+-
+
+
+
+@@ -608,14 +347,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+
+
+
+@@ -640,14 +371,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+
+
+
+@@ -760,197 +483,6 @@
+ description="Build .tar.xz of linux version" />
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+- =======================================================
+- Arduino for Windows can only be built on windows.
+-
+- Bye.
+- =======================================================
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+- =======================================================
+- Arduino for Windows was built. Grab the archive from
+-
+- windows/arduino-${full-version}.zip
+- =======================================================
+-
+-
+-
+-
+-
+
+
+
+@@ -965,8 +497,6 @@
+ prefix="arduino-${version}"
+ excludes="**/*.tgz,
+ **/*.bz2,
+- **/build/macosx/,
+- **/build/windows/,
+ **/work/,
+ **/.git/,
+ **/*.class"
+@@ -988,35 +518,7 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
++ depends="linux-clean, subprojects-clean">
+
+
+
+@@ -1035,17 +537,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+ ${BUILD_DATE}
+
diff --git a/dev-embedded/arduino/files/arduino-1.6.6-script.patch b/dev-embedded/arduino/files/arduino-1.6.7-script.patch
similarity index 56%
rename from dev-embedded/arduino/files/arduino-1.6.6-script.patch
rename to dev-embedded/arduino/files/arduino-1.6.7-script.patch
index 1d7c933..98a31be 100644
--- a/dev-embedded/arduino/files/arduino-1.6.6-script.patch
+++ b/dev-embedded/arduino/files/arduino-1.6.7-script.patch
@@ -1,14 +1,13 @@
-diff -Naurp a/build/linux/dist/arduino b/build/linux/dist/arduino
---- a/build/linux/dist/arduino 2015-12-10 02:45:00.010340806 +0100
-+++ b/build/linux/dist/arduino 2015-12-10 02:48:13.155420642 +0100
-@@ -8,11 +8,12 @@ for LIB in \
+diff -uNr a/build/linux/dist/arduino b/build/linux/dist/arduino
+--- a/build/linux/dist/arduino 2015-11-07 16:21:27.391410539 +0100
++++ b/build/linux/dist/arduino 2015-11-07 16:22:19.534411671 +0100
+@@ -8,11 +8,11 @@
"$APPDIR"/lib/*.jar \
;
do
- CLASSPATH="${CLASSPATH}:${LIB}"
+ CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}"
done
-+CLASSPATH="${CLASSPATH+$CLASSPATH:}:$(java-config -dp rxtx-2)"
export CLASSPATH
-LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
@@ -16,4 +15,3 @@ diff -Naurp a/build/linux/dist/arduino b/build/linux/dist/arduino
export LD_LIBRARY_PATH
export PATH="${APPDIR}/java/bin:${PATH}"
-