Merge branch 'master' of ssh://git.brancik.cz/gentoo-overlay

49 files changed, 617 insertions, 94 deletions

diff --git a/Documentation/README.indilib-drivers b/Documentation/README.indilib-drivers
index da0820f..2d0485d 100644
--- a/Documentation/README.indilib-drivers
+++ b/Documentation/README.indilib-drivers
@@ -43,6 +43,7 @@ sudo emerge -v @indilib-drivers-live if you want bleeding edge drivers straight
 Available USE flags (Note that only 3rd party drivers are present. All other drivers are installed by sci-libs/indilib itself):
   - aagcloudwatcher
   - apogee
+  - armadillo-platypus
   - asi
   - dsi
   - duino
@@ -53,6 +54,7 @@ Available USE flags (Note that only 3rd party drivers are present. All other dri
   - gige
   - gphoto2
   - gpsd
+  - gpsnmea
   - inovaplx
   - maxdomeii
   - mgen
@@ -60,6 +62,7 @@ Available USE flags (Note that only 3rd party drivers are present. All other dri
   - nexstarevo
   - qhy
   - qsi
+  - radiosim
   - rtlsdr
   - sbig
   - shelyak
@@ -92,7 +95,9 @@ I have tested all the drivers and they compile OK at least on amd64 and arm. Whe
 
 Firmware for SBIG cameras (sci-libs/libsbig) won't cross emerge if the host machine belongs to different ARCH.
 
-Firmawre for QHY cameras (sci-libs/libqhy) won't cross emerge for armv7a CHOST, because provided binary is only for armv6, which confuses compiler. It can be emerged on RaspberryPi directly though.
+Firmware for QHY cameras (sci-libs/libqhy) won't cross emerge for armv7a CHOST, because provided binary is only for armv6, which confuses compiler. It can be emerged on RaspberryPi directly 
+
+Driver for GigE does not compile.
 
 9. The overlay also includes ebuilds for sci-astronomy/lin_guider, sci-astronomy/ccd, sci-astronomy/qastrocam-g2 and sci-astronomy/open-phd-guiding (version 1 and 2 directly from git).
 
diff --git a/dev-libs/wiringPi/Manifest b/dev-libs/wiringPi/Manifest
new file mode 100644
index 0000000..06a5a9d
--- /dev/null
+++ b/dev-libs/wiringPi/Manifest
@@ -0,0 +1,2 @@
+DIST wiringPi-2.13.tar.gz 112472 SHA256 f05443ba3db6e439b8819586d39a6289f3a00f58734e1213187f5c30048e6f64 SHA512 c94091c1a393164fdbc83569403142bd2a3f311c00af12d69753b1d775bd0cefaa2018637d016fd0185a2116b41984c213764266578d9aafbdac02087bdcfa62 WHIRLPOOL 7a67eb078c9705f0bbb8124c3bc0c000c69c92d0038c090e017a5538ba1b1edce1f17c2724e48a76c335269599ed82aaebf0ed2c015af2853bfacf8a912568a5
+DIST wiringPi-2.44.tar.gz 159030 SHA256 548ffb87bdf147758503a3aa5a725ef90525134c2ec9d04d3e0ed452c2c5f7ce SHA512 b21bb602ee27232562ae0ce603b5d0537dc5cce5bc803adeba9bdb2b5eaec8df8205fb122c72624d12ead2f64176139c3e7fc17c8429297391911535bd8f159b WHIRLPOOL df5bebf2a743af0328abb7ac0a61efa1767ca0dddacdeeb36512eb0d362b504bf36fb07f3fc7c91f5e1b25647b14afe3a148f5340a246ce5335dec0dac60bb7f
diff --git a/dev-libs/wiringPi/files/2.44-devLib_Makefile.patch b/dev-libs/wiringPi/files/2.44-devLib_Makefile.patch
new file mode 100644
index 0000000..0bf9d91
--- /dev/null
+++ b/dev-libs/wiringPi/files/2.44-devLib_Makefile.patch
@@ -0,0 +1,21 @@
+--- devLib/Makefile	2017-04-18 22:47:02.066600061 +0100
++++ devLib/Makefile	2017-04-18 22:49:34.305024481 +0100
+@@ -37,7 +37,7 @@
+ #DEBUG	= -g -O0
+ DEBUG	= -O2
+ CC	= gcc
+-INCLUDE	= -I.
++INCLUDE	= -I. -I../wiringPi
+ DEFS	= -D_GNU_SOURCE
+ CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
+ 
+@@ -93,8 +93,7 @@
+ 	$Q echo "[Install Dynamic Lib]"
+ 	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+ 	$Q install -m 0755 libwiringPiDev.so.$(VERSION)			$(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)
+-	$Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)	$(DESTDIR)/lib/libwiringPiDev.so
+-	$Q $(LDCONFIG)
++	$Q ln -sf --relative $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)	$(DESTDIR)/lib/libwiringPiDev.so
+ 
+ .PHONY:	install-static
+ install-static:	$(STATIC)
diff --git a/dev-libs/wiringPi/files/2.44-wiringPi_Makefile.patch b/dev-libs/wiringPi/files/2.44-wiringPi_Makefile.patch
new file mode 100644
index 0000000..c41d17e
--- /dev/null
+++ b/dev-libs/wiringPi/files/2.44-wiringPi_Makefile.patch
@@ -0,0 +1,12 @@
+--- wiringPi/Makefile	2017-04-18 22:50:38.951022128 +0100
++++ wiringPi/Makefile	2017-04-18 22:51:19.747265645 +0100
+@@ -104,8 +104,7 @@
+ 	$Q echo "[Install Dynamic Lib]"
+ 	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+ 	$Q install -m 0755 libwiringPi.so.$(VERSION)			$(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)
+-	$Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)	$(DESTDIR)/lib/libwiringPi.so
+-	$Q $(LDCONFIG)
++	$Q ln -sf --relative $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)	$(DESTDIR)/lib/libwiringPi.so
+ 
+ .PHONY:	install-static
+ install-static:	$(STATIC)
diff --git a/dev-libs/wiringPi/files/devLib_Makefile.patch b/dev-libs/wiringPi/files/devLib_Makefile.patch
new file mode 100644
index 0000000..27b5dd5
--- /dev/null
+++ b/dev-libs/wiringPi/files/devLib_Makefile.patch
@@ -0,0 +1,29 @@
+--- devLib/Makefile	2013-08-04 00:53:35.000000000 +0200
++++ devLib/Makefile	2014-05-13 00:53:20.364314712 +0200
+@@ -33,7 +33,7 @@
+ #DEBUG	= -g -O0
+ DEBUG	= -O2
+ CC	= gcc
+-INCLUDE	= -I.
++INCLUDE	= -I. -I../wiringPi
+ CFLAGS	= $(DEBUG) -Wformat=2 -Wall $(INCLUDE) -Winline -pipe -fPIC
+ 
+ LIBS    =
+@@ -94,8 +94,7 @@
+ 	@echo "[Install Dynamic Lib]"
+ 	@install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+ 	@install -m 0755 libwiringPiDev.so.$(VERSION)			$(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)
+-	@ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)	$(DESTDIR)/lib/libwiringPiDev.so
+-	@ldconfig
++	@ln -sf --relative $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)	$(DESTDIR)/lib/libwiringPiDev.so
+ 
+ .PHONEY:	install-static
+ install-static:	$(STATIC) install-headers
+@@ -115,7 +114,6 @@
+ 	@rm -f $(DESTDIR)$(PREFIX)/include/lcd.h
+ 	@rm -f $(DESTDIR)$(PREFIX)/include/piGlow.h
+ 	@rm -f $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.*
+-	@ldconfig
+ 
+ 
+ .PHONEY:	depend
diff --git a/dev-libs/wiringPi/files/wiringPi_Makefile.patch b/dev-libs/wiringPi/files/wiringPi_Makefile.patch
new file mode 100644
index 0000000..38901ab
--- /dev/null
+++ b/dev-libs/wiringPi/files/wiringPi_Makefile.patch
@@ -0,0 +1,20 @@
+--- wiringPi/Makefile	2013-08-04 00:53:35.000000000 +0200
++++ wiringPi/Makefile	2014-05-13 00:31:35.303253358 +0200
+@@ -121,8 +121,7 @@
+ 	@echo "[Install Dynamic Lib]"
+ 	@install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+ 	@install -m 0755 libwiringPi.so.$(VERSION)			$(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)
+-	@ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)	$(DESTDIR)/lib/libwiringPi.so
+-	@ldconfig
++	@ln -sf --relative $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)	$(DESTDIR)/lib/libwiringPi.so
+ 
+ .PHONEY:	install-static
+ install-static:	$(STATIC) install-headers
+@@ -157,7 +156,6 @@
+ 	@rm -f $(DESTDIR)$(PREFIX)/include/pcf8591.h
+ 	@rm -f $(DESTDIR)$(PREFIX)/include/sn3218.h
+ 	@rm -f $(DESTDIR)$(PREFIX)/lib/libwiringPi.*
+-	@ldconfig
+ 
+ 
+ .PHONEY:	depend
diff --git a/dev-libs/wiringPi/wiringPi-2.13.ebuild b/dev-libs/wiringPi/wiringPi-2.13.ebuild
new file mode 100644
index 0000000..628a847
--- /dev/null
+++ b/dev-libs/wiringPi/wiringPi-2.13.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2013 Hacking Networked Solutions
+# Distributed under the terms of the GNU General Public License v3
+# $Header: $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="A 'wiring' like library for the Raspberry Pi"
+HOMEPAGE="http://wiringpi.com/"
+SRC_URI="http://downloads.mad-hacking.net/software/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+MAKEDIRS="wiringPi devLib"
+
+src_prepare() {
+	epatch "${FILESDIR}/wiringPi_Makefile.patch"
+	epatch "${FILESDIR}/devLib_Makefile.patch"
+}
+
+src_compile() {
+	for d in ${MAKEDIRS}; do
+		cd "${WORKDIR}/${P}/${d}"	
+		emake 
+	done
+}
+
+src_install() {
+	for d in ${MAKEDIRS}; do
+		cd "${WORKDIR}/${P}/${d}"	
+		emake DESTDIR="${D}/usr/" PREFIX="" install
+	done
+}
diff --git a/dev-libs/wiringPi/wiringPi-2.44.ebuild b/dev-libs/wiringPi/wiringPi-2.44.ebuild
new file mode 100644
index 0000000..879d082
--- /dev/null
+++ b/dev-libs/wiringPi/wiringPi-2.44.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2013 Hacking Networked Solutions
+# Distributed under the terms of the GNU General Public License v3
+# $Header: $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="A 'wiring' like library for the Raspberry Pi"
+HOMEPAGE="http://wiringpi.com/"
+SRC_URI="http://downloads.mad-hacking.net/software/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+MAKEDIRS="wiringPi devLib"
+
+src_prepare() {
+	epatch "${FILESDIR}/2.44-wiringPi_Makefile.patch"
+	epatch "${FILESDIR}/2.44-devLib_Makefile.patch"
+	
+	for d in ${MAKEDIRS}; do
+            sed -i -e "s:\/lib$:\/$(get_libdir):g" ${WORKDIR}/${P}/${d}/Makefile || die
+            sed -i -e "s:\/lib\/:\/$(get_libdir)/:g" ${WORKDIR}/${P}/${d}/Makefile || die
+        done
+}
+
+src_compile() {
+	for d in ${MAKEDIRS}; do
+		cd "${WORKDIR}/${P}/${d}"	
+		emake 
+	done
+}
+
+src_install() {
+	for d in ${MAKEDIRS}; do
+		cd "${WORKDIR}/${P}/${d}"	
+		emake DESTDIR="${D}/usr/" PREFIX="" install
+	done
+}
diff --git a/licenses/zwo-asi b/licenses/zwo-asi
new file mode 100644
index 0000000..9083b50
--- /dev/null
+++ b/licenses/zwo-asi
@@ -0,0 +1,20 @@
+Copyright (c) 2015, ZWO Company

+All rights reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining a copy

+of this software and associated documentation files (the "Software"), to deal

+in the Software without restriction, including without limitation the rights

+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+copies of the Software, and to permit persons to whom the Software is

+furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+THE SOFTWARE.

diff --git a/media-video/aravis/Manifest b/media-video/aravis/Manifest
new file mode 100644
index 0000000..643e860
--- /dev/null
+++ b/media-video/aravis/Manifest
@@ -0,0 +1 @@
+DIST ARAVIS_0_5_11.tar.gz 2978653 SHA256 051b307e58ee7564cc6be99cbc773f2f7af17be95ac601f441bcded6f316a820 SHA512 a757981c5b7093fbbf56ff09349de1ad65ec9e3041697093bb1af9f801cbc873a3a8fc6d3c5cbfb369a6e9e20557b768289c5c008ca7143e8ea5974fd30952c7 WHIRLPOOL 98393d5aff09001f08b056194e73df7fb24af5d4d3ef943704049705f37bf20861d0566555e1fc7b52c920b0f1508fbd72ed1722730c744d8a8f618b67e91386
diff --git a/media-video/aravis/aravis-0.5.11.ebuild b/media-video/aravis/aravis-0.5.11.ebuild
new file mode 100644
index 0000000..8ea305e
--- /dev/null
+++ b/media-video/aravis/aravis-0.5.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools versionator
+
+KEYWORDS="~amd64 ~x86"
+
+MY_PV="$(replace_all_version_separators '_')"
+
+MY_PN="${PN^^}"
+
+SRC_URI="https://github.com/AravisProject/${PN}/archive/${MY_PN}_${MY_PV}.tar.gz"
+
+DESCRIPTION="Library for video acquisition using Genicam cameras"
+
+HOMEPAGE="https://github.com/AravisProject/aravis"
+
+LICENSE="LGPL-2"
+
+SLOT="0"
+
+IUSE="X gstreamer"
+
+GST_DEPEND="media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10"
+
+RDEPEND=">=dev-libs/glib-2.22
+	dev-libs/libxml2
+	X? (
+		>=x11-libs/gtk+-2.12:2
+		${GST_DEPEND}
+		media-libs/gst-plugins-base:0.10
+		media-plugins/gst-plugins-xvideo:0.10
+	)
+	gstreamer? ( ${GST_DEPEND} )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-libs/gobject-introspection"
+
+S="${WORKDIR}/${PN}-${MY_PN}_${MY_PV}"
+
+src_prepare() {
+	eautoreconf
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 22b75f4..bba007c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -2,8 +2,11 @@
 =sci-libs/indilib-9999
 =sci-libs/indilib-drivers-9999
 =sci-libs/indilib-driver-aagcloudwatcher-9999
+=sci-libs/indilib-driver-amh-9999
 =sci-libs/indilib-driver-apogee-9999
+=sci-libs/indilib-driver-armadillo-platypus-9999
 =sci-libs/indilib-driver-asi-9999
+=sci-libs/indilib-driver-dsi-9999
 =sci-libs/indilib-driver-duino-9999
 =sci-libs/indilib-driver-eqmod-9999
 =sci-libs/indilib-driver-ffmv-9999
@@ -11,11 +14,17 @@
 =sci-libs/indilib-driver-fli-9999
 =sci-libs/indilib-driver-gige-9999
 =sci-libs/indilib-driver-gphoto-9999
+=sci-libs/indilib-driver-gpsd-9999
+=sci-libs/indilib-driver-gpsnmea-9999
+=sci-libs/indilib-driver-inovaplx-9999
 =sci-libs/indilib-driver-maxdomeii-9999
-=sci-libs/indilib-driver-meadedsi-9999
+=sci-libs/indilib-driver-mgen-9999
+=sci-libs/indilib-driver-mi-9999
+=sci-libs/indilib-driver-nexstarevo-9999
 =sci-libs/indilib-driver-qhy-9999
 =sci-libs/indilib-driver-qsi-9999
-=sci-libs/indilib-drivers-9999
+=sci-libs/indilib-drivers-radiosim-9999
+=sci-libs/indilib-drivers-rtlsdr-9999
 =sci-libs/indilib-driver-sbig-9999
 =sci-libs/indilib-driver-shelyak-9999
 =sci-libs/indilib-driver-spectracyber-9999
@@ -23,11 +32,14 @@
 =sci-libs/indilib-driver-sx-9999
 =sci-libs/indilib-driver-tess-9999
 =sci-libs/libapogee-9999
+=sci-libs/libdspau-9999
 =sci-libs/libfishcamp-9999
 =sci-libs/libfli-9999
+=sci-libs/libinova-9999
 =sci-libs/libqhy-9999
 =sci-libs/libqsi-9999
-=sci-libs/sbig-9999
+=sci-libs/libsbig-9999
+=sci-libs/asi-common-9999
 
 # Live ebuild for qastrocam-g2
 =sci-astronomy/qastrocam-g2-9999
diff --git a/sci-libs/asi-common/Manifest b/sci-libs/asi-common/Manifest
new file mode 100644
index 0000000..f415cdc
--- /dev/null
+++ b/sci-libs/asi-common/Manifest
@@ -0,0 +1 @@
+DIST indilib-1.6.2.tar.gz 22059285 SHA256 9c2e79341f98c24be6cd262720558d43865e29db2369b73f56fa3edfa911cd2d SHA512 aa0e77a2bb0f595b7a82dad120259e75dd70184bd982f14e303997f3527ac50181e70dd86bd39466af95e068201fff6f2e8f818762529856cb442cca2d23f870 WHIRLPOOL bd6560a0c8640faf1348927a3889387af40d4acf04358af539708b54597b22468f6d6e9edc3b6e25abddca2cdc500baeeac9421ff1e61eb0fc3d3eaac5610bd3
diff --git a/sci-libs/asi-common/asi-common-1.6.2.ebuild b/sci-libs/asi-common/asi-common-1.6.2.ebuild
new file mode 100644
index 0000000..8431d0f
--- /dev/null
+++ b/sci-libs/asi-common/asi-common-1.6.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="indi"
+
+inherit cmake-utils eutils
+
+DESCRIPTION="Udev rules for ZWO Optics ASI cameras."
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}lib-${PV}.tar.gz"
+
+LICENSE="zwo-asi"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${PN}"
diff --git a/sci-libs/asi-common/asi-common-9999.ebuild b/sci-libs/asi-common/asi-common-9999.ebuild
new file mode 100644
index 0000000..f0322ef
--- /dev/null
+++ b/sci-libs/asi-common/asi-common-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils git-r3 eutils
+
+DESCRIPTION="Udev rules for ZWO Optics ASI cameras."
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="zwo-asi"
+KEYWORDS=""
+
+SLOT="0"
+
+RDEPEND="${DEPEND}"
+
+S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}"
diff --git a/sci-libs/asi-common/metadata.xml b/sci-libs/asi-common/metadata.xml
new file mode 100644
index 0000000..82e0dff
--- /dev/null
+++ b/sci-libs/asi-common/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ctibor@brancik.cz</email>
+    <name>Ctibor Brančík</name>
+  </maintainer>	
+  <longdescription>
+    This package provides udev rules for ZWO Optics ASI cameras. 
+  </longdescription>
+  <upstream>
+        <doc lang="en">http://indilib.org/devices</doc>
+        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <remote-id type="github">indilib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-amh/indilib-driver-amh-9999.ebuild b/sci-libs/indilib-driver-amh/indilib-driver-amh-9999.ebuild
new file mode 100644
index 0000000..18ecebd
--- /dev/null
+++ b/sci-libs/indilib-driver-amh/indilib-driver-amh-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils git-r3 eutils
+
+DESCRIPTION="INDI driver for the Adafruit Motor HAT addon board to Raspberry Pi"
+HOMEPAGE="https://github.com/rkaczorek/astroberry-amh"
+EGIT_REPO_URI="https://github.com/rkaczorek/astroberry-amh"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="GPL-3"
+KEYWORDS=""
+
+SLOT="0"
+
+DEPEND="=sci-libs/indilib-9999
+        dev-libs/wiringPi" #WiringPi is available in hacking-gentoo overlay
+
+RDEPEND="${DEPEND}"
+
+#INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+
+#S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-amh/metadata.xml b/sci-libs/indilib-driver-amh/metadata.xml
new file mode 100644
index 0000000..0a06b5d
--- /dev/null
+++ b/sci-libs/indilib-driver-amh/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ctibor@brancik.cz</email>
+    <name>Ctibor Brančík</name>
+  </maintainer>	
+  <longdescription>
+    Astroberry Motor HAT provides INDI focuser driver for Adafruit Motor HAT addon board to Raspberry Pi
+  </longdescription>
+  <upstream>
+        <maintainer status="active">
+                <email>rkaczorek@gmail.com</email>
+                <name>Robert Kaczorek</name>
+        </maintainer>
+        <doc lang="en">https://github.com/rkaczorek/astroberry-amh/blob/master/README.md</doc>
+        <bugs-to>https://github.com/rkaczorek/astroberry-amh/issues</bugs-to>
+        <remote-id type="github">astroberry-amh</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-armadillo-platypus/Manifest b/sci-libs/indilib-driver-armadillo-platypus/Manifest
new file mode 100644
index 0000000..f415cdc
--- /dev/null
+++ b/sci-libs/indilib-driver-armadillo-platypus/Manifest
@@ -0,0 +1 @@
+DIST indilib-1.6.2.tar.gz 22059285 SHA256 9c2e79341f98c24be6cd262720558d43865e29db2369b73f56fa3edfa911cd2d SHA512 aa0e77a2bb0f595b7a82dad120259e75dd70184bd982f14e303997f3527ac50181e70dd86bd39466af95e068201fff6f2e8f818762529856cb442cca2d23f870 WHIRLPOOL bd6560a0c8640faf1348927a3889387af40d4acf04358af539708b54597b22468f6d6e9edc3b6e25abddca2cdc500baeeac9421ff1e61eb0fc3d3eaac5610bd3
diff --git a/sci-libs/indilib-driver-armadillo-platypus/indilib-driver-armadillo-platypus-1.6.2.ebuild b/sci-libs/indilib-driver-armadillo-platypus/indilib-driver-armadillo-platypus-1.6.2.ebuild
new file mode 100644
index 0000000..8213d31
--- /dev/null
+++ b/sci-libs/indilib-driver-armadillo-platypus/indilib-driver-armadillo-platypus-1.6.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake-utils eutils
+
+DESCRIPTION="INDI driver for Lunatico Astronomia Armadillo & Platypus controllers."
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}lib-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+DEPEND="<sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-armadillo-platypus/indilib-driver-armadillo-platypus-9999.ebuild b/sci-libs/indilib-driver-armadillo-platypus/indilib-driver-armadillo-platypus-9999.ebuild
new file mode 100644
index 0000000..d667b25
--- /dev/null
+++ b/sci-libs/indilib-driver-armadillo-platypus/indilib-driver-armadillo-platypus-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils git-r3 eutils
+
+DESCRIPTION="INDI driver for Lunatico Astronomia Armadillo & Platypus controllers."
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+
+SLOT="0"
+
+DEPEND="=sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-armadillo-platypus/metadata.xml b/sci-libs/indilib-driver-armadillo-platypus/metadata.xml
new file mode 100644
index 0000000..23a29d8
--- /dev/null
+++ b/sci-libs/indilib-driver-armadillo-platypus/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ctibor@brancik.cz</email>
+    <name>Ctibor Brančík</name>
+  </maintainer>	
+  <longdescription>
+    This package provides the INDI driver for Lunatico Astronomia Armadillo & Platypus controllers.
+  </longdescription>
+  <upstream>
+        <doc lang="en">http://indilib.org/devices</doc>
+        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <remote-id type="github">indilib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-asi/indilib-driver-asi-1.6.2.ebuild b/sci-libs/indilib-driver-asi/indilib-driver-asi-1.6.2.ebuild
index b83960e..2061313 100644
--- a/sci-libs/indilib-driver-asi/indilib-driver-asi-1.6.2.ebuild
+++ b/sci-libs/indilib-driver-asi/indilib-driver-asi-1.6.2.ebuild
@@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~x86"
 
 SLOT="0"
 
-DEPEND="<sci-libs/indilib-9999"
+DEPEND="<sci-libs/indilib-9999
+        <sci-libs/asi-common-9999"
 
 RDEPEND="${DEPEND}"
 
diff --git a/sci-libs/indilib-driver-asi/indilib-driver-asi-9999.ebuild b/sci-libs/indilib-driver-asi/indilib-driver-asi-9999.ebuild
index 9383f7b..a0c345f 100644
--- a/sci-libs/indilib-driver-asi/indilib-driver-asi-9999.ebuild
+++ b/sci-libs/indilib-driver-asi/indilib-driver-asi-9999.ebuild
@@ -17,7 +17,8 @@ KEYWORDS=""
 
 SLOT="0"
 
-DEPEND="=sci-libs/indilib-9999"
+DEPEND="=sci-libs/indilib-9999
+        =sci-libs/indilib-9999"
 
 RDEPEND="${DEPEND}"
 
diff --git a/sci-libs/indilib-driver-gpsnmea/Manifest b/sci-libs/indilib-driver-gpsnmea/Manifest
new file mode 100644
index 0000000..f415cdc
--- /dev/null
+++ b/sci-libs/indilib-driver-gpsnmea/Manifest
@@ -0,0 +1 @@
+DIST indilib-1.6.2.tar.gz 22059285 SHA256 9c2e79341f98c24be6cd262720558d43865e29db2369b73f56fa3edfa911cd2d SHA512 aa0e77a2bb0f595b7a82dad120259e75dd70184bd982f14e303997f3527ac50181e70dd86bd39466af95e068201fff6f2e8f818762529856cb442cca2d23f870 WHIRLPOOL bd6560a0c8640faf1348927a3889387af40d4acf04358af539708b54597b22468f6d6e9edc3b6e25abddca2cdc500baeeac9421ff1e61eb0fc3d3eaac5610bd3
diff --git a/sci-libs/indilib-driver-gpsnmea/indilib-driver-gpsnmea-1.6.2.ebuild b/sci-libs/indilib-driver-gpsnmea/indilib-driver-gpsnmea-1.6.2.ebuild
new file mode 100644
index 0000000..620ec27
--- /dev/null
+++ b/sci-libs/indilib-driver-gpsnmea/indilib-driver-gpsnmea-1.6.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake-utils eutils
+
+DESCRIPTION="INDI driver for GPS NMEA data sources."
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}lib-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+DEPEND="<sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-gpsnmea/indilib-driver-gpsnmea-9999.ebuild b/sci-libs/indilib-driver-gpsnmea/indilib-driver-gpsnmea-9999.ebuild
new file mode 100644
index 0000000..0d6c981
--- /dev/null
+++ b/sci-libs/indilib-driver-gpsnmea/indilib-driver-gpsnmea-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils git-r3 eutils
+
+DESCRIPTION="INDI driver for GPS NMEA data sources."
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+
+SLOT="0"
+
+DEPEND="=sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-gpsnmea/metadata.xml b/sci-libs/indilib-driver-gpsnmea/metadata.xml
new file mode 100644
index 0000000..58659ab
--- /dev/null
+++ b/sci-libs/indilib-driver-gpsnmea/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ctibor@brancik.cz</email>
+    <name>Ctibor Brančík</name>
+  </maintainer>	
+  <longdescription>
+    This package provides the INDI driver for GPS NMEA data sources. 
+  </longdescription>
+  <upstream>
+        <doc lang="en">http://indilib.org/devices</doc>
+        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <remote-id type="github">indilib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-radiosim/Manifest b/sci-libs/indilib-driver-radiosim/Manifest
new file mode 100644
index 0000000..f415cdc
--- /dev/null
+++ b/sci-libs/indilib-driver-radiosim/Manifest
@@ -0,0 +1 @@
+DIST indilib-1.6.2.tar.gz 22059285 SHA256 9c2e79341f98c24be6cd262720558d43865e29db2369b73f56fa3edfa911cd2d SHA512 aa0e77a2bb0f595b7a82dad120259e75dd70184bd982f14e303997f3527ac50181e70dd86bd39466af95e068201fff6f2e8f818762529856cb442cca2d23f870 WHIRLPOOL bd6560a0c8640faf1348927a3889387af40d4acf04358af539708b54597b22468f6d6e9edc3b6e25abddca2cdc500baeeac9421ff1e61eb0fc3d3eaac5610bd3
diff --git a/sci-libs/indilib-driver-radiosim/indilib-driver-radiosim-1.6.2.ebuild b/sci-libs/indilib-driver-radiosim/indilib-driver-radiosim-1.6.2.ebuild
new file mode 100644
index 0000000..4bc311e
--- /dev/null
+++ b/sci-libs/indilib-driver-radiosim/indilib-driver-radiosim-1.6.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake-utils eutils
+
+DESCRIPTION="This package provides the INDI driver for a simulated Radio dish antenna."
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}lib-${PV}.tar.gz"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+DEPEND="<sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-radiosim/indilib-driver-radiosim-9999.ebuild b/sci-libs/indilib-driver-radiosim/indilib-driver-radiosim-9999.ebuild
new file mode 100644
index 0000000..a70cb87
--- /dev/null
+++ b/sci-libs/indilib-driver-radiosim/indilib-driver-radiosim-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils git-r3 eutils
+
+DESCRIPTION="This package provides the INDI driver for a simulated Radio dish antenna."
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2"
+KEYWORDS=""
+
+SLOT="0"
+
+DEPEND="=sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-radiosim/metadata.xml b/sci-libs/indilib-driver-radiosim/metadata.xml
new file mode 100644
index 0000000..ecf496e
--- /dev/null
+++ b/sci-libs/indilib-driver-radiosim/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ctibor@brancik.cz</email>
+    <name>Ctibor Brančík</name>
+  </maintainer>	
+  <longdescription>
+    This package provides the INDI driver for a simulated Radio dish antenna.
+  </longdescription>
+  <upstream>
+        <doc lang="en">http://indilib.org/devices</doc>
+        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <remote-id type="github">indilib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-rtlsdr/indilib-driver-rtlsdr-1.6.2.ebuild b/sci-libs/indilib-driver-rtlsdr/indilib-driver-rtlsdr-1.6.2.ebuild
index 2182a8c..0bcce36 100644
--- a/sci-libs/indilib-driver-rtlsdr/indilib-driver-rtlsdr-1.6.2.ebuild
+++ b/sci-libs/indilib-driver-rtlsdr/indilib-driver-rtlsdr-1.6.2.ebuild
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
 DEPEND="<sci-libs/indilib-9999
-		net-wireless/rtl-sdr"
+        net-wireless/rtl-sdr
+        <sci-libs/libdspau-9999"
 
 RDEPEND="${DEPEND}"
 
diff --git a/sci-libs/indilib-driver-rtlsdr/indilib-driver-rtlsdr-9999.ebuild b/sci-libs/indilib-driver-rtlsdr/indilib-driver-rtlsdr-9999.ebuild
index 99f3add..3fe20fd 100644
--- a/sci-libs/indilib-driver-rtlsdr/indilib-driver-rtlsdr-9999.ebuild
+++ b/sci-libs/indilib-driver-rtlsdr/indilib-driver-rtlsdr-9999.ebuild
@@ -16,8 +16,8 @@ KEYWORDS=""
 SLOT="0"
 
 DEPEND="=sci-libs/indilib-9999
-		net-wireless/rtl-sdr
-		=sci-libs/libdspau-9999"
+        net-wireless/rtl-sdr
+	=sci-libs/libdspau-9999"
 
 RDEPEND="${DEPEND}"
 
diff --git a/sci-libs/indilib-drivers/indilib-drivers-1.6.2.ebuild b/sci-libs/indilib-drivers/indilib-drivers-1.6.2.ebuild
index e1e6838..1cbc193 100644
--- a/sci-libs/indilib-drivers/indilib-drivers-1.6.2.ebuild
+++ b/sci-libs/indilib-drivers/indilib-drivers-1.6.2.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE_INDILIB_DRIVERS="
 	aagcloudwatcher
 	apogee
+	armadillo-platypus
 	asi
 	dsi
 	duino
@@ -23,6 +24,7 @@ IUSE_INDILIB_DRIVERS="
 	gige
 	gphoto2
 	gpsd
+	gpsnmea
 	inovaplx
 	maxdomeii
 	mi
@@ -30,6 +32,7 @@ IUSE_INDILIB_DRIVERS="
 	nexstarevo
 	qhy
 	qsi
+        radiosim
 	rtlsdr
 	sbig
 	shelyak
diff --git a/sci-libs/indilib-drivers/indilib-drivers-9999.ebuild b/sci-libs/indilib-drivers/indilib-drivers-9999.ebuild
index 0a6f164..ba112de 100644
--- a/sci-libs/indilib-drivers/indilib-drivers-9999.ebuild
+++ b/sci-libs/indilib-drivers/indilib-drivers-9999.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="-amd64 -x86 -arm"
 IUSE_INDILIB_DRIVERS="
 	aagcloudwatcher
 	apogee
+	armadillo-platypus
 	asi
 	dsi
 	duino
@@ -24,6 +25,7 @@ IUSE_INDILIB_DRIVERS="
 	gige
 	gphoto2
 	gpsd
+	gpsnmea
 	inovaplx
 	maxdomeii
 	mi
@@ -31,6 +33,7 @@ IUSE_INDILIB_DRIVERS="
 	nexstarevo
 	qhy
 	qsi
+        radiosim
 	rtlsdr
 	sbig
 	shelyak
diff --git a/sci-libs/libdspau/Manifest b/sci-libs/libdspau/Manifest
new file mode 100644
index 0000000..f415cdc
--- /dev/null
+++ b/sci-libs/libdspau/Manifest
@@ -0,0 +1 @@
+DIST indilib-1.6.2.tar.gz 22059285 SHA256 9c2e79341f98c24be6cd262720558d43865e29db2369b73f56fa3edfa911cd2d SHA512 aa0e77a2bb0f595b7a82dad120259e75dd70184bd982f14e303997f3527ac50181e70dd86bd39466af95e068201fff6f2e8f818762529856cb442cca2d23f870 WHIRLPOOL bd6560a0c8640faf1348927a3889387af40d4acf04358af539708b54597b22468f6d6e9edc3b6e25abddca2cdc500baeeac9421ff1e61eb0fc3d3eaac5610bd3
diff --git a/sci-libs/libdspau/files/libdspau-1.6.2_fix_cmake_libdir.patch b/sci-libs/libdspau/files/libdspau-1.6.2_fix_cmake_libdir.patch
new file mode 100644
index 0000000..e3233c5
--- /dev/null
+++ b/sci-libs/libdspau/files/libdspau-1.6.2_fix_cmake_libdir.patch
@@ -0,0 +1,9 @@
+diff -urN indi-1.6.2/3rdparty/libdspau/CMakeLists.txt indi-1.6.2.new/3rdparty/libdspau/CMakeLists.txt
+--- indi-1.6.2/3rdparty/libdspau/CMakeLists.txt	2018-01-08 14:45:25.000000000 +0100
++++ indi-1.6.2.new/3rdparty/libdspau/CMakeLists.txt	2018-01-31 19:44:34.890982701 +0100
+@@ -35,4 +35,4 @@
+ #add an install target here
+ INSTALL(FILES libdspau.h DESTINATION include)
+ 
+-INSTALL(TARGETS dspau LIBRARY DESTINATION lib)
++INSTALL(TARGETS dspau LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/sci-libs/libdspau/files/libdspau-9999_fix_cmake_libdir.patch b/sci-libs/libdspau/files/libdspau-9999_fix_cmake_libdir.patch
deleted file mode 100644
index b821e14..0000000
--- a/sci-libs/libdspau/files/libdspau-9999_fix_cmake_libdir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/3rdparty/libdspau/CMakeLists.txt b/3rdparty/libdspau/CMakeLists.txt
-index f994466f..71507e2a 100644
---- a/3rdparty/libdspau/CMakeLists.txt
-+++ b/3rdparty/libdspau/CMakeLists.txt
-@@ -35,4 +35,4 @@ TARGET_LINK_LIBRARIES(dspau ${FFTW3_LIBRARIES} ${M_LIB})
- #add an install target here
- INSTALL(FILES libdspau.h DESTINATION include)
- 
--INSTALL(TARGETS dspau LIBRARY DESTINATION lib)
-+INSTALL(TARGETS dspau LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/sci-libs/libdspau/libdspau-1.6.2.ebuild b/sci-libs/libdspau/libdspau-1.6.2.ebuild
new file mode 100644
index 0000000..af26af3
--- /dev/null
+++ b/sci-libs/libdspau/libdspau-1.6.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils eutils
+
+MY_PN="indi"
+
+DESCRIPTION="A digital signal processing library for astronomy usage"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}lib-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86 ~arm"
+
+SLOT="0"
+
+DEPEND="sci-libs/fftw:3.0"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/libdspau-1.6.2_fix_cmake_libdir.patch" )
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
+
+S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libdspau/libdspau-9999.ebuild b/sci-libs/libdspau/libdspau-9999.ebuild
index 1425058..259d59e 100644
--- a/sci-libs/libdspau/libdspau-9999.ebuild
+++ b/sci-libs/libdspau/libdspau-9999.ebuild
@@ -19,6 +19,4 @@ DEPEND="sci-libs/fftw:3.0"
 
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/libdspau-9999_fix_cmake_libdir.patch" )
-
 S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}"
diff --git a/sci-libs/libinova/files/libinova-9999_fix_cmake_symlinks.patch b/sci-libs/libinova/files/libinova-9999_fix_cmake_symlinks.patch
deleted file mode 100644
index 56511ca..0000000
--- a/sci-libs/libinova/files/libinova-9999_fix_cmake_symlinks.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/3rdparty/libinovasdk/CMakeLists.txt
-+++ b/3rdparty/libinovasdk/CMakeLists.txt
-@@ -27,13 +27,9 @@ IF(UNIX AND NOT WIN32 AND NOT APPLE)
-  ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l")
- ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
- 
--# Make sure symbolic links are installed
--file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_inovasdk_symlink.cmake "
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libinovasdk.so.${INOVASDK_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so.${INOVASDK_SOVERSION})\n
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libinovasdk.so.${INOVASDK_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so)\n
--")
--
- install( FILES ${CMAKE_BINARY_DIR}/libinovasdk.so.${INOVASDK_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX})
- install( FILES inovasdk.h DESTINATION include/inovasdk)
- install( FILES 99-inovaplx.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
--install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_inovasdk_symlink.cmake)
-+# Make sure symbolic links are installed
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libinovasdk.so.${INOVASDK_VERSION}\" \"libinovasdk.so.${INOVASDK_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libinovasdk.so.${INOVASDK_SOVERSION}\" \"libinovasdk.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
diff --git a/sci-libs/libinova/libinova-9999.ebuild b/sci-libs/libinova/libinova-9999.ebuild
index 4fcf7e3..bef0284 100644
--- a/sci-libs/libinova/libinova-9999.ebuild
+++ b/sci-libs/libinova/libinova-9999.ebuild
@@ -15,6 +15,4 @@ KEYWORDS=""
 
 SLOT="0"
 
-PATCHES=( "${FILESDIR}/libinova-9999_fix_cmake_symlinks.patch" )
-
 S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}sdk"
diff --git a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch
deleted file mode 100644
index 3e479d7..0000000
--- a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urN libqhy-9999/3rdparty/libqhy/CMakeLists.txt libqhy-9999.new/3rdparty/libqhy/CMakeLists.txt
---- libqhy-9999/3rdparty/libqhy/CMakeLists.txt	2017-12-27 18:31:01.871867597 +0100
-+++ libqhy-9999.new/3rdparty/libqhy/CMakeLists.txt	2017-12-27 18:32:35.406606201 +0100
-@@ -43,21 +43,16 @@
- 
- install(FILES 85-qhy.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
- install(FILES ${CMAKE_BINARY_DIR}/libqhy.so.${LIBQHY_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX})
--
- # Make sure symbolic links are installed
--file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake "
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libqhy.so.${LIBQHY_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION})\n
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libqhy.so.${LIBQHY_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so)\n
--")
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libqhy.so.${LIBQHY_VERSION}\" \"libqhy.so.${LIBQHY_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libqhy.so.${LIBQHY_SOVERSION}\" \"libqhy.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
- 
- ENDIF (APPLE)
- 
- install(FILES qhyccd.h qhyccdcamdef.h qhyccderr.h qhyccdstruct.h log4z.h qhycam.h DESTINATION include/libqhy)
- 
--install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake)
- install(
-    CODE "
-    file(GLOB QHY_FIRMWARE ${CMAKE_CURRENT_SOURCE_DIR}/firmware/*) \n
-    file(INSTALL DESTINATION ${FIRMWARE_INSTALL_DIR} TYPE FILE FILES \${QHY_FIRMWARE})"
-  )
--
diff --git a/sci-libs/libqhy/libqhy-9999.ebuild b/sci-libs/libqhy/libqhy-9999.ebuild
index fba661f..29799d8 100644
--- a/sci-libs/libqhy/libqhy-9999.ebuild
+++ b/sci-libs/libqhy/libqhy-9999.ebuild
@@ -18,8 +18,6 @@ KEYWORDS=""
 
 SLOT="0"
 
-PATCHES=( "${FILESDIR}/libqhy-9999_fix_cmake_symlinks.patch" )
-
 DEPEND="virtual/libusb:1
 	media-libs/opencv"
 
diff --git a/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch b/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch
deleted file mode 100644
index 669b371..0000000
--- a/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN libsbig-9999/3rdparty/libsbig/CMakeLists.txt libsbig-9999.new/3rdparty/libsbig/CMakeLists.txt
---- libsbig-9999/3rdparty/libsbig/CMakeLists.txt	2017-12-27 18:34:47.394240953 +0100
-+++ libsbig-9999.new/3rdparty/libsbig/CMakeLists.txt	2017-12-27 18:36:05.916025476 +0100
-@@ -27,14 +27,10 @@
-  ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l")
- ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
- 
--# Make sure symbolic links are installed
--file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake "
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libsbigudrv.so.${SBIG_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION})\n
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libsbigudrv.so.${SBIG_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so)\n
--")
--
- install( FILES ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX})
- install( FILES sbigudrv.h DESTINATION include/libsbig)
- install( FILES sbigucam.hex sbiglcam.hex sbigfcam.hex sbigpcam.hex stfga.bin DESTINATION ${FIRMWARE_INSTALL_DIR})
- install( FILES 51-sbig-debian.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
--install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake)
-+# Make sure symbolic links are installed
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_VERSION}\" \"libsbigudrv.so.${SBIG_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_SOVERSION}\" \"libsbigudrv.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
diff --git a/sci-libs/libsbig/libsbig-9999.ebuild b/sci-libs/libsbig/libsbig-9999.ebuild
index 7e89426..99bbb26 100644
--- a/sci-libs/libsbig/libsbig-9999.ebuild
+++ b/sci-libs/libsbig/libsbig-9999.ebuild
@@ -20,6 +20,4 @@ KEYWORDS=""
 
 SLOT="0"
 
-PATCHES=( "${FILESDIR}/libsbig-9999_fix_cmake_symlinks.patch" )
-
 S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}"
diff --git a/sets/indilib-drivers b/sets/indilib-drivers
index 3b9a338..1a0ca72 100644
--- a/sets/indilib-drivers
+++ b/sets/indilib-drivers
@@ -1,5 +1,6 @@
 sci-libs/indilib-driver-aagcloudwatcher
 sci-libs/indilib-driver-apogee
+sci-libs/indilib-driver-armadillo-platypus
 sci-libs/indilib-driver-asi
 sci-libs/indilib-driver-dsi
 sci-libs/indilib-driver-duino
@@ -10,6 +11,7 @@ sci-libs/indilib-driver-fli
 sci-libs/indilib-driver-gige
 sci-libs/indilib-driver-gphoto
 sci-libs/indilib-driver-gpsd
+sci-libs/indilib-driver-gpsnmea
 sci-libs/indilib-driver-inovaplx
 sci-libs/indilib-driver-maxdomeii
 sci-libs/indilib-driver-mi
@@ -18,6 +20,7 @@ sci-libs/indilib-driver-nexstarevo
 sci-libs/indilib-driver-qhy
 sci-libs/indilib-driver-qsi
 sci-libs/indilib-driver-sbig
+sci-libs/indilib-driver-radiosim
 sci-libs/indilib-driver-rtlsdr
 sci-libs/indilib-driver-shelyak
 sci-libs/indilib-driver-spectracyber
diff --git a/sets/indilib-drivers-live b/sets/indilib-drivers-live
index 13e3a9f..1fc64b4 100644
--- a/sets/indilib-drivers-live
+++ b/sets/indilib-drivers-live
@@ -1,5 +1,6 @@
 =sci-libs/indilib-driver-aagcloudwatcher-9999
 =sci-libs/indilib-driver-apogee-9999
+=sci-libs/indilib-driver-armadillo-platypus-9999
 =sci-libs/indilib-driver-asi-9999
 =sci-libs/indilib-driver-dsi-9999
 =sci-libs/indilib-driver-duino-9999
@@ -10,6 +11,7 @@
 =sci-libs/indilib-driver-gige-9999
 =sci-libs/indilib-driver-gphoto-9999
 =sci-libs/indilib-driver-gpsd-9999
+=sci-libs/indilib-driver-gpsnmea-9999
 =sci-libs/indilib-driver-inovaplx-9999
 =sci-libs/indilib-driver-maxdomeii-9999
 =sci-libs/indilib-driver-mi-9999
@@ -17,6 +19,7 @@
 =sci-libs/indilib-driver-nexstarevo-9999
 =sci-libs/indilib-driver-qhy-9999
 =sci-libs/indilib-driver-qsi-9999
+=sci-libs/indilib-driver-radiosim-9999
 =sci-libs/indilib-driver-rtlsdr-9999
 =sci-libs/indilib-driver-sbig-9999
 =sci-libs/indilib-driver-shelyak-9999