Update sci-libs/indilib, indilib drivers and deps to 1.8.3

author: Ctibor Brančík <ctibor@brancik.cz> 2020-01-12 17:35:31 +0100
committer: Ctibor Brančík <ctibor@brancik.cz> 2020-01-12 17:35:31 +0100
commit: 37e1361564c1a4048529d923039318f0f629c426 (patch)
tree: 31a0b59557e510fab98f60d9c0626146dd415a6d
parent: 782ae9d7bc1f7af393796f4057387956b6b64067 (diff)
download: brancik-overlay-37e1361564c1a4048529d923039318f0f629c426.tar.gz
brancik-overlay-37e1361564c1a4048529d923039318f0f629c426.tar.bz2
256 files changed, 2140 insertions, 1680 deletions
diff --git a/Documentation/README.indilib-drivers b/Documentation/README.indilib-drivers
index 9d0ec80..ff703ad 100644
--- a/Documentation/README.indilib-drivers
+++ b/Documentation/README.indilib-drivers
@@ -42,10 +42,15 @@ 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
-  - altaircam
+  - aagcloudwatcherng
+  - aok
   - apogee
   - armadillo
   - asi
+  - atik
+  - avalon
+  - beefocus
+  - dreamfocuser
   - dsi
   - duino
   - eqmod
@@ -66,14 +71,15 @@ Available USE flags (Note that only 3rd party drivers are present. All other dri
   - nightscape
   - qhy
   - qsi
-  - radiosim
   - rtlsdr
   - sbig
   - shelyak
   - spectracyber
   - ssag
+  - starbook
   - sx
-  - toupcam
+  - talon6
+  - toupbase
   - webcam
 
 nano -w /etc/portage/package.use/indilib
@@ -89,7 +95,7 @@ sci-libs/indilib-drivers gphoto2 qhy sbig
 
 sudo emerge sci-libs/indilib::brancik-overlay
 
-6. Note that ebuilds for stable release of indilib drivers (currently 1.7.0) are keyworded unstable (~amd64, ~x86 specifically) and live source ebuilds are all masked by package.mask. You will have to unmask them during 
+6. Note that ebuilds for stable release of indilib drivers (currently 1.8.3) are keyworded unstable (~amd64, ~x86 specifically) and live source ebuilds are all masked by package.mask. You will have to unmask them during 
 installation (use emerge with --autounmask-write option). See official docs if you do not know this means exactly.
 
 7. You can use provided init script in /etc/init.d/indiserver and respective configuration file in /etc/conf.d/indiserver to set indiserver to start automatically.
@@ -102,6 +108,6 @@ Firmware for SBIG cameras (sci-libs/libsbig) won't cross emerge if the host mach
 
 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 
 
-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).
+9. The overlay also includes ebuild for sci-astronomy/open-phd-guiding (version 2 directly from git).
 
 I hope someone will find this useful and please report any bugs with the ebuilds or compilation failures to the forum: http://indilib.org/forum/general/566-my-gentoo-overlay-with-indilib-3rd-party-drivers
diff --git a/net-wireless/limesuite/limesuite-9999.ebuild b/net-wireless/limesuite/limesuite-9999.ebuild
index a63fa23..1bc8ec0 100644
--- a/net-wireless/limesuite/limesuite-9999.ebuild
+++ b/net-wireless/limesuite/limesuite-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/profiles/package.mask b/profiles/package.mask
index b785fb3..d23ed4a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -2,10 +2,17 @@
 =sci-libs/indilib-9999
 =sci-libs/indilib-drivers-9999
 =sci-libs/indilib-driver-aagcloudwatcher-9999
+=sci-libs/indilib-driver-aagcloudwatcher-ng-9999
 =sci-libs/indilib-driver-amh-9999
+=sci-libs/indilib-driver-aok-9999
 =sci-libs/indilib-driver-apogee-9999
 =sci-libs/indilib-driver-armadillo-9999
+=sci-libs/indilib-driver-astromechfoc-9999
 =sci-libs/indilib-driver-asi-9999
+=sci-libs/indilib-driver-atik-9999
+=sci-libs/indilib-driver-avalon-9999
+=sci-libs/indilib-driver-beefocus-9999
+=sci-libs/indilib-driver-dreamfocuser-9999
 =sci-libs/indilib-driver-dsi-9999
 =sci-libs/indilib-driver-duino-9999
 =sci-libs/indilib-driver-eqmod-9999
@@ -20,36 +27,35 @@
 =sci-libs/indilib-driver-maxdomeii-9999
 =sci-libs/indilib-driver-mgen-9999
 =sci-libs/indilib-driver-mi-9999
+=sci-libs/indilib-driver-nexdome-9999
 =sci-libs/indilib-driver-nexstarevo-9999
 =sci-libs/indilib-driver-qhy-9999
 =sci-libs/indilib-driver-qsi-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
 =sci-libs/indilib-driver-ssag-9999
+=sci-libs/indilib-driver-starbook-9999
 =sci-libs/indilib-driver-sx-9999
-=sci-libs/indilib-driver-tess-9999
+=sci-libs/indilib-driver-talon6-9999
+=sci-libs/indilib-driver-toupbase-9999
+=sci-libs/indilib-driver-webcam-9999
+=sci-libs/libaltaircam-9999
+=sci-libs/libaasi-9999
 =sci-libs/libapogee-9999
-=sci-libs/libdspau-9999
 =sci-libs/libfishcamp-9999
 =sci-libs/libfli-9999
 =sci-libs/libinova-9999
+=sci-libs/libnncam-9999
 =sci-libs/libqhy-9999
 =sci-libs/libqsi-9999
 =sci-libs/libsbig-9999
-=sci-libs/asi-common-9999
-
-# Live ebuild for qastrocam-g2
-=sci-astronomy/qastrocam-g2-9999
+=sci-libs/libstarshootg-9999
+=sci-libs/libtoupcam-9999
 
 # Live ebuild for open-phd-guiding
 =sci-astronomy/open-phd-guiding-2.9999
 
 # Ebuild is not ready yet.
 =sci-astronomy/astrometry-data-1
-
-# Depends on Qt4
-sci-astronomy/ccd
-sci-astronomy/lin_guider
diff --git a/sci-libs/asi-common/Manifest b/sci-libs/asi-common/Manifest
deleted file mode 100644
index 7b723af..0000000
--- a/sci-libs/asi-common/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
diff --git a/sci-libs/asi-common/asi-common-1.7.5.ebuild b/sci-libs/asi-common/asi-common-1.7.5.ebuild
deleted file mode 100644
index 8431d0f..0000000
--- a/sci-libs/asi-common/asi-common-1.7.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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
deleted file mode 100644
index f0322ef..0000000
--- a/sci-libs/asi-common/asi-common-9999.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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/indilib-driver-aagcloudwatcher-ng/Manifest b/sci-libs/indilib-driver-aagcloudwatcher-ng/Manifest
new file mode 100644
index 0000000..2def209
--- /dev/null
+++ b/sci-libs/indilib-driver-aagcloudwatcher-ng/Manifest
@@ -0,0 +1 @@
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-aagcloudwatcher/indilib-driver-aagcloudwatcher-1.7.5.ebuild b/sci-libs/indilib-driver-aagcloudwatcher-ng/indilib-driver-aagcloudwatcher-ng-1.8.3.ebuild
index 599d7c8..12e5d70 100644
--- a/sci-libs/indilib-driver-aagcloudwatcher/indilib-driver-aagcloudwatcher-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-aagcloudwatcher-ng/indilib-driver-aagcloudwatcher-ng-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the AAG Cloud Watcher (AAGware - http://www.aagware.eu/)"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999"
 
@@ -22,4 +22,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-aagcloudwatcher-ng/indilib-driver-aagcloudwatcher-ng-9999.ebuild b/sci-libs/indilib-driver-aagcloudwatcher-ng/indilib-driver-aagcloudwatcher-ng-9999.ebuild
new file mode 100644
index 0000000..cdc7dd3
--- /dev/null
+++ b/sci-libs/indilib-driver-aagcloudwatcher-ng/indilib-driver-aagcloudwatcher-ng-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 eutils
+
+DESCRIPTION="INDI driver for the AAG Cloud Watcher (AAGware - http://www.aagware.eu/)"
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="GPL-3"
+KEYWORDS=""
+
+SLOT="0/1"
+
+DEPEND="~sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-aagcloudwatcher-ng/metadata.xml b/sci-libs/indilib-driver-aagcloudwatcher-ng/metadata.xml
new file mode 100644
index 0000000..3c8afbc
--- /dev/null
+++ b/sci-libs/indilib-driver-aagcloudwatcher-ng/metadata.xml
@@ -0,0 +1,13 @@
+<?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>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-aagcloudwatcher/Manifest b/sci-libs/indilib-driver-aagcloudwatcher/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-aagcloudwatcher/Manifest
+++ b/sci-libs/indilib-driver-aagcloudwatcher/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-aagcloudwatcher/indilib-driver-aagcloudwatcher-1.8.3.ebuild b/sci-libs/indilib-driver-aagcloudwatcher/indilib-driver-aagcloudwatcher-1.8.3.ebuild
new file mode 100644
index 0000000..12e5d70
--- /dev/null
+++ b/sci-libs/indilib-driver-aagcloudwatcher/indilib-driver-aagcloudwatcher-1.8.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake eutils
+
+DESCRIPTION="INDI driver for the AAG Cloud Watcher (AAGware - http://www.aagware.eu/)"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="<sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-aagcloudwatcher/indilib-driver-aagcloudwatcher-9999.ebuild b/sci-libs/indilib-driver-aagcloudwatcher/indilib-driver-aagcloudwatcher-9999.ebuild
index b28475f..cdc7dd3 100644
--- a/sci-libs/indilib-driver-aagcloudwatcher/indilib-driver-aagcloudwatcher-9999.ebuild
+++ b/sci-libs/indilib-driver-aagcloudwatcher/indilib-driver-aagcloudwatcher-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for the AAG Cloud Watcher (AAGware - http://www.aagware.eu/)"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="GPL-3"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999"
+DEPEND="~sci-libs/indilib-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-aagcloudwatcher/metadata.xml b/sci-libs/indilib-driver-aagcloudwatcher/metadata.xml
index 6298de3..3c8afbc 100644
--- a/sci-libs/indilib-driver-aagcloudwatcher/metadata.xml
+++ b/sci-libs/indilib-driver-aagcloudwatcher/metadata.xml
@@ -5,16 +5,9 @@
 		<email>ctibor@brancik.cz</email>
 		<name>Ctibor Brančík</name>
 	</maintainer>	
-	<longdescription>
-	indi_aagcloudwatcher is the INDI driver for the AAG CloudWatcher, a high precision, low cost system for monitoring the sky condition.
-	</longdescription>
 	<upstream>
-		<maintainer status="active">
-			<email>zerjillo@zerhillo.com</email>
-			<name>Zerjillo (S. Alonso)</name>
-		</maintainer>
-		<doc lang="en">http://indilib.org/devices/weather-stations/aag-cloud-watcher.html</doc>
-		<bugs-to>http://sourceforge.net/p/indi/bugs/</bugs-to>
-		<remote-id type="sourceforge">indi</remote-id>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-altaircam/Manifest b/sci-libs/indilib-driver-altaircam/Manifest
deleted file mode 100644
index 7b723af..0000000
--- a/sci-libs/indilib-driver-altaircam/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
diff --git a/sci-libs/indilib-driver-altaircam/indilib-driver-altaircam-1.7.5.ebuild b/sci-libs/indilib-driver-altaircam/indilib-driver-altaircam-1.7.5.ebuild
deleted file mode 100644
index c78a063..0000000
--- a/sci-libs/indilib-driver-altaircam/indilib-driver-altaircam-1.7.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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 the Altair 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="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-DEPEND="<sci-libs/indilib-9999
-	<sci-libs/libaltaircam-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-altaircam/indilib-driver-altaircam-9999.ebuild b/sci-libs/indilib-driver-altaircam/indilib-driver-altaircam-9999.ebuild
deleted file mode 100644
index 84c93dc..0000000
--- a/sci-libs/indilib-driver-altaircam/indilib-driver-altaircam-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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 Altair cameras."
-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
-	=sci-libs/libaltaircam-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-amh/indilib-driver-amh-9999.ebuild b/sci-libs/indilib-driver-amh/indilib-driver-amh-9999.ebuild
index 40c489c..c4824f3 100644
--- a/sci-libs/indilib-driver-amh/indilib-driver-amh-9999.ebuild
+++ b/sci-libs/indilib-driver-amh/indilib-driver-amh-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for the Adafruit Motor HAT addon board to Raspberry Pi"
 HOMEPAGE="https://github.com/rkaczorek/astroberry-amh"
@@ -11,15 +11,15 @@ EGIT_REPO_URI="https://github.com/Ctibor/astroberry-amh"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="GPL-3"
-KEYWORDS=""
+KEYWORDS="-amd64 -x86"
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-        dev-libs/wiringPi" #WiringPi is available in hacking-gentoo overlay
+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}"
+#S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-aok/Manifest b/sci-libs/indilib-driver-aok/Manifest
new file mode 100644
index 0000000..2def209
--- /dev/null
+++ b/sci-libs/indilib-driver-aok/Manifest
@@ -0,0 +1 @@
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-aok/indilib-driver-aok-1.8.3.ebuild b/sci-libs/indilib-driver-aok/indilib-driver-aok-1.8.3.ebuild
new file mode 100644
index 0000000..fc38e84
--- /dev/null
+++ b/sci-libs/indilib-driver-aok/indilib-driver-aok-1.8.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake eutils toolchain-funcs
+
+DESCRIPTION="INDI driver to control the AOK Skywalker mounts"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="<sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-aok/indilib-driver-aok-9999.ebuild b/sci-libs/indilib-driver-aok/indilib-driver-aok-9999.ebuild
new file mode 100644
index 0000000..45e8969
--- /dev/null
+++ b/sci-libs/indilib-driver-aok/indilib-driver-aok-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 eutils toolchain-funcs
+
+DESCRIPTION="INDI driver to control the AOK Skywalker mounts"
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+
+SLOT="0/1"
+
+DEPEND="~sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-radiosim/metadata.xml b/sci-libs/indilib-driver-aok/metadata.xml
index ecf496e..d215d30 100644
--- a/sci-libs/indilib-driver-radiosim/metadata.xml
+++ b/sci-libs/indilib-driver-aok/metadata.xml
@@ -5,12 +5,9 @@
     <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>
+        <doc lang="en">https://indilib.org/devices/mounts/aok-skywalker.html</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-apogee/Manifest b/sci-libs/indilib-driver-apogee/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-apogee/Manifest
+++ b/sci-libs/indilib-driver-apogee/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-apogee/indilib-driver-apogee-1.7.5.ebuild b/sci-libs/indilib-driver-apogee/indilib-driver-apogee-1.8.3.ebuild
index 1e404c9..cb71a3a 100644
--- a/sci-libs/indilib-driver-apogee/indilib-driver-apogee-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-apogee/indilib-driver-apogee-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the Apogee Alta (U & E) line of CCDs"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
 	<sci-libs/libapogee-9999"
@@ -23,4 +23,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-apogee/indilib-driver-apogee-9999.ebuild b/sci-libs/indilib-driver-apogee/indilib-driver-apogee-9999.ebuild
index d38c341..702bbb1 100644
--- a/sci-libs/indilib-driver-apogee/indilib-driver-apogee-9999.ebuild
+++ b/sci-libs/indilib-driver-apogee/indilib-driver-apogee-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for the Apogee Alta (U & E) line of CCDs"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-	=sci-libs/libapogee-9999"
+DEPEND="~sci-libs/indilib-9999
+	~sci-libs/libapogee-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-apogee/metadata.xml b/sci-libs/indilib-driver-apogee/metadata.xml
index 732e6d5..91e70e7 100644
--- a/sci-libs/indilib-driver-apogee/metadata.xml
+++ b/sci-libs/indilib-driver-apogee/metadata.xml
@@ -5,16 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    INDI Apogee driver should be able to support all Apogee family of CCDs. Both USB and Networked versions are supported. Filter wheels are not supported yet.
-  </longdescription>
   <upstream>
-		<maintainer status="active">
-		<email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-		</maintainer>
-        <doc lang="en">http://indilib.org/devices/ccds/apogee-ccd.html</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-armadillo/Manifest b/sci-libs/indilib-driver-armadillo/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-armadillo/Manifest
+++ b/sci-libs/indilib-driver-armadillo/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-armadillo/indilib-driver-armadillo-1.7.5.ebuild b/sci-libs/indilib-driver-armadillo/indilib-driver-armadillo-1.8.3.ebuild
index 2a1aea7..09c03f4 100644
--- a/sci-libs/indilib-driver-armadillo/indilib-driver-armadillo-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-armadillo/indilib-driver-armadillo-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999"
 
@@ -22,4 +22,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}-platypus"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-armadillo/indilib-driver-armadillo-9999.ebuild b/sci-libs/indilib-driver-armadillo/indilib-driver-armadillo-9999.ebuild
index 2fcc7cd..9ae44f9 100644
--- a/sci-libs/indilib-driver-armadillo/indilib-driver-armadillo-9999.ebuild
+++ b/sci-libs/indilib-driver-armadillo/indilib-driver-armadillo-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake 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_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999"
+DEPEND="~sci-libs/indilib-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}-platypus"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-armadillo/metadata.xml b/sci-libs/indilib-driver-armadillo/metadata.xml
index 23a29d8..91e70e7 100644
--- a/sci-libs/indilib-driver-armadillo/metadata.xml
+++ b/sci-libs/indilib-driver-armadillo/metadata.xml
@@ -5,12 +5,9 @@
     <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>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-asi/Manifest b/sci-libs/indilib-driver-asi/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-asi/Manifest
+++ b/sci-libs/indilib-driver-asi/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-asi/indilib-driver-asi-1.7.5.ebuild b/sci-libs/indilib-driver-asi/indilib-driver-asi-1.8.3.ebuild
index 2061313..2fb6e3f 100644
--- a/sci-libs/indilib-driver-asi/indilib-driver-asi-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-asi/indilib-driver-asi-1.8.3.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
-        <sci-libs/asi-common-9999"
+	<sci-libs/libasi-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
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 a0c345f..c681f0f 100644
--- a/sci-libs/indilib-driver-asi/indilib-driver-asi-9999.ebuild
+++ b/sci-libs/indilib-driver-asi/indilib-driver-asi-9999.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 MY_PN="asicam"
 
 DESCRIPTION="INDI driver for the ZWO Optics ASI cameras"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-        =sci-libs/indilib-9999"
+DEPEND="~sci-libs/indilib-9999
+	~sci-libs/libasi-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-asi/metadata.xml b/sci-libs/indilib-driver-asi/metadata.xml
index b480c3b..91e70e7 100644
--- a/sci-libs/indilib-driver-asi/metadata.xml
+++ b/sci-libs/indilib-driver-asi/metadata.xml
@@ -5,12 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    This is the INDI driver for the ZWO Optics ASI cameras. It was tested with the ASI120MC and the ASI120MM but, hopefully, should work with other cameras from ZWO Optical too.
-  </longdescription>
   <upstream>
-        <doc lang="en">http://indilib.org/devices/ccds/zwo-optics-asi-cameras.html</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-astromechfoc/Manifest b/sci-libs/indilib-driver-astromechfoc/Manifest
new file mode 100644
index 0000000..2def209
--- /dev/null
+++ b/sci-libs/indilib-driver-astromechfoc/Manifest
@@ -0,0 +1 @@
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-astromechfoc/indilib-driver-astromechfoc-1.8.3.ebuild b/sci-libs/indilib-driver-astromechfoc/indilib-driver-astromechfoc-1.8.3.ebuild
new file mode 100644
index 0000000..71b143f
--- /dev/null
+++ b/sci-libs/indilib-driver-astromechfoc/indilib-driver-astromechfoc-1.8.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake eutils
+
+DESCRIPTION="the INDI driver for Astromechanics Lens Controller https://astromechanics.org"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="<sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-astromechfoc/indilib-driver-astromechfoc-9999.ebuild b/sci-libs/indilib-driver-astromechfoc/indilib-driver-astromechfoc-9999.ebuild
new file mode 100644
index 0000000..cf5c54f
--- /dev/null
+++ b/sci-libs/indilib-driver-astromechfoc/indilib-driver-astromechfoc-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 eutils
+
+DESCRIPTION="the INDI driver for Astromechanics Lens Controller https://astromechanics.org"
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="GPL-3"
+KEYWORDS=""
+
+SLOT="0/1"
+
+DEPEND="~sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-astromechfoc/metadata.xml b/sci-libs/indilib-driver-astromechfoc/metadata.xml
new file mode 100644
index 0000000..3c8afbc
--- /dev/null
+++ b/sci-libs/indilib-driver-astromechfoc/metadata.xml
@@ -0,0 +1,13 @@
+<?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>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-atik/Manifest b/sci-libs/indilib-driver-atik/Manifest
new file mode 100644
index 0000000..2def209
--- /dev/null
+++ b/sci-libs/indilib-driver-atik/Manifest
@@ -0,0 +1 @@
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-atik/indilib-driver-atik-1.8.3.ebuild b/sci-libs/indilib-driver-atik/indilib-driver-atik-1.8.3.ebuild
new file mode 100644
index 0000000..289cb9c
--- /dev/null
+++ b/sci-libs/indilib-driver-atik/indilib-driver-atik-1.8.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake eutils
+
+DESCRIPTION="the INDI driver for the ATIK cameras and filter wheels"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="<sci-libs/indilib-9999
+	<sci-libs/libatik-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-atik/indilib-driver-atik-9999.ebuild b/sci-libs/indilib-driver-atik/indilib-driver-atik-9999.ebuild
new file mode 100644
index 0000000..ec2fa2e
--- /dev/null
+++ b/sci-libs/indilib-driver-atik/indilib-driver-atik-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 eutils
+
+DESCRIPTION="the INDI driver for the ATIK cameras and filter wheels"
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+
+SLOT="0/1"
+
+DEPEND="~sci-libs/indilib-9999
+	~sci-libs/libatik-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-atik/metadata.xml b/sci-libs/indilib-driver-atik/metadata.xml
new file mode 100644
index 0000000..3c8afbc
--- /dev/null
+++ b/sci-libs/indilib-driver-atik/metadata.xml
@@ -0,0 +1,13 @@
+<?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>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-avalon/Manifest b/sci-libs/indilib-driver-avalon/Manifest
new file mode 100644
index 0000000..2def209
--- /dev/null
+++ b/sci-libs/indilib-driver-avalon/Manifest
@@ -0,0 +1 @@
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-avalon/indilib-driver-avalon-1.8.3.ebuild b/sci-libs/indilib-driver-avalon/indilib-driver-avalon-1.8.3.ebuild
new file mode 100644
index 0000000..9a1f0b1
--- /dev/null
+++ b/sci-libs/indilib-driver-avalon/indilib-driver-avalon-1.8.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake eutils
+
+DESCRIPTION="INDI driver to control Avalon Instruments mounts with StarGO control"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="<sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-avalon/indilib-driver-avalon-9999.ebuild b/sci-libs/indilib-driver-avalon/indilib-driver-avalon-9999.ebuild
new file mode 100644
index 0000000..4103c0c
--- /dev/null
+++ b/sci-libs/indilib-driver-avalon/indilib-driver-avalon-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 eutils
+
+DESCRIPTION="INDI driver to control Avalon Instruments mounts with StarGO control"
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+
+SLOT="0/1"
+
+DEPEND="~sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-avalon/metadata.xml b/sci-libs/indilib-driver-avalon/metadata.xml
new file mode 100644
index 0000000..3c8afbc
--- /dev/null
+++ b/sci-libs/indilib-driver-avalon/metadata.xml
@@ -0,0 +1,13 @@
+<?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>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-beefocus/Manifest b/sci-libs/indilib-driver-beefocus/Manifest
new file mode 100644
index 0000000..2def209
--- /dev/null
+++ b/sci-libs/indilib-driver-beefocus/Manifest
@@ -0,0 +1 @@
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-beefocus/indilib-driver-beefocus-1.8.3.ebuild b/sci-libs/indilib-driver-beefocus/indilib-driver-beefocus-1.8.3.ebuild
new file mode 100644
index 0000000..b6109fd
--- /dev/null
+++ b/sci-libs/indilib-driver-beefocus/indilib-driver-beefocus-1.8.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake eutils
+
+DESCRIPTION="INDILIB driver for beefocus, an Open Source Hardware/ Software Telescope Focuser"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="<sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-beefocus/indilib-driver-beefocus-9999.ebuild b/sci-libs/indilib-driver-beefocus/indilib-driver-beefocus-9999.ebuild
new file mode 100644
index 0000000..3f3684f
--- /dev/null
+++ b/sci-libs/indilib-driver-beefocus/indilib-driver-beefocus-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 eutils
+
+DESCRIPTION="INDILIB driver for beefocus, an Open Source Hardware/ Software Telescope Focuser"
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+
+SLOT="0/1"
+
+DEPEND="~sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-beefocus/metadata.xml b/sci-libs/indilib-driver-beefocus/metadata.xml
new file mode 100644
index 0000000..3c8afbc
--- /dev/null
+++ b/sci-libs/indilib-driver-beefocus/metadata.xml
@@ -0,0 +1,13 @@
+<?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>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-dreamfocuser/Manifest b/sci-libs/indilib-driver-dreamfocuser/Manifest
new file mode 100644
index 0000000..2def209
--- /dev/null
+++ b/sci-libs/indilib-driver-dreamfocuser/Manifest
@@ -0,0 +1 @@
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-dreamfocuser/indilib-driver-dreamfocuser-1.8.3.ebuild b/sci-libs/indilib-driver-dreamfocuser/indilib-driver-dreamfocuser-1.8.3.ebuild
new file mode 100644
index 0000000..29c8e56
--- /dev/null
+++ b/sci-libs/indilib-driver-dreamfocuser/indilib-driver-dreamfocuser-1.8.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake eutils
+
+DESCRIPTION="the INDI driver for DreamFocuser http://astromaniak.pl/viewtopic.php?f=1&t=39917"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="<sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-dreamfocuser/indilib-driver-dreamfocuser-9999.ebuild b/sci-libs/indilib-driver-dreamfocuser/indilib-driver-dreamfocuser-9999.ebuild
new file mode 100644
index 0000000..47db61b
--- /dev/null
+++ b/sci-libs/indilib-driver-dreamfocuser/indilib-driver-dreamfocuser-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 eutils
+
+DESCRIPTION="the INDI driver for DreamFocuser http://astromaniak.pl/viewtopic.php?f=1&t=39917"
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+
+SLOT="0/1"
+
+DEPEND="~sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-dreamfocuser/metadata.xml b/sci-libs/indilib-driver-dreamfocuser/metadata.xml
new file mode 100644
index 0000000..3c8afbc
--- /dev/null
+++ b/sci-libs/indilib-driver-dreamfocuser/metadata.xml
@@ -0,0 +1,13 @@
+<?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>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-dsi/Manifest b/sci-libs/indilib-driver-dsi/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-dsi/Manifest
+++ b/sci-libs/indilib-driver-dsi/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-dsi/indilib-driver-dsi-1.7.5.ebuild b/sci-libs/indilib-driver-dsi/indilib-driver-dsi-1.8.3.ebuild
index b32baa9..a871d7c 100644
--- a/sci-libs/indilib-driver-dsi/indilib-driver-dsi-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-dsi/indilib-driver-dsi-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the Meade Deep Sky Imager"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999"
 
@@ -22,4 +22,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-dsi/indilib-driver-dsi-9999.ebuild b/sci-libs/indilib-driver-dsi/indilib-driver-dsi-9999.ebuild
index 83a320c..e5c78f2 100644
--- a/sci-libs/indilib-driver-dsi/indilib-driver-dsi-9999.ebuild
+++ b/sci-libs/indilib-driver-dsi/indilib-driver-dsi-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver the for Meade Deep Sky Imager"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999"
+DEPEND="~sci-libs/indilib-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-dsi/metadata.xml b/sci-libs/indilib-driver-dsi/metadata.xml
index c4ae78f..3c8afbc 100644
--- a/sci-libs/indilib-driver-dsi/metadata.xml
+++ b/sci-libs/indilib-driver-dsi/metadata.xml
@@ -1,19 +1,13 @@
 <?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 Meade DSI family of CCDs.
-  </longdescription>
-  <upstream>
-        <maintainer status="active">
-                <email>roland@astrofoto.org</email>
-                <name>Roland B. Roberts</name>
-        </maintainer>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
-        <remote-id type="github">indilib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-duino/Manifest b/sci-libs/indilib-driver-duino/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-duino/Manifest
+++ b/sci-libs/indilib-driver-duino/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-duino/indilib-driver-duino-1.7.5.ebuild b/sci-libs/indilib-driver-duino/indilib-driver-duino-1.8.3.ebuild
index 0d6bef6..cd06627 100644
--- a/sci-libs/indilib-driver-duino/indilib-driver-duino-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-duino/indilib-driver-duino-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the Arduino boards"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999"
 
@@ -22,4 +22,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-duino/indilib-driver-duino-9999.ebuild b/sci-libs/indilib-driver-duino/indilib-driver-duino-9999.ebuild
index 653a3d8..a660543 100644
--- a/sci-libs/indilib-driver-duino/indilib-driver-duino-9999.ebuild
+++ b/sci-libs/indilib-driver-duino/indilib-driver-duino-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for the Arduino boards"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999"
+DEPEND="~sci-libs/indilib-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-duino/metadata.xml b/sci-libs/indilib-driver-duino/metadata.xml
index c92a3ce..91e70e7 100644
--- a/sci-libs/indilib-driver-duino/metadata.xml
+++ b/sci-libs/indilib-driver-duino/metadata.xml
@@ -5,16 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    INDIDUINO is a combination of hardware and drivers aims to fulfill miscellaneous automation functions on robotics telescope observatories. By mean of INDIDUINO boards and drivers you can switch on/off elements, obtain status and values from digital/analog inputs or event actuate servos.
-  </longdescription>
   <upstream>
-        <maintainer status="active">
-                <email>mas.ignacio@gmail.com</email>
-                <name>Nacho Mas</name>
-        </maintainer>
-        <doc lang="en">http://indilib.org/develop/arduino/110-welcome-to-indiduino.html</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-eqmod/Manifest b/sci-libs/indilib-driver-eqmod/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-eqmod/Manifest
+++ b/sci-libs/indilib-driver-eqmod/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-eqmod/indilib-driver-eqmod-1.7.5.ebuild b/sci-libs/indilib-driver-eqmod/indilib-driver-eqmod-1.8.3.ebuild
index 1f243d1..619525f 100644
--- a/sci-libs/indilib-driver-eqmod/indilib-driver-eqmod-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-eqmod/indilib-driver-eqmod-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for mounts compliant to the SkyWatcher Protocol"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999"
 
@@ -22,4 +22,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-eqmod/indilib-driver-eqmod-9999.ebuild b/sci-libs/indilib-driver-eqmod/indilib-driver-eqmod-9999.ebuild
index 01b71be..4d2a22d 100644
--- a/sci-libs/indilib-driver-eqmod/indilib-driver-eqmod-9999.ebuild
+++ b/sci-libs/indilib-driver-eqmod/indilib-driver-eqmod-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for mounts compliant to the SkyWatcher Protocol"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="GPL-3"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999"
+DEPEND="~sci-libs/indilib-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-eqmod/metadata.xml b/sci-libs/indilib-driver-eqmod/metadata.xml
index 1bdc445..91e70e7 100644
--- a/sci-libs/indilib-driver-eqmod/metadata.xml
+++ b/sci-libs/indilib-driver-eqmod/metadata.xml
@@ -5,16 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    This INDI driver interacts with a mount controller using the Skywatcher Protocol through a serial link.
-    It can directly drive Skywatcher and similar mounts through a serial port after a conversion of signal levels 
-    (see EQDIRECT interface), or any other mount hardware which uses this protocol. This project is similar in its goal 
-    to the EQMOD/EQASCOM project, but for the Linux/INDI world. Thus the name of the INDI device is "EQMod Mount", 
-    and the driver executable is indi_eqmod_telescope.
-  </longdescription>
   <upstream>
-        <doc lang="en">http://indilib.org/devices/telescopes/eqmod.html</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-ffmv/Manifest b/sci-libs/indilib-driver-ffmv/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-ffmv/Manifest
+++ b/sci-libs/indilib-driver-ffmv/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-ffmv/indilib-driver-ffmv-1.7.5.ebuild b/sci-libs/indilib-driver-ffmv/indilib-driver-ffmv-1.8.3.ebuild
index e5dee9a..6faf783 100644
--- a/sci-libs/indilib-driver-ffmv/indilib-driver-ffmv-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-ffmv/indilib-driver-ffmv-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the Point Grey FireFly MV camera"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
 	media-libs/libdc1394"
@@ -23,4 +23,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-ffmv/indilib-driver-ffmv-9999.ebuild b/sci-libs/indilib-driver-ffmv/indilib-driver-ffmv-9999.ebuild
index 7139591..dffeb80 100644
--- a/sci-libs/indilib-driver-ffmv/indilib-driver-ffmv-9999.ebuild
+++ b/sci-libs/indilib-driver-ffmv/indilib-driver-ffmv-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver the for the Point Grey FireFly MV camera"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
+DEPEND="~sci-libs/indilib-9999
 	media-libs/libdc1394"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-ffmv/metadata.xml b/sci-libs/indilib-driver-ffmv/metadata.xml
index a3967aa..3c8afbc 100644
--- a/sci-libs/indilib-driver-ffmv/metadata.xml
+++ b/sci-libs/indilib-driver-ffmv/metadata.xml
@@ -1,23 +1,13 @@
 <?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 the Point Grey FireFly MV camera.
-  </longdescription>
-  <upstream>
-        <maintainer status="active">
-                <email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-        </maintainer>
-	<maintainer status="active">
-		<email>bgilsrud@gmail.com</email>
-		<name>Ben Gilsrud</name>
-	</maintainer>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
-        <remote-id type="github">indilib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-fishcamp/Manifest b/sci-libs/indilib-driver-fishcamp/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-fishcamp/Manifest
+++ b/sci-libs/indilib-driver-fishcamp/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-fishcamp/indilib-driver-fishcamp-1.7.5.ebuild b/sci-libs/indilib-driver-fishcamp/indilib-driver-fishcamp-1.8.3.ebuild
index c0ba0be..7d1a8f3 100644
--- a/sci-libs/indilib-driver-fishcamp/indilib-driver-fishcamp-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-fishcamp/indilib-driver-fishcamp-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the Fishcamp Engineering's Starfish CMOS autoguider"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
 	<sci-libs/libfishcamp-9999"
@@ -23,4 +23,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-fishcamp/indilib-driver-fishcamp-9999.ebuild b/sci-libs/indilib-driver-fishcamp/indilib-driver-fishcamp-9999.ebuild
index 3b8db39..b77f315 100644
--- a/sci-libs/indilib-driver-fishcamp/indilib-driver-fishcamp-9999.ebuild
+++ b/sci-libs/indilib-driver-fishcamp/indilib-driver-fishcamp-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for for the Fishcamp Engineering's Starfish CMOS autoguider"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-	=sci-libs/libfishcamp-9999"
+DEPEND="~sci-libs/indilib-9999
+	~sci-libs/libfishcamp-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-fishcamp/metadata.xml b/sci-libs/indilib-driver-fishcamp/metadata.xml
index 462699a..3f6cd93 100644
--- a/sci-libs/indilib-driver-fishcamp/metadata.xml
+++ b/sci-libs/indilib-driver-fishcamp/metadata.xml
@@ -1,19 +1,13 @@
 <?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 Fishcamp Engineering's Starfish CMOS autoguider (currently support imaging part only).
-  </longdescription>
-  <upstream>
-        <maintainer status="active">
-                <email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-        </maintainer>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
-        <remote-id type="github">indilib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<upstream>
+		<doc lang="en">http://indilib.org</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-fli/Manifest b/sci-libs/indilib-driver-fli/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-fli/Manifest
+++ b/sci-libs/indilib-driver-fli/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-fli/indilib-driver-fli-1.7.5.ebuild b/sci-libs/indilib-driver-fli/indilib-driver-fli-1.8.3.ebuild
index e7740aa..9c8669a 100644
--- a/sci-libs/indilib-driver-fli/indilib-driver-fli-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-fli/indilib-driver-fli-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the Finger Lakes Instruments CCD and Focuser"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
 	<sci-libs/libfli-9999"
@@ -23,9 +23,9 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
 
 src_install() {
 	cmake-utils_src_install
-	rm -r ${D}/lib/udev
+	rm -r "${D}"/lib/udev
 }
diff --git a/sci-libs/indilib-driver-fli/indilib-driver-fli-9999.ebuild b/sci-libs/indilib-driver-fli/indilib-driver-fli-9999.ebuild
index 23ecc30..bf10884 100644
--- a/sci-libs/indilib-driver-fli/indilib-driver-fli-9999.ebuild
+++ b/sci-libs/indilib-driver-fli/indilib-driver-fli-9999.ebuild
@@ -1,30 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for for the Finger Lakes Instruments CCD and Focuser"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-	=sci-libs/libfli-9999"
+DEPEND="~sci-libs/indilib-9999
+	~sci-libs/libfli-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
 
 src_install() {
 	cmake-utils_src_install
-	rm -r ${D}/lib/udev
+	rm -r "${D}"/lib/udev
 }
diff --git a/sci-libs/indilib-driver-fli/metadata.xml b/sci-libs/indilib-driver-fli/metadata.xml
index 1bf44a3..91e70e7 100644
--- a/sci-libs/indilib-driver-fli/metadata.xml
+++ b/sci-libs/indilib-driver-fli/metadata.xml
@@ -5,16 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    This package provides the FLI driver for Finger Lakes Instruments CCD and Focuser.
-  </longdescription>
   <upstream>
-        <maintainer status="active">
-                <email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-        </maintainer>
-        <doc lang="en">http://indilib.org/devices/ccds/fli-ccd-filter-wheel.html</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-gige/Manifest b/sci-libs/indilib-driver-gige/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-gige/Manifest
+++ b/sci-libs/indilib-driver-gige/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-gige/indilib-driver-gige-1.7.5.ebuild b/sci-libs/indilib-driver-gige/indilib-driver-gige-1.8.3.ebuild
index d9041ea..55e1ad2 100644
--- a/sci-libs/indilib-driver-gige/indilib-driver-gige-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-gige/indilib-driver-gige-1.8.3.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the Point Grey FireFly MV camera"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
-	>=media-video/aravis-0.6"
+	=media-video/aravis-0.6*"
 
 RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-gige/indilib-driver-gige-9999.ebuild b/sci-libs/indilib-driver-gige/indilib-driver-gige-9999.ebuild
index af608b8..c6ba624 100644
--- a/sci-libs/indilib-driver-gige/indilib-driver-gige-9999.ebuild
+++ b/sci-libs/indilib-driver-gige/indilib-driver-gige-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver the for Point Grey FireFly MV camera"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-	=media-video/aravis-9999"
+DEPEND="~sci-libs/indilib-9999
+	~media-video/aravis-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-gige/metadata.xml b/sci-libs/indilib-driver-gige/metadata.xml
index 32e344e..3c8afbc 100644
--- a/sci-libs/indilib-driver-gige/metadata.xml
+++ b/sci-libs/indilib-driver-gige/metadata.xml
@@ -1,23 +1,13 @@
 <?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 basic support for most GigE machine vision cameras through Project Aravis.
-  </longdescription>
-  <upstream>
-        <maintainer status="active">
-                <email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-        </maintainer>
-	<maintainer status="active">
-		<email>bgilsrud@gmail.com</email>
-		<name>Ben Gilsrud</name>
-	</maintainer>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
-        <remote-id type="github">indilib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-gphoto/Manifest b/sci-libs/indilib-driver-gphoto/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-gphoto/Manifest
+++ b/sci-libs/indilib-driver-gphoto/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-1.7.5.ebuild b/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-1.8.3.ebuild
index 3c57baf..62f24f1 100644
--- a/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-1.8.3.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the gphoto2 compatible 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
 	media-libs/libgphoto2[jpeg]
 	media-libs/libraw
-	dev-libs/npth"
+	dev-libs/npth
+	media-libs/tiff[cxx]"
 
 RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild b/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild
index 0acb9a2..21c1952 100644
--- a/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild
+++ b/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild
@@ -1,28 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for the gphoto2 compatible cameras"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
+DEPEND="~sci-libs/indilib-9999
 	media-libs/libgphoto2[jpeg]
 	media-libs/libraw
 	dev-libs/npth
-	media-gfx/tiff"
+	media-libs/tiff[cxx]"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-gphoto/metadata.xml b/sci-libs/indilib-driver-gphoto/metadata.xml
index 7d3f8a7..91e70e7 100644
--- a/sci-libs/indilib-driver-gphoto/metadata.xml
+++ b/sci-libs/indilib-driver-gphoto/metadata.xml
@@ -5,18 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    INDI can control any camera supported by GPhoto using the gphoto driver. This includes most DSLRs cameras. 
-    Make sure the OS does not mount the camera as a disk-drive. INDI should be able to support any camera supported 
-    by libgphoto2, including Canon and Nikon DSLRs. 
-  </longdescription>
   <upstream>
-        <maintainer status="active">
-                <email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-        </maintainer>
-        <doc lang="en">http://indilib.org/devices/ccds/gphoto.html</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-gpsd/Manifest b/sci-libs/indilib-driver-gpsd/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-gpsd/Manifest
+++ b/sci-libs/indilib-driver-gpsd/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-gpsd/indilib-driver-gpsd-1.7.5.ebuild b/sci-libs/indilib-driver-gpsd/indilib-driver-gpsd-1.8.3.ebuild
index 095008c..87c096c 100644
--- a/sci-libs/indilib-driver-gpsd/indilib-driver-gpsd-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-gpsd/indilib-driver-gpsd-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for GPS daemon"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
 	sci-geosciences/gpsd"
@@ -23,4 +23,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-gpsd/indilib-driver-gpsd-9999.ebuild b/sci-libs/indilib-driver-gpsd/indilib-driver-gpsd-9999.ebuild
index 598365a..2fbe00e 100644
--- a/sci-libs/indilib-driver-gpsd/indilib-driver-gpsd-9999.ebuild
+++ b/sci-libs/indilib-driver-gpsd/indilib-driver-gpsd-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for GPS daemon"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
+DEPEND="~sci-libs/indilib-9999
 	sci-geosciences/gpsd"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-gpsd/metadata.xml b/sci-libs/indilib-driver-gpsd/metadata.xml
index d0ac76f..3c8afbc 100644
--- a/sci-libs/indilib-driver-gpsd/metadata.xml
+++ b/sci-libs/indilib-driver-gpsd/metadata.xml
@@ -1,15 +1,13 @@
 <?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>
-    Indilib driver for linux GPS daemon.
-  </longdescription>
-  <upstream>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
-        <remote-id type="github">indilib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-gpsnmea/Manifest b/sci-libs/indilib-driver-gpsnmea/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-gpsnmea/Manifest
+++ b/sci-libs/indilib-driver-gpsnmea/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-gpsnmea/indilib-driver-gpsnmea-1.7.5.ebuild b/sci-libs/indilib-driver-gpsnmea/indilib-driver-gpsnmea-1.8.3.ebuild
index 620ec27..a11ef1e 100644
--- a/sci-libs/indilib-driver-gpsnmea/indilib-driver-gpsnmea-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-gpsnmea/indilib-driver-gpsnmea-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999"
 
@@ -22,4 +22,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${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
index 0d6c981..631d02b 100644
--- a/sci-libs/indilib-driver-gpsnmea/indilib-driver-gpsnmea-9999.ebuild
+++ b/sci-libs/indilib-driver-gpsnmea/indilib-driver-gpsnmea-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake 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_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999"
+DEPEND="~sci-libs/indilib-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-gpsnmea/metadata.xml b/sci-libs/indilib-driver-gpsnmea/metadata.xml
index 58659ab..91e70e7 100644
--- a/sci-libs/indilib-driver-gpsnmea/metadata.xml
+++ b/sci-libs/indilib-driver-gpsnmea/metadata.xml
@@ -5,12 +5,9 @@
     <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>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-inovaplx/Manifest b/sci-libs/indilib-driver-inovaplx/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-inovaplx/Manifest
+++ b/sci-libs/indilib-driver-inovaplx/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-inovaplx/indilib-driver-inovaplx-1.7.5.ebuild b/sci-libs/indilib-driver-inovaplx/indilib-driver-inovaplx-1.8.3.ebuild
index 1f21419..18ccdfc 100644
--- a/sci-libs/indilib-driver-inovaplx/indilib-driver-inovaplx-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-inovaplx/indilib-driver-inovaplx-1.8.3.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the i.Nova PLx series CCD/CMOS 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
-		<sci-libs/libinova-9999"
+	<sci-libs/libinova-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-inovaplx/indilib-driver-inovaplx-9999.ebuild b/sci-libs/indilib-driver-inovaplx/indilib-driver-inovaplx-9999.ebuild
index 2ed3272..bf1e10c 100644
--- a/sci-libs/indilib-driver-inovaplx/indilib-driver-inovaplx-9999.ebuild
+++ b/sci-libs/indilib-driver-inovaplx/indilib-driver-inovaplx-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for the i.Nova PLx series CCD/CMOS cameras"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-		=sci-libs/libinova-9999"
+DEPEND="~sci-libs/indilib-9999
+	~sci-libs/libinova-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-inovaplx/metadata.xml b/sci-libs/indilib-driver-inovaplx/metadata.xml
index 39b438c..91e70e7 100644
--- a/sci-libs/indilib-driver-inovaplx/metadata.xml
+++ b/sci-libs/indilib-driver-inovaplx/metadata.xml
@@ -5,12 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    This package provides the INDI driver for the i.Nova PLx series CCD/CMOS cameras. 
-  </longdescription>
   <upstream>
-        <doc lang="en">http://indilib.org/devices/ccds/i-nova-ccd.html</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-limesdr/Manifest b/sci-libs/indilib-driver-limesdr/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-limesdr/Manifest
+++ b/sci-libs/indilib-driver-limesdr/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-limesdr/indilib-driver-limesdr-1.7.5.ebuild b/sci-libs/indilib-driver-limesdr/indilib-driver-limesdr-1.8.3.ebuild
index bb5df24..f4de45e 100644
--- a/sci-libs/indilib-driver-limesdr/indilib-driver-limesdr-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-limesdr/indilib-driver-limesdr-1.8.3.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the LimeSDR series receivers."
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
-	<sci-libs/libdspau-9999
-        net-wireless/limesuite"
+	<net-wireless/limesuite-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-limesdr/indilib-driver-limesdr-9999.ebuild b/sci-libs/indilib-driver-limesdr/indilib-driver-limesdr-9999.ebuild
index 87e563a..4e54717 100644
--- a/sci-libs/indilib-driver-limesdr/indilib-driver-limesdr-9999.ebuild
+++ b/sci-libs/indilib-driver-limesdr/indilib-driver-limesdr-9999.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for the LimeSDR series receivers."
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-	=sci-libs/libdspau-9999
-        net-wireless/limesuite-9999"
+DEPEND="~sci-libs/indilib-9999
+	~net-wireless/limesuite-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-limesdr/metadata.xml b/sci-libs/indilib-driver-limesdr/metadata.xml
index f09eb14..91e70e7 100644
--- a/sci-libs/indilib-driver-limesdr/metadata.xml
+++ b/sci-libs/indilib-driver-limesdr/metadata.xml
@@ -5,12 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    This package provides the INDI driver for the LimeSDR series receivers. 
-  </longdescription>
   <upstream>
-        <doc lang="en">http://indilib.org/devices</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-maxdomeii/Manifest b/sci-libs/indilib-driver-maxdomeii/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-maxdomeii/Manifest
+++ b/sci-libs/indilib-driver-maxdomeii/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-maxdomeii/indilib-driver-maxdomeii-1.7.5.ebuild b/sci-libs/indilib-driver-maxdomeii/indilib-driver-maxdomeii-1.8.3.ebuild
index 3a50570..162a886 100644
--- a/sci-libs/indilib-driver-maxdomeii/indilib-driver-maxdomeii-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-maxdomeii/indilib-driver-maxdomeii-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the Maxdome II"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999"
 
@@ -22,4 +22,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-maxdomeii/indilib-driver-maxdomeii-9999.ebuild b/sci-libs/indilib-driver-maxdomeii/indilib-driver-maxdomeii-9999.ebuild
index d3f19e0..b423893 100644
--- a/sci-libs/indilib-driver-maxdomeii/indilib-driver-maxdomeii-9999.ebuild
+++ b/sci-libs/indilib-driver-maxdomeii/indilib-driver-maxdomeii-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for the Maxdome II"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999"
+DEPEND="~sci-libs/indilib-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-maxdomeii/metadata.xml b/sci-libs/indilib-driver-maxdomeii/metadata.xml
index 974d991..91e70e7 100644
--- a/sci-libs/indilib-driver-maxdomeii/metadata.xml
+++ b/sci-libs/indilib-driver-maxdomeii/metadata.xml
@@ -5,12 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    This device is a generic dome controller. Commercial "Sirius Domes" uses this device. MaxDome II is a fully automatic observatory dome control system. Link your dome to a computer for complete automation including telescope slaving and shutter control. MaxDome works with a wide variety of commercial and custom-built domes. 
-  </longdescription>
   <upstream>
-        <doc lang="en">http://indilib.org/devices/domes/maxdome-ii.html</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-mgen/Manifest b/sci-libs/indilib-driver-mgen/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-mgen/Manifest
+++ b/sci-libs/indilib-driver-mgen/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-mgen/indilib-driver-mgen-1.7.5.ebuild b/sci-libs/indilib-driver-mgen/indilib-driver-mgen-1.8.3.ebuild
index 13286c7..da94413 100644
--- a/sci-libs/indilib-driver-mgen/indilib-driver-mgen-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-mgen/indilib-driver-mgen-1.8.3.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for Lacerta MGen standalone autoguider"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
-		dev-embedded/libftdi:1"
+	dev-embedded/libftdi:1"
 
 RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-mgen/indilib-driver-mgen-9999.ebuild b/sci-libs/indilib-driver-mgen/indilib-driver-mgen-9999.ebuild
index 60c6e8f..4a26a44 100644
--- a/sci-libs/indilib-driver-mgen/indilib-driver-mgen-9999.ebuild
+++ b/sci-libs/indilib-driver-mgen/indilib-driver-mgen-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for Lacerta MGen standalone autoguider"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-		dev-embedded/libftdi:1"
+DEPEND="~sci-libs/indilib-9999
+	dev-embedded/libftdi:1"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-mgen/metadata.xml b/sci-libs/indilib-driver-mgen/metadata.xml
index a524ba6..91e70e7 100644
--- a/sci-libs/indilib-driver-mgen/metadata.xml
+++ b/sci-libs/indilib-driver-mgen/metadata.xml
@@ -5,12 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    This package provides the INDI driver for Lacerta MGen standalone autoguider. 
-  </longdescription>
   <upstream>
-        <doc lang="en">http://indilib.org/devices/</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-mi/Manifest b/sci-libs/indilib-driver-mi/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-mi/Manifest
+++ b/sci-libs/indilib-driver-mi/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-mi/indilib-driver-mi-1.7.5.ebuild b/sci-libs/indilib-driver-mi/indilib-driver-mi-1.8.3.ebuild
index 32349bc..83e45e1 100644
--- a/sci-libs/indilib-driver-mi/indilib-driver-mi-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-mi/indilib-driver-mi-1.8.3.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the Moravian MI CCD 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999"
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	sys-apps/fxload"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-mi/indilib-driver-mi-9999.ebuild b/sci-libs/indilib-driver-mi/indilib-driver-mi-9999.ebuild
index 2675bee..2ab2c67 100644
--- a/sci-libs/indilib-driver-mi/indilib-driver-mi-9999.ebuild
+++ b/sci-libs/indilib-driver-mi/indilib-driver-mi-9999.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for the Moravian MI CCD cameras"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999"
+DEPEND="~sci-libs/indilib-9999"
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	sys-apps/fxload"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-mi/metadata.xml b/sci-libs/indilib-driver-mi/metadata.xml
index c7f947e..3c8afbc 100644
--- a/sci-libs/indilib-driver-mi/metadata.xml
+++ b/sci-libs/indilib-driver-mi/metadata.xml
@@ -1,19 +1,13 @@
 <?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 Moravian CCD INDI driver for MI CCD cameras.
-  </longdescription>
-  <upstream>
-        <maintainer status="active">
-                <email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-        </maintainer>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
-        <remote-id type="github">indilib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-nexdome/Manifest b/sci-libs/indilib-driver-nexdome/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-nexdome/Manifest
+++ b/sci-libs/indilib-driver-nexdome/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-nexdome/indilib-driver-nexdome-1.7.5.ebuild b/sci-libs/indilib-driver-nexdome/indilib-driver-nexdome-1.7.5.ebuild
deleted file mode 100644
index b352f5b..0000000
--- a/sci-libs/indilib-driver-nexdome/indilib-driver-nexdome-1.7.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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 NexDome."
-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-nexdome/indilib-driver-nexdome-1.8.3.ebuild b/sci-libs/indilib-driver-nexdome/indilib-driver-nexdome-1.8.3.ebuild
new file mode 100644
index 0000000..e21488d
--- /dev/null
+++ b/sci-libs/indilib-driver-nexdome/indilib-driver-nexdome-1.8.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake eutils
+
+DESCRIPTION="INDI driver for NexDome"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="<sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-nexdome/indilib-driver-nexdome-9999.ebuild b/sci-libs/indilib-driver-nexdome/indilib-driver-nexdome-9999.ebuild
index 4cb6160..7a569bb 100644
--- a/sci-libs/indilib-driver-nexdome/indilib-driver-nexdome-9999.ebuild
+++ b/sci-libs/indilib-driver-nexdome/indilib-driver-nexdome-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
-DESCRIPTION="INDI driver for NexDome."
+DESCRIPTION="INDI driver for NexDome"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999"
+DEPEND="~sci-libs/indilib-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-nexdome/metadata.xml b/sci-libs/indilib-driver-nexdome/metadata.xml
index c2705e9..3c8afbc 100644
--- a/sci-libs/indilib-driver-nexdome/metadata.xml
+++ b/sci-libs/indilib-driver-nexdome/metadata.xml
@@ -1,15 +1,13 @@
 <?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>
-    INDI driver for NexDome.
-  </longdescription>
-  <upstream>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
-        <remote-id type="github">indilib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-nexstarevo/Manifest b/sci-libs/indilib-driver-nexstarevo/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-nexstarevo/Manifest
+++ b/sci-libs/indilib-driver-nexstarevo/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-nexstarevo/indilib-driver-nexstarevo-1.7.5.ebuild b/sci-libs/indilib-driver-nexstarevo/indilib-driver-nexstarevo-1.7.5.ebuild
deleted file mode 100644
index 949ed16..0000000
--- a/sci-libs/indilib-driver-nexstarevo/indilib-driver-nexstarevo-1.7.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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 Nexstar Evolution mounts"
-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-nexstarevo/indilib-driver-nexstarevo-1.8.3.ebuild b/sci-libs/indilib-driver-nexstarevo/indilib-driver-nexstarevo-1.8.3.ebuild
new file mode 100644
index 0000000..6d019fc
--- /dev/null
+++ b/sci-libs/indilib-driver-nexstarevo/indilib-driver-nexstarevo-1.8.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake eutils
+
+DESCRIPTION="Ths is INDI driver for Nexstar Evolution mounts"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="<sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-nexstarevo/indilib-driver-nexstarevo-9999.ebuild b/sci-libs/indilib-driver-nexstarevo/indilib-driver-nexstarevo-9999.ebuild
index 3017fe6..fd105d4 100644
--- a/sci-libs/indilib-driver-nexstarevo/indilib-driver-nexstarevo-9999.ebuild
+++ b/sci-libs/indilib-driver-nexstarevo/indilib-driver-nexstarevo-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for Nexstar Evolution mounts"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999"
+DEPEND="~sci-libs/indilib-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-nexstarevo/metadata.xml b/sci-libs/indilib-driver-nexstarevo/metadata.xml
index 8dcc839..3c8afbc 100644
--- a/sci-libs/indilib-driver-nexstarevo/metadata.xml
+++ b/sci-libs/indilib-driver-nexstarevo/metadata.xml
@@ -1,15 +1,13 @@
 <?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>
-    INDI driver for Nexstar Evolution mounts.
-  </longdescription>
-  <upstream>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
-        <remote-id type="github">indilib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-nightscape/Manifest b/sci-libs/indilib-driver-nightscape/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-nightscape/Manifest
+++ b/sci-libs/indilib-driver-nightscape/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-nightscape/indilib-driver-nightscape-1.7.5.ebuild b/sci-libs/indilib-driver-nightscape/indilib-driver-nightscape-1.7.5.ebuild
deleted file mode 100644
index 1c30888..0000000
--- a/sci-libs/indilib-driver-nightscape/indilib-driver-nightscape-1.7.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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 Nexstar Evolution mounts"
-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
-		dev-embedded/libftdi:1"
-
-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-nightscape/indilib-driver-nightscape-1.8.3.ebuild b/sci-libs/indilib-driver-nightscape/indilib-driver-nightscape-1.8.3.ebuild
new file mode 100644
index 0000000..337e0d8
--- /dev/null
+++ b/sci-libs/indilib-driver-nightscape/indilib-driver-nightscape-1.8.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake eutils
+
+DESCRIPTION="INDI driver for the Celestron Nightscape 8300 line of CCDs"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="<sci-libs/indilib-9999
+	dev-embedded/libftdi:1"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-nightscape/indilib-driver-nightscape-9999.ebuild b/sci-libs/indilib-driver-nightscape/indilib-driver-nightscape-9999.ebuild
index 1cdb7b0..d94bd58 100644
--- a/sci-libs/indilib-driver-nightscape/indilib-driver-nightscape-9999.ebuild
+++ b/sci-libs/indilib-driver-nightscape/indilib-driver-nightscape-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
-DESCRIPTION="INDI driver for Nexstar Evolution mounts"
+DESCRIPTION="INDI driver for the the Celestron Nightscape 8300 line of CCDs"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-		dev-embedded/libftdi:1"
+DEPEND="~sci-libs/indilib-9999
+	dev-embedded/libftdi:1"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-nightscape/metadata.xml b/sci-libs/indilib-driver-nightscape/metadata.xml
index db9a7ea..3c8afbc 100644
--- a/sci-libs/indilib-driver-nightscape/metadata.xml
+++ b/sci-libs/indilib-driver-nightscape/metadata.xml
@@ -1,15 +1,13 @@
 <?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>
-    INDI driver for Celestron Nightscape 8300 line of CCDs.
-  </longdescription>
-  <upstream>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
-        <remote-id type="github">indilib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-qhy/Manifest b/sci-libs/indilib-driver-qhy/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-qhy/Manifest
+++ b/sci-libs/indilib-driver-qhy/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-qhy/indilib-driver-qhy-1.7.5.ebuild b/sci-libs/indilib-driver-qhy/indilib-driver-qhy-1.8.3.ebuild
index b9d070b..b262c18 100644
--- a/sci-libs/indilib-driver-qhy/indilib-driver-qhy-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-qhy/indilib-driver-qhy-1.8.3.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils toolchain-funcs
+inherit cmake eutils toolchain-funcs
 
 DESCRIPTION="INDI driver for the QHY CCD 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
-		<sci-libs/libqhy-9999"
+	<sci-libs/libqhy-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-qhy/indilib-driver-qhy-9999.ebuild b/sci-libs/indilib-driver-qhy/indilib-driver-qhy-9999.ebuild
index 09c2377..2781a0e 100644
--- a/sci-libs/indilib-driver-qhy/indilib-driver-qhy-9999.ebuild
+++ b/sci-libs/indilib-driver-qhy/indilib-driver-qhy-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils toolchain-funcs
+inherit cmake git-r3 eutils toolchain-funcs
 
 DESCRIPTION="INDI driver the for QHY CCD cameras"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="LGPL-2 GPL-3 qhyccd"
+LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-		=sci-libs/libqhy-9999"
+DEPEND="~sci-libs/indilib-9999
+	~sci-libs/libqhy-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-qhy/metadata.xml b/sci-libs/indilib-driver-qhy/metadata.xml
index 3630c6b..91e70e7 100644
--- a/sci-libs/indilib-driver-qhy/metadata.xml
+++ b/sci-libs/indilib-driver-qhy/metadata.xml
@@ -5,18 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    This package provides QHY CCD INDI driver for QHY CCD and CMOS cameras.
-    Support list:
-    QHY5,QHY5II,QHY5LII,QHY5PII,QHY8L,QHY9S,QHY10,QHY11,QHY12,QHY21,QHY22,QHY23
-  </longdescription>
   <upstream>
-        <maintainer status="active">
-                <email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-        </maintainer>
-        <doc lang="en">http://indilib.org/devices/ccds/qhy.html</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-qsi/Manifest b/sci-libs/indilib-driver-qsi/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-qsi/Manifest
+++ b/sci-libs/indilib-driver-qsi/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-qsi/indilib-driver-qsi-1.7.5.ebuild b/sci-libs/indilib-driver-qsi/indilib-driver-qsi-1.8.3.ebuild
index 77f91a1..d37fa6f 100644
--- a/sci-libs/indilib-driver-qsi/indilib-driver-qsi-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-qsi/indilib-driver-qsi-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the Quantum Scientific Imaging CCDs & Filter Wheels"
 HOMEPAGE="http://indlib.org"
-SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}lib-${PV}.tar.gz"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
 	<sci-libs/libqsi-9999"
@@ -23,4 +23,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-qsi/indilib-driver-qsi-9999.ebuild b/sci-libs/indilib-driver-qsi/indilib-driver-qsi-9999.ebuild
index 992f690..61ab8e5 100644
--- a/sci-libs/indilib-driver-qsi/indilib-driver-qsi-9999.ebuild
+++ b/sci-libs/indilib-driver-qsi/indilib-driver-qsi-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for the Quantum Scientific Imaging CCDs & Filter Wheels"
 HOMEPAGE="http://indlib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-	=sci-libs/libqsi-9999"
+DEPEND="~sci-libs/indilib-9999
+	~sci-libs/libqsi-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-qsi/metadata.xml b/sci-libs/indilib-driver-qsi/metadata.xml
index dfe66a6..91e70e7 100644
--- a/sci-libs/indilib-driver-qsi/metadata.xml
+++ b/sci-libs/indilib-driver-qsi/metadata.xml
@@ -5,16 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    INDI QSI should be able to support all Quantum Scientific Imaging (QSI) 500/600 family of cameras and filter wheels in addition to autoguiding support, whenever applicable.
-  </longdescription>
   <upstream>
-	<maintainer status="active">
-                <email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-        </maintainer>
-        <doc lang="en">http://indilib.org/devices/ccds/qsi-ccd.html</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/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
deleted file mode 100644
index 7b723af..0000000
--- a/sci-libs/indilib-driver-radiosim/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
diff --git a/sci-libs/indilib-driver-radiosim/indilib-driver-radiosim-1.7.5.ebuild b/sci-libs/indilib-driver-radiosim/indilib-driver-radiosim-1.7.5.ebuild
deleted file mode 100644
index 4bc311e..0000000
--- a/sci-libs/indilib-driver-radiosim/indilib-driver-radiosim-1.7.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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
deleted file mode 100644
index a70cb87..0000000
--- a/sci-libs/indilib-driver-radiosim/indilib-driver-radiosim-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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-rtlsdr/Manifest b/sci-libs/indilib-driver-rtlsdr/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-rtlsdr/Manifest
+++ b/sci-libs/indilib-driver-rtlsdr/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-rtlsdr/indilib-driver-rtlsdr-1.7.5.ebuild b/sci-libs/indilib-driver-rtlsdr/indilib-driver-rtlsdr-1.8.3.ebuild
index 0bcce36..9ba5487 100644
--- a/sci-libs/indilib-driver-rtlsdr/indilib-driver-rtlsdr-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-rtlsdr/indilib-driver-rtlsdr-1.8.3.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the Realtek RTL2832U chip driven receivers"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
-        net-wireless/rtl-sdr
-        <sci-libs/libdspau-9999"
+	net-wireless/rtl-sdr"
 
 RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
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 3e643a2..227c92d 100644
--- a/sci-libs/indilib-driver-rtlsdr/indilib-driver-rtlsdr-9999.ebuild
+++ b/sci-libs/indilib-driver-rtlsdr/indilib-driver-rtlsdr-9999.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for the Realtek RTL2832U chip driven receivers"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-        net-wireless/rtl-sdr
-		=sci-libs/libdspau-9999"
+DEPEND="~sci-libs/indilib-9999
+	~net-wireless/rtl-sdr-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-rtlsdr/metadata.xml b/sci-libs/indilib-driver-rtlsdr/metadata.xml
index 0311ae8..91e70e7 100644
--- a/sci-libs/indilib-driver-rtlsdr/metadata.xml
+++ b/sci-libs/indilib-driver-rtlsdr/metadata.xml
@@ -5,12 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    This package provides the INDI driver for the Realtek RTL2832U chip driven receivers. 
-  </longdescription>
   <upstream>
-        <doc lang="en">http://indilib.org/devices</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-sbig/Manifest b/sci-libs/indilib-driver-sbig/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-sbig/Manifest
+++ b/sci-libs/indilib-driver-sbig/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-sbig/indilib-driver-sbig-1.7.5.ebuild b/sci-libs/indilib-driver-sbig/indilib-driver-sbig-1.8.3.ebuild
index 6ccfd0d..8016262 100644
--- a/sci-libs/indilib-driver-sbig/indilib-driver-sbig-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-sbig/indilib-driver-sbig-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the Santa Barbra Instruments Group line of CCDs & Filter Wheels"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
-LICENSE="LGPL-2 LGPL-2.1"
+LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
 	<sci-libs/libsbig-9999"
@@ -23,4 +23,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-sbig/indilib-driver-sbig-9999.ebuild b/sci-libs/indilib-driver-sbig/indilib-driver-sbig-9999.ebuild
index 629a402..03d9802 100644
--- a/sci-libs/indilib-driver-sbig/indilib-driver-sbig-9999.ebuild
+++ b/sci-libs/indilib-driver-sbig/indilib-driver-sbig-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for the Santa Barbra Instruments Group line of CCDs & Filter Wheels"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="LGPL-2 LGPL-2.1"
+LICENSE="LGPL-2"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-	=sci-libs/libsbig-9999"
+DEPEND="~sci-libs/indilib-9999
+	~sci-libs/libsbig-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-sbig/metadata.xml b/sci-libs/indilib-driver-sbig/metadata.xml
index ae51f5e..91e70e7 100644
--- a/sci-libs/indilib-driver-sbig/metadata.xml
+++ b/sci-libs/indilib-driver-sbig/metadata.xml
@@ -5,17 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    INDI SBIG driver should be able to support all SBIG family of CCDs/Guider and Filter wheels. Both USB and Parallel Port versions are supported.
-    There is prelimiary support for color CCDs, but not tested yet.
-  </longdescription>
   <upstream>
-        <maintainer status="active">
-                <email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-        </maintainer>
-        <doc lang="en">http://indilib.org/devices/ccds/sbig-ccd.html</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-shelyak/Manifest b/sci-libs/indilib-driver-shelyak/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-shelyak/Manifest
+++ b/sci-libs/indilib-driver-shelyak/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-shelyak/indilib-driver-shelyak-1.7.5.ebuild b/sci-libs/indilib-driver-shelyak/indilib-driver-shelyak-1.8.3.ebuild
index b5c40e7..8923d0e 100644
--- a/sci-libs/indilib-driver-shelyak/indilib-driver-shelyak-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-shelyak/indilib-driver-shelyak-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for Shelyak spectrographs"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
 	media-libs/libdc1394"
@@ -23,4 +23,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-shelyak/indilib-driver-shelyak-9999.ebuild b/sci-libs/indilib-driver-shelyak/indilib-driver-shelyak-9999.ebuild
index 3ca65be..76b7620 100644
--- a/sci-libs/indilib-driver-shelyak/indilib-driver-shelyak-9999.ebuild
+++ b/sci-libs/indilib-driver-shelyak/indilib-driver-shelyak-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver the for Shelyak spectrographs"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
+DEPEND="~sci-libs/indilib-9999
 	media-libs/libdc1394"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-shelyak/metadata.xml b/sci-libs/indilib-driver-shelyak/metadata.xml
index e03a264..3c8afbc 100644
--- a/sci-libs/indilib-driver-shelyak/metadata.xml
+++ b/sci-libs/indilib-driver-shelyak/metadata.xml
@@ -1,19 +1,13 @@
 <?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 indi driver for Shelyak spectrographs
-  </longdescription>
-  <upstream>
-        <maintainer status="active">
-                <email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-        </maintainer>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
-        <remote-id type="github">indilib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-spectracyber/Manifest b/sci-libs/indilib-driver-spectracyber/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-spectracyber/Manifest
+++ b/sci-libs/indilib-driver-spectracyber/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-spectracyber/indilib-driver-spectracyber-1.7.5.ebuild b/sci-libs/indilib-driver-spectracyber/indilib-driver-spectracyber-1.8.3.ebuild
index e127913..a7f6d32 100644
--- a/sci-libs/indilib-driver-spectracyber/indilib-driver-spectracyber-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-spectracyber/indilib-driver-spectracyber-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the Radio Astronomy Supplies' SpectraCyber spectrometer"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
-LICENSE="LGPL-2.1 GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999"
 
@@ -22,4 +22,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-spectracyber/indilib-driver-spectracyber-9999.ebuild b/sci-libs/indilib-driver-spectracyber/indilib-driver-spectracyber-9999.ebuild
index 02cca28..9eecc9d 100644
--- a/sci-libs/indilib-driver-spectracyber/indilib-driver-spectracyber-9999.ebuild
+++ b/sci-libs/indilib-driver-spectracyber/indilib-driver-spectracyber-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for the Radio Astronomy Supplies' SpectraCyber spectrometer"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="LGPL-2.1 GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999"
+DEPEND="~sci-libs/indilib-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-spectracyber/metadata.xml b/sci-libs/indilib-driver-spectracyber/metadata.xml
index 42c78d2..3c8afbc 100644
--- a/sci-libs/indilib-driver-spectracyber/metadata.xml
+++ b/sci-libs/indilib-driver-spectracyber/metadata.xml
@@ -1,19 +1,13 @@
 <?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 Radio Astronomy Supplies' SpectraCyber hydrogen line spectrometer. It supports all the functionality provided by the spectrometer including scanning continuum and spectral channels.
-  </longdescription>
-  <upstream>
-        <maintainer status="active">
-                <email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-        </maintainer>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
-        <remote-id type="github">indilib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-ssag/Manifest b/sci-libs/indilib-driver-ssag/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-ssag/Manifest
+++ b/sci-libs/indilib-driver-ssag/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-ssag/indilib-driver-ssag-1.7.5.ebuild b/sci-libs/indilib-driver-ssag/indilib-driver-ssag-1.8.3.ebuild
index 4336d52..1b3b077 100644
--- a/sci-libs/indilib-driver-ssag/indilib-driver-ssag-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-ssag/indilib-driver-ssag-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the Orion StarShoot Autoguider"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
-LICENSE="openssag GPL-2"
+LICENSE="openssag"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999
 	media-libs/libdc1394"
@@ -23,4 +23,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-ssag/indilib-driver-ssag-9999.ebuild b/sci-libs/indilib-driver-ssag/indilib-driver-ssag-9999.ebuild
index 944cf62..aa85238 100644
--- a/sci-libs/indilib-driver-ssag/indilib-driver-ssag-9999.ebuild
+++ b/sci-libs/indilib-driver-ssag/indilib-driver-ssag-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver the for the Orion StarShoot Autoguider"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="openssag GPL-2"
+LICENSE="openssag"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
+DEPEND="~sci-libs/indilib-9999
 	media-libs/libdc1394"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-ssag/metadata.xml b/sci-libs/indilib-driver-ssag/metadata.xml
index 6495b83..3c8afbc 100644
--- a/sci-libs/indilib-driver-ssag/metadata.xml
+++ b/sci-libs/indilib-driver-ssag/metadata.xml
@@ -1,23 +1,13 @@
 <?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 INDI driver for the Orion StarShoot Autoguider.
-  </longdescription>
-  <upstream>
-        <maintainer status="active">
-        <email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-        </maintainer>
-	<maintainer status="active">
-		<email>eric@ejholmes.net</email>
-		<name>Eric Holmes</name>
-	</maintainer>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
-        <remote-id type="github">indilib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-starbook/Manifest b/sci-libs/indilib-driver-starbook/Manifest
new file mode 100644
index 0000000..2def209
--- /dev/null
+++ b/sci-libs/indilib-driver-starbook/Manifest
@@ -0,0 +1 @@
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-starbook/indilib-driver-starbook-1.8.3.ebuild b/sci-libs/indilib-driver-starbook/indilib-driver-starbook-1.8.3.ebuild
new file mode 100644
index 0000000..9b4a7c6
--- /dev/null
+++ b/sci-libs/indilib-driver-starbook/indilib-driver-starbook-1.8.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake eutils
+
+DESCRIPTION="INDI driver for the Vixen Starbook telescope controllers"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="<sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-starbook/indilib-driver-starbook-9999.ebuild b/sci-libs/indilib-driver-starbook/indilib-driver-starbook-9999.ebuild
new file mode 100644
index 0000000..4bb34cd
--- /dev/null
+++ b/sci-libs/indilib-driver-starbook/indilib-driver-starbook-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 eutils
+
+DESCRIPTION="INDI driver for the Vixen Starbook telescope controllers"
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+
+SLOT="0/1"
+
+DEPEND="~sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-starbook/metadata.xml b/sci-libs/indilib-driver-starbook/metadata.xml
new file mode 100644
index 0000000..1c3cec2
--- /dev/null
+++ b/sci-libs/indilib-driver-starbook/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-sx/Manifest b/sci-libs/indilib-driver-sx/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-sx/Manifest
+++ b/sci-libs/indilib-driver-sx/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-sx/indilib-driver-sx-1.7.5.ebuild b/sci-libs/indilib-driver-sx/indilib-driver-sx-1.8.3.ebuild
index fa2f12a..8ae0e41 100644
--- a/sci-libs/indilib-driver-sx/indilib-driver-sx-1.7.5.ebuild
+++ b/sci-libs/indilib-driver-sx/indilib-driver-sx-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN%%lib-driver-**}"
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 DESCRIPTION="INDI driver for the SX astronomical equipement"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
-LICENSE="GPL-2 cloudmakers"
+LICENSE="LGPL-2 cloudmakers"
 KEYWORDS="~amd64 ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="<sci-libs/indilib-9999"
 
@@ -22,4 +22,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-sx/indilib-driver-sx-9999.ebuild b/sci-libs/indilib-driver-sx/indilib-driver-sx-9999.ebuild
index 231e15b..9495e24 100644
--- a/sci-libs/indilib-driver-sx/indilib-driver-sx-9999.ebuild
+++ b/sci-libs/indilib-driver-sx/indilib-driver-sx-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="INDI driver for the SX astronomical equipement"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="GPL-2 cloudmakers"
+LICENSE="LGPL-2 cloudmakers"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999"
+DEPEND="~sci-libs/indilib-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-sx/metadata.xml b/sci-libs/indilib-driver-sx/metadata.xml
index 40c40e6..91e70e7 100644
--- a/sci-libs/indilib-driver-sx/metadata.xml
+++ b/sci-libs/indilib-driver-sx/metadata.xml
@@ -5,18 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    The driver supports all Starlight Xpress CCDs, including autoguiders such as Lodestar. You can take exposures, set frame type and dimensions, and control temperature and cooler when applicable.
-    The driver supports Starlight Xpress Universal Filter Wheel with both 5 or 7 filter plates installed and controlled by USB (HID) communication protocol is supported (serial connection is not supported).
-    The driver supports Starlight Xpress AOLF Active Optics controlled by serial mode command set (parallel mode command set is not supported). Unit can be connected directly to serial port or via usb-to-serial adapter.
-  </longdescription>
   <upstream>
-        <maintainer status="active">
-            <email>info@cloudmakers.eu</email>
-            <name>Peter Polakovic</name>
-        </maintainer>
-        <doc lang="en">http://indilib.org/devices/</doc>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-driver-talon6/Manifest b/sci-libs/indilib-driver-talon6/Manifest
new file mode 100644
index 0000000..2def209
--- /dev/null
+++ b/sci-libs/indilib-driver-talon6/Manifest
@@ -0,0 +1 @@
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-talon6/indilib-driver-talon6-1.8.3.ebuild b/sci-libs/indilib-driver-talon6/indilib-driver-talon6-1.8.3.ebuild
new file mode 100644
index 0000000..c94c1d8
--- /dev/null
+++ b/sci-libs/indilib-driver-talon6/indilib-driver-talon6-1.8.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake eutils
+
+DESCRIPTION="INDI driver for TALON6 Roll Off Roof"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="<sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-talon6/indilib-driver-talon6-9999.ebuild b/sci-libs/indilib-driver-talon6/indilib-driver-talon6-9999.ebuild
new file mode 100644
index 0000000..9155e8e
--- /dev/null
+++ b/sci-libs/indilib-driver-talon6/indilib-driver-talon6-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 eutils
+
+DESCRIPTION="INDI driver for TALON6 Roll Off Roof"
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+
+SLOT="0/1"
+
+DEPEND="~sci-libs/indilib-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-talon6/metadata.xml b/sci-libs/indilib-driver-talon6/metadata.xml
new file mode 100644
index 0000000..3c8afbc
--- /dev/null
+++ b/sci-libs/indilib-driver-talon6/metadata.xml
@@ -0,0 +1,13 @@
+<?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>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-toupbase/Manifest b/sci-libs/indilib-driver-toupbase/Manifest
new file mode 100644
index 0000000..2def209
--- /dev/null
+++ b/sci-libs/indilib-driver-toupbase/Manifest
@@ -0,0 +1 @@
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-toupbase/indilib-driver-toupbase-1.8.3.ebuild b/sci-libs/indilib-driver-toupbase/indilib-driver-toupbase-1.8.3.ebuild
new file mode 100644
index 0000000..dabcc2b
--- /dev/null
+++ b/sci-libs/indilib-driver-toupbase/indilib-driver-toupbase-1.8.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake eutils
+
+DESCRIPTION="INDI driver for the Touptek cameras"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="<sci-libs/indilib-9999
+	<sci-libs/libtoupcam-9999
+	<sci-libs/libaltaircam-9999
+	<sci-libs/libstarshootg-9999
+	<sci-libs/libnncam-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-toupbase/indilib-driver-toupbase-9999.ebuild b/sci-libs/indilib-driver-toupbase/indilib-driver-toupbase-9999.ebuild
new file mode 100644
index 0000000..b904772
--- /dev/null
+++ b/sci-libs/indilib-driver-toupbase/indilib-driver-toupbase-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 eutils
+
+DESCRIPTION="INDI driver for the Touptek cameras."
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2"
+KEYWORDS=""
+
+SLOT="0/1"
+
+DEPEND="~sci-libs/indilib-9999
+	~sci-libs/libtoupcam-9999
+	~sci-libs/libaltaircam-9999
+	~sci-libs/libstarshootg-9999
+	~sci-libs/libnncam-9999"
+
+RDEPEND="${DEPEND}"
+
+INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-toupbase/metadata.xml b/sci-libs/indilib-driver-toupbase/metadata.xml
new file mode 100644
index 0000000..3c8afbc
--- /dev/null
+++ b/sci-libs/indilib-driver-toupbase/metadata.xml
@@ -0,0 +1,13 @@
+<?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>	
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-toupcam/Manifest b/sci-libs/indilib-driver-toupcam/Manifest
deleted file mode 100644
index 7b723af..0000000
--- a/sci-libs/indilib-driver-toupcam/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
diff --git a/sci-libs/indilib-driver-toupcam/indilib-driver-toupcam-1.7.5.ebuild b/sci-libs/indilib-driver-toupcam/indilib-driver-toupcam-1.7.5.ebuild
deleted file mode 100644
index b0b1f6f..0000000
--- a/sci-libs/indilib-driver-toupcam/indilib-driver-toupcam-1.7.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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 the Touptek 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="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-DEPEND="<sci-libs/indilib-9999
-		<sci-libs/libtoupcam-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-toupcam/indilib-driver-toupcam-9999.ebuild b/sci-libs/indilib-driver-toupcam/indilib-driver-toupcam-9999.ebuild
deleted file mode 100644
index 0d009f8..0000000
--- a/sci-libs/indilib-driver-toupcam/indilib-driver-toupcam-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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 Touptek cameras."
-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
-		=sci-libs/libtoupcam-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-webcam/Manifest b/sci-libs/indilib-driver-webcam/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/indilib-driver-webcam/Manifest
+++ b/sci-libs/indilib-driver-webcam/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/indilib-driver-webcam/indilib-driver-webcam-1.7.5.ebuild b/sci-libs/indilib-driver-webcam/indilib-driver-webcam-1.7.5.ebuild
deleted file mode 100644
index 37ed19e..0000000
--- a/sci-libs/indilib-driver-webcam/indilib-driver-webcam-1.7.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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 Nexstar Evolution mounts"
-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
-		virtual/ffmpeg"
-
-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-webcam/indilib-driver-webcam-1.8.3.ebuild b/sci-libs/indilib-driver-webcam/indilib-driver-webcam-1.8.3.ebuild
new file mode 100644
index 0000000..f5240b6
--- /dev/null
+++ b/sci-libs/indilib-driver-webcam/indilib-driver-webcam-1.8.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%%lib-driver-**}"
+
+inherit cmake eutils
+
+DESCRIPTION="INDI driver for various types of webcameras"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="<sci-libs/indilib-9999
+	virtual/ffmpeg"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-webcam/indilib-driver-webcam-9999.ebuild b/sci-libs/indilib-driver-webcam/indilib-driver-webcam-9999.ebuild
index eaf2bb5..2376296 100644
--- a/sci-libs/indilib-driver-webcam/indilib-driver-webcam-9999.ebuild
+++ b/sci-libs/indilib-driver-webcam/indilib-driver-webcam-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
-DESCRIPTION="INDI driver for Nexstar Evolution mounts"
+DESCRIPTION="INDI driver for various types of webcameras"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="=sci-libs/indilib-9999
-		virtual/ffmpeg"
+DEPEND="~sci-libs/indilib-9999
+	virtual/ffmpeg"
 
 RDEPEND="${DEPEND}"
 
 INDI_GIT_DIR="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${INDI_GIT_DIR}"
+S="${EGIT_CHECKOUT_DIR}/${INDI_GIT_DIR}"
diff --git a/sci-libs/indilib-driver-webcam/metadata.xml b/sci-libs/indilib-driver-webcam/metadata.xml
index e0ff67e..1c3cec2 100644
--- a/sci-libs/indilib-driver-webcam/metadata.xml
+++ b/sci-libs/indilib-driver-webcam/metadata.xml
@@ -1,15 +1,13 @@
 <?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>
-    INDI driver for web cams through ffmpeg library.
-  </longdescription>
-  <upstream>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
-        <remote-id type="github">indilib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>
+	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indilib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib-drivers/indilib-drivers-1.7.5.ebuild b/sci-libs/indilib-drivers/indilib-drivers-1.8.3.ebuild
index 9a7437d..4c6f29e 100644
--- a/sci-libs/indilib-drivers/indilib-drivers-1.7.5.ebuild
+++ b/sci-libs/indilib-drivers/indilib-drivers-1.8.3.ebuild
@@ -1,22 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Metapackage containing all 3rdparty drivers for INDI library"
 HOMEPAGE="http://www.indilib.org/"
 SRC_URI=""
 
 LICENSE="metapackage"
-SLOT="0"
+SLOT="0/1"
 KEYWORDS="~amd64 ~x86"
 
 IUSE_INDILIB_DRIVERS="
 	aagcloudwatcher
-	altaircam
+	aagcloudwatcherng
 	apogee
 	armadillo
+	astromechfoc
 	asi
+	atik
+	avalon
+	beefocus
+	dreamfocuser
 	dsi
 	duino
 	eqmod
@@ -37,24 +42,30 @@ IUSE_INDILIB_DRIVERS="
 	nightscape
 	qhy
 	qsi
-	radiosim
 	rtlsdr
 	sbig
 	shelyak
 	spectracyber
 	ssag
+	starbook
 	sx
-	toupcam
+	talon6
+	toupbase
 	webcam
 	"
 
 IUSE="${IUSE_INDILIB_DRIVERS}"
 
-PDEPEND="aagcloudwatcher? ( sci-libs/indilib-driver-aagcloudwatcher )
-	altaircam? ( sci-libs/indilib-driver-altaircam )
+RDEPEND="aagcloudwatcher? ( sci-libs/indilib-driver-aagcloudwatcher )
+	aagcloudwatcherng? ( sci-libs/indilib-driver-aagcloudwatcher-ng )
 	apogee? ( sci-libs/indilib-driver-apogee )
 	armadillo? ( sci-libs/indilib-driver-armadillo )
+	astromechfoc? ( sci-libs/indilib-driver-astromechfoc )
 	asi? ( sci-libs/indilib-driver-asi )
+	atik? ( sci-libs/indilib-driver-atik )
+	avalon? ( sci-libs/indilib-driver-avalon )
+	beefocus? ( sci-libs/indilib-driver-beefocus )
+	dreamfocuser? ( sci-libs/indilib-driver-dreamfocuser )
 	dsi? ( sci-libs/indilib-driver-dsi )
 	duino? ( sci-libs/indilib-driver-duino )
 	eqmod? ( sci-libs/indilib-driver-eqmod )
@@ -75,12 +86,13 @@ PDEPEND="aagcloudwatcher? ( sci-libs/indilib-driver-aagcloudwatcher )
 	nightscape? ( sci-libs/indilib-driver-nightscape )
 	qhy? ( sci-libs/indilib-driver-qhy )
 	qsi? ( sci-libs/indilib-driver-qsi )
-	radiosim? ( sci-libs/indilib-driver-radiosim )
 	rtlsdr? ( sci-libs/indilib-driver-rtlsdr )
 	sbig? ( sci-libs/indilib-driver-sbig )
 	shelyak? ( sci-libs/indilib-driver-shelyak )
 	spectracyber? ( sci-libs/indilib-driver-spectracyber )
 	ssag? ( sci-libs/indilib-driver-ssag )
+	starbook? ( sci-libs/indilib-driver-starbook )
 	sx? ( sci-libs/indilib-driver-sx )
-	toupcam? ( sci-libs/indilib-driver-toupcam )
+	talon6? ( sci-libs/indilib-driver-talon6 )
+	toupbase? ( sci-libs/indilib-driver-toupbase )
 	webcam? ( sci-libs/indilib-driver-webcam )"
diff --git a/sci-libs/indilib-drivers/indilib-drivers-9999.ebuild b/sci-libs/indilib-drivers/indilib-drivers-9999.ebuild
index 444d78a..3a1b079 100644
--- a/sci-libs/indilib-drivers/indilib-drivers-9999.ebuild
+++ b/sci-libs/indilib-drivers/indilib-drivers-9999.ebuild
@@ -1,22 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Metapackage containing all 3rdparty drivers for INDI library"
 HOMEPAGE="http://www.indilib.org/"
 SRC_URI=""
 
 LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="-amd64 -x86 -arm"
+SLOT="0/1"
+KEYWORDS="-amd64 -arm -x86"
 
 IUSE_INDILIB_DRIVERS="
 	aagcloudwatcher
-	altaircam
+	aagcloudwatcherng
 	apogee
 	armadillo
+	astromechfoc
 	asi
+	atik
+	avalon
+	beefocus
+	dreamfocuser
 	dsi
 	duino
 	eqmod
@@ -37,24 +42,30 @@ IUSE_INDILIB_DRIVERS="
 	nightscape
 	qhy
 	qsi
-	radiosim
 	rtlsdr
 	sbig
 	shelyak
 	spectracyber
 	ssag
+	starbook
 	sx
-	toupcam
+	talon6
+	toupbase
 	webcam
 	"
 
 IUSE="${IUSE_INDILIB_DRIVERS}"
 
-PDEPEND="aagcloudwatcher? ( sci-libs/indilib-driver-aagcloudwatcher )
-	altaircam? ( sci-libs/indilib-driver-altaircam )
+RDEPEND="aagcloudwatcher? ( sci-libs/indilib-driver-aagcloudwatcher )
+	aagcloudwatcherng? ( sci-libs/indilib-driver-aagcloudwatcher-ng )
 	apogee? ( sci-libs/indilib-driver-apogee )
 	armadillo? ( sci-libs/indilib-driver-armadillo )
+	astromechfoc? ( sci-libs/indilib-driver-astromechfoc )
 	asi? ( sci-libs/indilib-driver-asi )
+	atik? ( sci-libs/indilib-driver-atik )
+	avalon? ( sci-libs/indilib-driver-avalon )
+	beefocus? ( sci-libs/indilib-driver-beefocus )
+	dreamfocuser? ( sci-libs/indilib-driver-dreamfocuser )
 	dsi? ( sci-libs/indilib-driver-dsi )
 	duino? ( sci-libs/indilib-driver-duino )
 	eqmod? ( sci-libs/indilib-driver-eqmod )
@@ -75,12 +86,13 @@ PDEPEND="aagcloudwatcher? ( sci-libs/indilib-driver-aagcloudwatcher )
 	nightscape? ( sci-libs/indilib-driver-nightscape )
 	qhy? ( sci-libs/indilib-driver-qhy )
 	qsi? ( sci-libs/indilib-driver-qsi )
-	radiosim? ( sci-libs/indilib-driver-radiosim )
 	rtlsdr? ( sci-libs/indilib-driver-rtlsdr )
 	sbig? ( sci-libs/indilib-driver-sbig )
 	shelyak? ( sci-libs/indilib-driver-shelyak )
 	spectracyber? ( sci-libs/indilib-driver-spectracyber )
 	ssag? ( sci-libs/indilib-driver-ssag )
+	starbook? ( sci-libs/indilib-driver-starbook )
 	sx? ( sci-libs/indilib-driver-sx )
-	toupcam? ( sci-libs/indilib-driver-toupcam )
+	talon6? ( sci-libs/indilib-driver-talon6 )
+	toupbase? ( sci-libs/indilib-driver-toupbase )
 	webcam? ( sci-libs/indilib-driver-webcam )"
diff --git a/sci-libs/indilib-drivers/metadata.xml b/sci-libs/indilib-drivers/metadata.xml
index 13cc890..cf1a58e 100644
--- a/sci-libs/indilib-drivers/metadata.xml
+++ b/sci-libs/indilib-drivers/metadata.xml
@@ -1,51 +1,58 @@
 <?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>
-    Meta ebuild for installation of indilib.org's 3rd party drivers. Works like <pkg>x11-base/xorg-servers</pkg>.
-  </longdescription>
-  <use>
-	<flag name="aagcloudwatcher">Installs <pkg>sci-libs/indilib-driver-aagcloudwatcher</pkg></flag>
-	<flag name="altaircam">Installs <pkg>sci-libs/indilib-driver-altaircam</pkg></flag>
-	<flag name="apogee">Installs <pkg>sci-libs/indilib-driver-apogee</pkg></flag>
-	<flag name="armadillo">Installs <pkg>sci-libs/indilib-driver-armadillo</pkg></flag>
-	<flag name="asi">Installs <pkg>sci-libs/indilib-driver-asi</pkg></flag>
-    <flag name="dsi">Installs <pkg>sci-libs/indilib-driver-dsi</pkg></flag>
-	<flag name="duino">Installs <pkg>sci-libs/indilib-driver-duino</pkg></flag>
-	<flag name="eqmod">Installs <pkg>sci-libs/indilib-driver-eqmod</pkg></flag>
-	<flag name="ffmv">Installs <pkg>sci-libs/indilib-driver-ffmv</pkg></flag>
-	<flag name="fishcamp">Installs <pkg>sci-libs/indilib-driver-fishcamp</pkg></flag>
-	<flag name="fli">Installs <pkg>sci-libs/indilib-driver-fli</pkg></flag>
-	<flag name="gige">Installs <pkg>sci-libs/indilib-driver-gige</pkg></flag>
-    <flag name="gphoto2">Installs <pkg>sci-libs/indilib-driver-gphoto</pkg></flag>
-    <flag name="gpsd">Installs <pkg>sci-libs/indilib-driver-gpsd</pkg></flag>
-	<flag name="gpsnmea">Installs <pkg>sci-libs/indilib-driver-gpsnmea</pkg></flag>
-	<flag name="limesdr">Installs <pkg>sci-libs/indilib-driver-limesdr</pkg></flag>
-	<flag name="inovaplx">Installs <pkg>sci-libs/indilib-driver-inovaplx</pkg></flag>
-	<flag name="maxdomeii">Installs <pkg>sci-libs/indilib-driver-maxdomeii</pkg></flag>
-	<flag name="mgen">Installs <pkg>sci-libs/indilib-driver-mgen</pkg></flag>
-	<flag name="mi">Installs <pkg>sci-libs/indilib-driver-mi</pkg></flag>
-	<flag name="nexdome">Installs <pkg>sci-libs/indilib-driver-nexdome</pkg></flag>
-	<flag name="nexstarevo">Installs <pkg>sci-libs/indilib-driver-nexstarevo</pkg></flag>
-	<flag name="nightscape">Installs <pkg>sci-libs/indilib-driver-nightscape</pkg></flag>
-	<flag name="qhy">Installs <pkg>sci-libs/indilib-driver-qhy</pkg></flag>
-	<flag name="qsi">Installs <pkg>sci-libs/indilib-driver-qsi</pkg></flag>
-	<flag name="radiosim">Installs <pkg>sci-libs/indilib-driver-radiosim</pkg></flag>
-	<flag name="rtlsdr">Installs <pkg>sci-libs/indilib-driver-rtlsdr</pkg></flag>
-	<flag name="sbig">Installs <pkg>sci-libs/indilib-driver-sbig</pkg></flag>
-	<flag name="shelyak">Installs <pkg>sci-libs/indilib-driver-shelyak</pkg></flag>
-	<flag name="spectracyber">Installs <pkg>sci-libs/indilib-driver-spectracyber</pkg></flag>
-	<flag name="ssag">Installs <pkg>sci-libs/indilib-driver-ssag</pkg></flag>
-	<flag name="sx">Installs <pkg>sci-libs/indilib-driver-sx</pkg></flag>
-	<flag name="toupcam">Installs <pkg>sci-libs/indilib-driver-toupcam</pkg></flag>
-	<flag name="webcam">Installs <pkg>sci-libs/indilib-driver-webcam</pkg></flag>
-  </use>
-  <upstream>
-        <bugs-to>http://sourceforge.net/p/indi/bugs/</bugs-to>
-        <remote-id type="sourceforge">indi</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<longdescription>
+		Meta ebuild for installation of indilib.org's 3rd party drivers. Works like <pkg>x11-base/xorg-servers</pkg>.
+	</longdescription>
+	<use>
+		<flag name="aagcloudwatcher">Installs <pkg>sci-libs/indilib-driver-aagcloudwatcher</pkg></flag>
+		<flag name="aagcloudwatcherng">Installs <pkg>sci-libs/indilib-driver-aagcloudwatcherng</pkg></flag>
+		<flag name="apogee">Installs <pkg>sci-libs/indilib-driver-apogee</pkg></flag>
+		<flag name="armadillo">Installs <pkg>sci-libs/indilib-driver-armadillo</pkg></flag>
+		<flag name="astromechfoc">Installs <pkg>sci-libs/indilib-driver-armadillo</pkg></flag>
+		<flag name="asi">Installs <pkg>sci-libs/indilib-driver-asi</pkg></flag>
+		<flag name="atik">Installs <pkg>sci-libs/indilib-driver-atik</pkg></flag>
+		<flag name="avalon">Installs <pkg>sci-libs/indilib-driver-avalon</pkg></flag>
+		<flag name="beefocus">Installs <pkg>sci-libs/indilib-driver-beefocus</pkg></flag>
+		<flag name="dreamfocuser">Installs <pkg>sci-libs/indilib-driver-dreamfocuser</pkg></flag>
+		<flag name="dsi">Installs <pkg>sci-libs/indilib-driver-dsi</pkg></flag>
+		<flag name="duino">Installs <pkg>sci-libs/indilib-driver-duino</pkg></flag>
+		<flag name="eqmod">Installs <pkg>sci-libs/indilib-driver-eqmod</pkg></flag>
+		<flag name="ffmv">Installs <pkg>sci-libs/indilib-driver-ffmv</pkg></flag>
+		<flag name="fishcamp">Installs <pkg>sci-libs/indilib-driver-fishcamp</pkg></flag>
+		<flag name="fli">Installs <pkg>sci-libs/indilib-driver-fli</pkg></flag>
+		<flag name="gige">Installs <pkg>sci-libs/indilib-driver-gige</pkg></flag>
+		<flag name="gphoto2">Installs <pkg>sci-libs/indilib-driver-gphoto</pkg></flag>
+		<flag name="gpsd">Installs <pkg>sci-libs/indilib-driver-gpsd</pkg></flag>
+		<flag name="gpsnmea">Installs <pkg>sci-libs/indilib-driver-gpsnmea</pkg></flag>
+		<flag name="limesdr">Installs <pkg>sci-libs/indilib-driver-limesdr</pkg></flag>
+		<flag name="inovaplx">Installs <pkg>sci-libs/indilib-driver-inovaplx</pkg></flag>
+		<flag name="maxdomeii">Installs <pkg>sci-libs/indilib-driver-maxdomeii</pkg></flag>
+		<flag name="mgen">Installs <pkg>sci-libs/indilib-driver-mgen</pkg></flag>
+		<flag name="mi">Installs <pkg>sci-libs/indilib-driver-mi</pkg></flag>
+		<flag name="nexdome">Installs <pkg>sci-libs/indilib-driver-nexdome</pkg></flag>
+		<flag name="nexstarevo">Installs <pkg>sci-libs/indilib-driver-nexstarevo</pkg></flag>
+		<flag name="nightscape">Installs <pkg>sci-libs/indilib-driver-nightscape</pkg></flag>
+		<flag name="qhy">Installs <pkg>sci-libs/indilib-driver-qhy</pkg></flag>
+		<flag name="qsi">Installs <pkg>sci-libs/indilib-driver-qsi</pkg></flag>
+		<flag name="rtlsdr">Installs <pkg>sci-libs/indilib-driver-rtlsdr</pkg></flag>
+		<flag name="sbig">Installs <pkg>sci-libs/indilib-driver-sbig</pkg></flag>
+		<flag name="shelyak">Installs <pkg>sci-libs/indilib-driver-shelyak</pkg></flag>
+		<flag name="spectracyber">Installs <pkg>sci-libs/indilib-driver-spectracyber</pkg></flag>
+		<flag name="ssag">Installs <pkg>sci-libs/indilib-driver-ssag</pkg></flag>
+		<flag name="starbook">Installs <pkg>sci-libs/indilib-driver-starbook</pkg></flag>
+		<flag name="sx">Installs <pkg>sci-libs/indilib-driver-sx</pkg></flag>
+		<flag name="talon6">Installs <pkg>sci-libs/indilib-driver-talon6</pkg></flag>
+		<flag name="toupbase">Installs <pkg>sci-libs/indilib-driver-toupbase</pkg></flag>
+		<flag name="webcam">Installs <pkg>sci-libs/indilib-driver-webcam</pkg></flag>
+	</use>
+ 	<upstream>
+		<doc lang="en">http://indilib.org/</doc>
+		<bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+		<remote-id type="github">indi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 7b723af..cba7754 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-1.8.3.tar.gz 2062250 SHA256 ba311cff1bb195dd327135ea154f208269538111cba846b262f038c7eab87b0a SHA512 09c23299659efea795ec430566a5b51181878c382c72f1e530ef3abe3b996b670506f6f5f1bca4eb88fbdc756854c3a36d8bd646a2cf13e397e09ace1f1af044 WHIRLPOOL 1d0563b9aeb70ffd99070795378695354c56a0da42d9e3947510a25d23075e00b867533b80bf4c9d7bed88ae1d3564e01104cd314e0dd24e5b343760eea1964d
diff --git a/sci-libs/indilib/indilib-1.7.5.ebuild b/sci-libs/indilib/indilib-1.8.3.ebuild
index 2d673bf..1b10ac4 100644
--- a/sci-libs/indilib/indilib-1.7.5.ebuild
+++ b/sci-libs/indilib/indilib-1.8.3.ebuild
@@ -1,44 +1,46 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="${PN/lib/}"
 
-inherit cmake-utils udev user
+inherit cmake udev user
 
 DESCRIPTION="INDI Astronomical Control Protocol library"
 HOMEPAGE="http://www.indilib.org/"
 SRC_URI="https://github.com/${PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
 
-LICENSE="LGPL-2.1+ BSD GPL-2+ LGPL-2+"
-SLOT="0"
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
+SLOT="0/1"
 KEYWORDS="~amd64 ~x86"
-IUSE="ogg test drivers qt5"
+IUSE="ogg test drivers qt5 websocket"
 
 RDEPEND="
-	sci-libs/cfitsio
-	sci-libs/libnova
-	sci-libs/gsl
+	sci-libs/cfitsio:=
+	sci-libs/fftw:3.0=
+	sci-libs/libnova:=
+	sci-libs/gsl:=
 	sys-libs/zlib
 	virtual/jpeg:0
-	virtual/libusb:1
+	virtual/libusb:0
 	net-misc/curl
 	qt5? ( dev-qt/qtnetwork:5 )
 	ogg? (
-				media-libs/libogg
-				media-libs/libtheora
-        )
+		media-libs/libogg
+		media-libs/libtheora
+	)
+	websocket? ( dev-libs/boost:= )
 "
 DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
+	kernel_linux? ( sys-kernel/linux-headers )
 	drivers? ( sci-libs/indilib-drivers )
-	test? (
-				dev-cpp/gmock
-				dev-cpp/gtest
-        )
+	test? (	>=dev-cpp/gtest-1.8.0 )
+	websocket? ( dev-cpp/websocketpp )
 "
 
+RESTRICT="!test? ( test )"
+
 DOCS=( AUTHORS ChangeLog README )
 
 S=${WORKDIR}/${MY_PN}-${PV}/libindi
@@ -47,20 +49,25 @@ src_configure() {
 	local mycmakeargs=(
 		-DUDEVRULES_INSTALL_DIR=$(get_udevdir)/rules.d
 		-DINDI_BUILD_UNITTESTS=$(usex test)
-		$(cmake-utils_use qt5 INDI_BUILD_QT5_CLIENT)
-		$(cmake-utils_use_find_package ogg OggTheora)
+		-DINDI_BUILD_QT5_CLIENT=$(usex qt5)
+		$(cmake_use_find_package ogg OggTheora)
+		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newinitd "${FILESDIR}/indiserver.sh" indiserver
 	newconfd "${FILESDIR}/indiserver.conf" indiserver
 }
 
+src_test() {
+	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
+}
+
 pkg_postinst() {
-        enewgroup indiserver
+	enewgroup indiserver
 	enewuser indiserver -1 -1 -1 "usb,uucp,video,indiserver"
 	elog "You can use init script in /etc/init.d/indiserver to start"
 	elog "indiserver automatically."
diff --git a/sci-libs/indilib/indilib-9999.ebuild b/sci-libs/indilib/indilib-9999.ebuild
index 9a0ae4b..7f3b090 100644
--- a/sci-libs/indilib/indilib-9999.ebuild
+++ b/sci-libs/indilib/indilib-9999.ebuild
@@ -1,35 +1,47 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 udev user
+inherit cmake git-r3 udev user
 
 DESCRIPTION="INDI Astronomical Control Protocol library"
 HOMEPAGE="http://indi.sourceforge.net/index.php/Main_Page"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="LGPL-2"
-SLOT="0"
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
+SLOT="0/1"
 KEYWORDS=""
-IUSE="drivers qt5"
+IUSE="ogg test drivers qt5 websocket"
 
 RDEPEND="
-	sci-libs/cfitsio
-	sci-libs/libnova
-	sci-libs/gsl
+	sci-libs/cfitsio:=
+	sci-libs/fftw:3.0=
+	sci-libs/libnova:=
+	sci-libs/gsl:=
 	sys-libs/zlib
 	virtual/jpeg:0
-	virtual/libusb:1
+	virtual/libusb:0
+	net-misc/curl
 	qt5? ( dev-qt/qtnetwork:5 )
-"
+	ogg? (
+		media-libs/libogg
+		media-libs/libtheora
+	)
+	websocket? ( dev-libs/boost:= )"
 
 DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
+	kernel_linux? ( sys-kernel/linux-headers )
 	drivers? ( sci-libs/indilib-drivers )
+	test? ( >=dev-cpp/gtest-1.8.0 )
+	websocket? ( dev-cpp/websocketpp )
 "
 
+RESTRICT="!test? ( test )"
+
+DOCS=( AUTHORS ChangeLog README )
+
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 S="${EGIT_CHECKOUT_DIR}/libindi"
@@ -37,20 +49,26 @@ S="${EGIT_CHECKOUT_DIR}/libindi"
 src_configure() {
 	local mycmakeargs=(
 		-DUDEVRULES_INSTALL_DIR=$(get_udevdir)/rules.d
-		$(cmake-utils_use qt5 INDI_BUILD_QT5_CLIENT)
+		-DINDI_BUILD_UNITTESTS=$(usex test)
+		-DINDI_BUILD_QT5_CLIENT=$(usex qt5)
+		$(cmake_use_find_package ogg OggTheora)
+		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
 	)
-
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newinitd "${FILESDIR}/indiserver.sh" indiserver
 	newconfd "${FILESDIR}/indiserver.conf" indiserver
 }
 
+src_test() {
+	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
+}
+
 pkg_postinst() {
-        enewgroup indiserver
+	enewgroup indiserver
 	enewuser indiserver -1 -1 -1 "usb,uucp,video,indiserver"
 	elog "You can use init script in /etc/init.d/indiserver to start"
 	elog "indiserver automatically."
diff --git a/sci-libs/indilib/metadata.xml b/sci-libs/indilib/metadata.xml
index fd16897..ae64d74 100644
--- a/sci-libs/indilib/metadata.xml
+++ b/sci-libs/indilib/metadata.xml
@@ -1,43 +1,42 @@
 <?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>
-    INDI is a protocol designed to support control, automation, data acquisition, and exchange among hardware devices and software frontends.
-    INDI stands for the Instrument-Neutral-Distributed-Interface, and was developed by Elwood C. Downey of ClearSky Institute.
-  </longdescription>
-  <use>
-	<flag name='drivers'>
-	  Installs <pkg>sci-libs/indilib-drivers</pkg> which is a metapackage for indilib 3rd party drivers.
-	</flag>
-  </use>
-  <upstream>
-        <maintainer status="active">
-		<email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-        </maintainer>
-	<maintainer status="active">
-		<email>info@cloudmakers.eu</email>
-		<name>Peter Polakovic</name>
-        </maintainer>
-	<maintainer status="active">
-		<email>info@ClearSkyInstitute.com</email>
-		<name>Elwood Downey</name>
-        </maintainer>
-	<maintainer status="active">
-		<email>zerjio@zerjio.com</email>
-		<name>Sergio Alonso</name>
-        </maintainer>
-	<maintainer status="active">
-		<email>mas.ignacio@gmail.com</email>
-		<name>Nacho Mas</name>
-        </maintainer>
-        <changelog>http://indilib.org/about/news.html</changelog>
-        <doc lang="en">http://indilib.org/about/discover-indi.html</doc>
-        <bugs-to>http://sourceforge.net/p/indi/bugs/</bugs-to>
-        <remote-id type="sourceforge">indi</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ctibor@brancik.cz</email>
+		<name>Ctibor Brančík</name>
+	</maintainer>	
+	<longdescription>
+		INDI is a protocol designed to support control, automation, data acquisition, and exchange among hardware devices and software frontends.
+		INDI stands for the Instrument-Neutral-Distributed-Interface, and was developed by Elwood C. Downey of ClearSky Institute.
+	</longdescription>
+	<use>
+		<flag name='drivers'>Installs <pkg>sci-libs/indilib-drivers</pkg> which is a metapackage for indilib 3rd party drivers.</flag>
+		<flag name='websocket'>Enable support for WebSocket protocol</flag>
+	</use>
+	<upstream>
+		<maintainer status="active">
+			<email>mutlaqja@ikarustech.com</email>
+			<name>Jasem Mutlaq</name>
+		</maintainer>
+		<maintainer status="active">
+			<email>info@cloudmakers.eu</email>
+			<name>Peter Polakovic</name>
+		</maintainer>
+		<maintainer status="active">
+			<email>info@ClearSkyInstitute.com</email>
+			<name>Elwood Downey</name>
+		</maintainer>
+		<maintainer status="active">
+			<email>zerjio@zerjio.com</email>
+			<name>Sergio Alonso</name>
+		</maintainer>
+		<maintainer status="active">
+			<email>mas.ignacio@gmail.com</email>
+			<name>Nacho Mas</name>
+		</maintainer>
+		<changelog>https://indilib.org/about/news.html</changelog>
+		<doc lang="en">http://indilib.org/about/discover-indi.html</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/libaltaircam/Manifest b/sci-libs/libaltaircam/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/libaltaircam/Manifest
+++ b/sci-libs/libaltaircam/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/libaltaircam/libaltaircam-1.7.5.ebuild b/sci-libs/libaltaircam/libaltaircam-1.7.5.ebuild
deleted file mode 100644
index 3c70ed6..0000000
--- a/sci-libs/libaltaircam/libaltaircam-1.7.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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="This is the Altair Library SDK."
-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 ~arm"
-
-SLOT="0"
-
-RDEPEND="${DEPEND}"
-
-INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
-
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libaltaircam/libaltaircam-1.8.3.ebuild b/sci-libs/libaltaircam/libaltaircam-1.8.3.ebuild
new file mode 100644
index 0000000..31ebb80
--- /dev/null
+++ b/sci-libs/libaltaircam/libaltaircam-1.8.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils
+
+MY_PN="indi"
+
+DESCRIPTION="This is the Altair Library SDK"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+
+SLOT="0/1"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libaltaircam/libaltaircam-9999.ebuild b/sci-libs/libaltaircam/libaltaircam-9999.ebuild
index bf0515d..924a716 100644
--- a/sci-libs/libaltaircam/libaltaircam-9999.ebuild
+++ b/sci-libs/libaltaircam/libaltaircam-9999.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
-DESCRIPTION="This is the Altair Library SDK."
+DESCRIPTION="This is the Altair Library SDK"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
 RDEPEND="${DEPEND}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}"
+S="${EGIT_CHECKOUT_DIR}/${PN}"
diff --git a/sci-libs/libaltaircam/metadata.xml b/sci-libs/libaltaircam/metadata.xml
index f08dedc..f360182 100644
--- a/sci-libs/libaltaircam/metadata.xml
+++ b/sci-libs/libaltaircam/metadata.xml
@@ -4,8 +4,10 @@
   <maintainer type="person">
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
-  </maintainer>	
-  <longdescription>
-     This is the Altair Library SDK for Linux &amp; MacOS. It supports x86-32, x86-64, arm64, and armhf architectures.
-  </longdescription>
+  </maintainer>
+  <upstream>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+        <remote-id type="github">indilib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/libapogee/Manifest b/sci-libs/libapogee/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/libapogee/Manifest
+++ b/sci-libs/libapogee/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/libapogee/libapogee-1.7.5.ebuild b/sci-libs/libapogee/libapogee-1.7.5.ebuild
deleted file mode 100644
index 005d89d..0000000
--- a/sci-libs/libapogee/libapogee-1.7.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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="Driver for the Apogee ALTA device drivers"
-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 ~arm"
-
-SLOT="0"
-
-DEPEND="virtual/libusb:1
-	net-misc/curl"
-
-RDEPEND="${DEPEND}"
-
-INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
-
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libapogee/libapogee-1.8.3.ebuild b/sci-libs/libapogee/libapogee-1.8.3.ebuild
new file mode 100644
index 0000000..d71378e
--- /dev/null
+++ b/sci-libs/libapogee/libapogee-1.8.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils
+
+MY_PN="indi"
+
+DESCRIPTION="Driver for the Apogee ALTA device drivers"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND="virtual/libusb:1
+	net-misc/curl"
+
+RDEPEND="${DEPEND}
+	sys-apps/fxload"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libapogee/libapogee-9999.ebuild b/sci-libs/libapogee/libapogee-9999.ebuild
index 5fbca99..e7a5167 100644
--- a/sci-libs/libapogee/libapogee-9999.ebuild
+++ b/sci-libs/libapogee/libapogee-9999.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="Driver for the Apogee ALTA device drivers"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="LGPL-2"
+LICENSE="GPL-2"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="virtual/libusb:1
 	net-misc/curl"
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	sys-apps/fxload"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}"
+S="${EGIT_CHECKOUT_DIR}/${PN}"
diff --git a/sci-libs/libapogee/metadata.xml b/sci-libs/libapogee/metadata.xml
index 7d429e3..91e70e7 100644
--- a/sci-libs/libapogee/metadata.xml
+++ b/sci-libs/libapogee/metadata.xml
@@ -5,7 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-     This is the standalone version of the Apogee ALTA device drivers for Linux. This package is primarily intended for developers wishing to add ALTA camera control options to other packages (e.g. Kstars/INDI).
-  </longdescription>
+  <upstream>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+        <remote-id type="github">indilib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/libasi/Manifest b/sci-libs/libasi/Manifest
new file mode 100644
index 0000000..2def209
--- /dev/null
+++ b/sci-libs/libasi/Manifest
@@ -0,0 +1 @@
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/libasi/libasi-1.8.3.ebuild b/sci-libs/libasi/libasi-1.8.3.ebuild
new file mode 100644
index 0000000..e0c7d0d
--- /dev/null
+++ b/sci-libs/libasi/libasi-1.8.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="indi"
+
+inherit cmake eutils
+
+DESCRIPTION="Udev rules and firmware for ZWO Optics ASI cameras."
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="zwo-asi"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+RDEPEND="${DEPEND}
+	sys-apps/fxload"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${PN}"
diff --git a/sci-libs/libasi/libasi-9999.ebuild b/sci-libs/libasi/libasi-9999.ebuild
new file mode 100644
index 0000000..c7213fd
--- /dev/null
+++ b/sci-libs/libasi/libasi-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 eutils
+
+DESCRIPTION="Udev rules and firmware for ZWO Optics ASI cameras."
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="zwo-asi"
+KEYWORDS=""
+
+SLOT="0/1"
+
+RDEPEND="${DEPEND}
+	sys-apps/fxload"
+
+S="${EGIT_CHECKOUT_DIR}/${PN}"
diff --git a/sci-libs/asi-common/metadata.xml b/sci-libs/libasi/metadata.xml
index 82e0dff..2c7a897 100644
--- a/sci-libs/asi-common/metadata.xml
+++ b/sci-libs/libasi/metadata.xml
@@ -5,12 +5,9 @@
     <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>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/libatik/Manifest b/sci-libs/libatik/Manifest
new file mode 100644
index 0000000..2def209
--- /dev/null
+++ b/sci-libs/libatik/Manifest
@@ -0,0 +1 @@
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/libatik/libatik-1.8.3.ebuild b/sci-libs/libatik/libatik-1.8.3.ebuild
new file mode 100644
index 0000000..0d1f8cb
--- /dev/null
+++ b/sci-libs/libatik/libatik-1.8.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils
+
+MY_PN="indi"
+
+DESCRIPTION="Driver for the for the ATIK cameras and filter wheels"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+
+SLOT="0/1"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libatik/libatik-9999.ebuild b/sci-libs/libatik/libatik-9999.ebuild
new file mode 100644
index 0000000..8abb245
--- /dev/null
+++ b/sci-libs/libatik/libatik-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 eutils
+
+DESCRIPTION="Driver for the for the ATIK cameras and filter wheels"
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+
+SLOT="0/1"
+
+RDEPEND="${DEPEND}"
+
+S="${EGIT_CHECKOUT_DIR}/${PN}"
diff --git a/sci-libs/indilib-driver-altaircam/metadata.xml b/sci-libs/libatik/metadata.xml
index a8e208f..91e70e7 100644
--- a/sci-libs/indilib-driver-altaircam/metadata.xml
+++ b/sci-libs/libatik/metadata.xml
@@ -5,15 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    INDI driver for the Altair cameras.
-  </longdescription>
   <upstream>
-		<maintainer status="active">
-		<email>mutlaqja@ikarustech.com</email>
-		<name>Jasem Mutlaq</name>
-		</maintainer>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/libdspau/Manifest b/sci-libs/libdspau/Manifest
deleted file mode 100644
index 7b723af..0000000
--- a/sci-libs/libdspau/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
diff --git a/sci-libs/libdspau/libdspau-1.7.5.ebuild b/sci-libs/libdspau/libdspau-1.7.5.ebuild
deleted file mode 100644
index 1382c50..0000000
--- a/sci-libs/libdspau/libdspau-1.7.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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}"
-
-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
deleted file mode 100644
index 259d59e..0000000
--- a/sci-libs/libdspau/libdspau-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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="A digital signal processing library for astronomy usage"
-HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
-EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
-
-LICENSE="GPL-3"
-KEYWORDS=""
-
-SLOT="0"
-
-DEPEND="sci-libs/fftw:3.0"
-
-RDEPEND="${DEPEND}"
-
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}"
diff --git a/sci-libs/libdspau/metadata.xml b/sci-libs/libdspau/metadata.xml
deleted file mode 100644
index f8f09c3..0000000
--- a/sci-libs/libdspau/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>
-    A digital signal processing library for astronomy usage
-  </longdescription>
-  <upstream>
-        <maintainer status="active">
-                <email>info@iliaplatone.com</email>
-                <name>Ilia Platone</name>
-        </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-libs/libfishcamp/Manifest b/sci-libs/libfishcamp/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/libfishcamp/Manifest
+++ b/sci-libs/libfishcamp/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/libfishcamp/libfishcamp-1.7.5.ebuild b/sci-libs/libfishcamp/libfishcamp-1.7.5.ebuild
deleted file mode 100644
index 4ca7a7a..0000000
--- a/sci-libs/libfishcamp/libfishcamp-1.7.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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="Firmware for the Fishcamp Engineering's Starfish CMOS autoguider"
-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="fishcamp"
-KEYWORDS="~amd64 ~x86 ~arm"
-
-SLOT="0"
-
-INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
-
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libfishcamp/libfishcamp-1.8.3.ebuild b/sci-libs/libfishcamp/libfishcamp-1.8.3.ebuild
new file mode 100644
index 0000000..34ac584
--- /dev/null
+++ b/sci-libs/libfishcamp/libfishcamp-1.8.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils
+
+MY_PN="indi"
+
+DESCRIPTION="Firmware for the Fishcamp Engineering's Starfish CMOS autoguider"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="fishcamp"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+RDEPEND="${DEPEND}
+	sys-apps/fxload"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libfishcamp/libfishcamp-9999.ebuild b/sci-libs/libfishcamp/libfishcamp-9999.ebuild
index e4b1702..84ed39c 100644
--- a/sci-libs/libfishcamp/libfishcamp-9999.ebuild
+++ b/sci-libs/libfishcamp/libfishcamp-9999.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="Firmware for the Fishcamp Engineering's Starfish CMOS autoguider"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="fishcamp"
 KEYWORDS=""
 
-SLOT="0"
+RDEPEND="${DEPEND}
+	sys-apps/fxload"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}"
+SLOT="0/1"
+
+S="${EGIT_CHECKOUT_DIR}/${PN}"
diff --git a/sci-libs/libfishcamp/metadata.xml b/sci-libs/libfishcamp/metadata.xml
index 1a110a8..91e70e7 100644
--- a/sci-libs/libfishcamp/metadata.xml
+++ b/sci-libs/libfishcamp/metadata.xml
@@ -5,7 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    Firmware for the Fishcamp Engineering's Starfish CMOS autoguider and driver.
-  </longdescription>
+  <upstream>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+        <remote-id type="github">indilib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/libfli/Manifest b/sci-libs/libfli/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/libfli/Manifest
+++ b/sci-libs/libfli/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/libfli/libfli-1.7.5.ebuild b/sci-libs/libfli/libfli-1.8.3.ebuild
index b2df085..13f8a7d 100644
--- a/sci-libs/libfli/libfli-1.7.5.ebuild
+++ b/sci-libs/libfli/libfli-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 MY_PN="indi"
 
 DESCRIPTION="Driver for the Finger Lakes Instruments CCD and Focuser"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="virtual/libusb:1"
 
@@ -22,4 +22,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libfli/libfli-9999.ebuild b/sci-libs/libfli/libfli-9999.ebuild
index 88e0853..4e8e2db 100644
--- a/sci-libs/libfli/libfli-9999.ebuild
+++ b/sci-libs/libfli/libfli-9999.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="Driver for the Finger Lakes Instruments CCD and Focuser"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="virtual/libusb:1"
 
 RDEPEND="${DEPEND}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}"
+S="${EGIT_CHECKOUT_DIR}/${PN}"
diff --git a/sci-libs/libfli/metadata.xml b/sci-libs/libfli/metadata.xml
index da03b6b..91e70e7 100644
--- a/sci-libs/libfli/metadata.xml
+++ b/sci-libs/libfli/metadata.xml
@@ -5,7 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    Driver for the Finger Lakes Instruments CCD and Focuser
-  </longdescription>
+  <upstream>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+        <remote-id type="github">indilib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/libinova/Manifest b/sci-libs/libinova/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/libinova/Manifest
+++ b/sci-libs/libinova/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/libinova/libinova-1.7.5.ebuild b/sci-libs/libinova/libinova-1.7.5.ebuild
deleted file mode 100644
index 1330b64..0000000
--- a/sci-libs/libinova/libinova-1.7.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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="SDK and firmware for the i.Nova PLx series CCD/CMOS 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="inova"
-KEYWORDS="~amd64 ~x86 ~arm"
-
-SLOT="0"
-
-INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
-
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}sdk"
diff --git a/sci-libs/libinova/libinova-1.8.3.ebuild b/sci-libs/libinova/libinova-1.8.3.ebuild
new file mode 100644
index 0000000..368420c
--- /dev/null
+++ b/sci-libs/libinova/libinova-1.8.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils
+
+MY_PN="indi"
+
+DESCRIPTION="SDK and firmware for the i.Nova PLx series CCD/CMOS cameras"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="inova"
+KEYWORDS="~amd64 ~arm ~x86"
+
+SLOT="0/1"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}sdk"
diff --git a/sci-libs/libinova/libinova-9999.ebuild b/sci-libs/libinova/libinova-9999.ebuild
index bef0284..80bfe01 100644
--- a/sci-libs/libinova/libinova-9999.ebuild
+++ b/sci-libs/libinova/libinova-9999.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="SDK and firmware for the i.Nova PLx series CCD/CMOS cameras"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="inova"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}sdk"
+S="${EGIT_CHECKOUT_DIR}/${PN}sdk"
diff --git a/sci-libs/libinova/metadata.xml b/sci-libs/libinova/metadata.xml
index 6956d2d..91e70e7 100644
--- a/sci-libs/libinova/metadata.xml
+++ b/sci-libs/libinova/metadata.xml
@@ -5,7 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    SDK and firmware for the i.Nova PLx series CCD/CMOS cameras.
-  </longdescription>
+  <upstream>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+        <remote-id type="github">indilib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/libnncam/Manifest b/sci-libs/libnncam/Manifest
new file mode 100644
index 0000000..2def209
--- /dev/null
+++ b/sci-libs/libnncam/Manifest
@@ -0,0 +1 @@
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/libnncam/libnncam-1.8.3.ebuild b/sci-libs/libnncam/libnncam-1.8.3.ebuild
new file mode 100644
index 0000000..711fd53
--- /dev/null
+++ b/sci-libs/libnncam/libnncam-1.8.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils
+
+MY_PN="indi"
+
+DESCRIPTION="This is the Levenhuk Library SDK for Linux & MacOS"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+
+SLOT="0/1"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libnncam/libnncam-9999.ebuild b/sci-libs/libnncam/libnncam-9999.ebuild
new file mode 100644
index 0000000..1f1b380
--- /dev/null
+++ b/sci-libs/libnncam/libnncam-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 eutils
+
+DESCRIPTION="This is the Levenhuk Library SDK for Linux & MacOS"
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2"
+KEYWORDS=""
+
+SLOT="0/1"
+
+RDEPEND="${DEPEND}"
+
+S="${EGIT_CHECKOUT_DIR}/${PN}"
diff --git a/sci-libs/indilib-driver-toupcam/metadata.xml b/sci-libs/libnncam/metadata.xml
index a85737a..91e70e7 100644
--- a/sci-libs/indilib-driver-toupcam/metadata.xml
+++ b/sci-libs/libnncam/metadata.xml
@@ -5,11 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    This is the INDI driver for the Touptek cameras. It was tested with ToupCam GCMOS01200KPB but, hopefully, should work with other cameras from Touptek too.
-  </longdescription>
   <upstream>
-        <bugs-to>https://github.com/indilib/indi/issues</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
         <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/libqhy/Manifest b/sci-libs/libqhy/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/libqhy/Manifest
+++ b/sci-libs/libqhy/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/libqhy/libqhy-1.7.5.ebuild b/sci-libs/libqhy/libqhy-1.7.5.ebuild
deleted file mode 100644
index d0d22f0..0000000
--- a/sci-libs/libqhy/libqhy-1.7.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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="SDK and firmware for the QHY CCD 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="GPL-3 LGPL-2 qhyccd"
-KEYWORDS="~amd64 ~x86 ~arm"
-
-SLOT="0"
-
-DEPEND="virtual/libusb:1
-	media-libs/opencv"
-
-RDEPEND="${DEPEND}"
-
-INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
-
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libqhy/libqhy-1.8.3.ebuild b/sci-libs/libqhy/libqhy-1.8.3.ebuild
new file mode 100644
index 0000000..e8715f3
--- /dev/null
+++ b/sci-libs/libqhy/libqhy-1.8.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils
+
+MY_PN="indi"
+
+DESCRIPTION="SDK and firmware for the QHY CCD cameras"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="qhyccd"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+DEPEND=""
+
+RDEPEND="${DEPEND}
+	sys-apps/fxload"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libqhy/libqhy-9999.ebuild b/sci-libs/libqhy/libqhy-9999.ebuild
index 29799d8..06cf049 100644
--- a/sci-libs/libqhy/libqhy-9999.ebuild
+++ b/sci-libs/libqhy/libqhy-9999.ebuild
@@ -1,26 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-LIBQHY_VERSION="0.1.7"
-LIBQHY_SOVERSION="0"
-
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="SDK and firmware for the QHY CCD cameras"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="GPL-3 LGPL-2 qhyccd"
+LICENSE="qhyccd"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
-DEPEND="virtual/libusb:1
-	media-libs/opencv"
+DEPEND=""
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	sys-apps/fxload"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}"
+S="${EGIT_CHECKOUT_DIR}/${PN}"
diff --git a/sci-libs/libqhy/metadata.xml b/sci-libs/libqhy/metadata.xml
index d02da12..91e70e7 100644
--- a/sci-libs/libqhy/metadata.xml
+++ b/sci-libs/libqhy/metadata.xml
@@ -5,9 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    SDK and firmawre for qhyccd.com's cameras.
-    Support Camera List:
-    IMG2P,QHY6,QHY8,QHY8L,QHY8PRO,QHY9S,QHY10,QHY11,QHY12,QHY21,QHY22,QHY23,IC8300, QHY5II,QHY5LII_M(mono),QHY5LII_C(color)
-  </longdescription>
+  <upstream>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+        <remote-id type="github">indilib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/libqsi/Manifest b/sci-libs/libqsi/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/libqsi/Manifest
+++ b/sci-libs/libqsi/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/libqsi/libqsi-1.7.5.ebuild b/sci-libs/libqsi/libqsi-1.8.3.ebuild
index f39eafd..a2cebae 100644
--- a/sci-libs/libqsi/libqsi-1.7.5.ebuild
+++ b/sci-libs/libqsi/libqsi-1.8.3.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils eutils
+inherit cmake eutils
 
 MY_PN="indi"
 
 DESCRIPTION="Driver for the Quantum Scientific Imaging CCDs & Filter Wheels"
 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"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
 
 LICENSE="qsi"
-KEYWORDS="~amd64 ~x86 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="dev-embedded/libftdi:0"
 
@@ -22,4 +22,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
 
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libqsi/libqsi-9999.ebuild b/sci-libs/libqsi/libqsi-9999.ebuild
index 0c94ace..901cbc4 100644
--- a/sci-libs/libqsi/libqsi-9999.ebuild
+++ b/sci-libs/libqsi/libqsi-9999.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
 DESCRIPTION="Driver for the Quantum Scientific Imaging CCDs & Filter Wheels"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="qsi"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
 DEPEND="dev-embedded/libftdi:0"
 
 RDEPEND="${DEPEND}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}"
+S="${EGIT_CHECKOUT_DIR}/${PN}"
diff --git a/sci-libs/libqsi/metadata.xml b/sci-libs/libqsi/metadata.xml
index c835220..91e70e7 100644
--- a/sci-libs/libqsi/metadata.xml
+++ b/sci-libs/libqsi/metadata.xml
@@ -5,13 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    The QSI API supports two driver libraries for the USB connection to the the camera via an FTDI USB interface.
-  </longdescription>
   <upstream>
-        <maintainer status="active">
-                <email>support@QSImaging.com</email>
-                <name>uantum Scientific Imaging, Inc.</name>
-        </maintainer>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+        <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/libsbig/Manifest b/sci-libs/libsbig/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/libsbig/Manifest
+++ b/sci-libs/libsbig/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/libsbig/libsbig-1.7.5.ebuild b/sci-libs/libsbig/libsbig-1.7.5.ebuild
deleted file mode 100644
index 86c9a51..0000000
--- a/sci-libs/libsbig/libsbig-1.7.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_PN="indi"
-
-DESCRIPTION="Driver for the Santa Barbara Instruments Group line of CCDs & Filter Wheels"
-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="sbig"
-KEYWORDS="~arm ~amd64 ~x86"
-
-SLOT="0"
-
-INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
-
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libsbig/libsbig-1.8.3.ebuild b/sci-libs/libsbig/libsbig-1.8.3.ebuild
new file mode 100644
index 0000000..9181b6d
--- /dev/null
+++ b/sci-libs/libsbig/libsbig-1.8.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="indi"
+
+DESCRIPTION="Driver for the Santa Barbara Instruments Group line of CCDs & Filter Wheels"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="sbig"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/1"
+
+RDEPEND="${DEPEND}
+	sys-apps/fxload"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libsbig/libsbig-9999.ebuild b/sci-libs/libsbig/libsbig-9999.ebuild
index 99bbb26..5f27111 100644
--- a/sci-libs/libsbig/libsbig-9999.ebuild
+++ b/sci-libs/libsbig/libsbig-9999.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-SBIG_VERSION="2.1.1"
-SBIG_SOVERSION="2"
+EAPI=7
 
 MY_PN="sbig"
 
-inherit cmake-utils git-r3
+inherit cmake git-r3
 
 DESCRIPTION="Driver for the Santa Barbara Instruments Group line of CCDs & Filter Wheels"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="sbig"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
+
+RDEPEND="${DEPEND}
+	sys-apps/fxload"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}"
+S="${EGIT_CHECKOUT_DIR}/${PN}"
diff --git a/sci-libs/libsbig/metadata.xml b/sci-libs/libsbig/metadata.xml
index 2307323..91e70e7 100644
--- a/sci-libs/libsbig/metadata.xml
+++ b/sci-libs/libsbig/metadata.xml
@@ -5,14 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-    Firmware and library for accesing SBIG CCD astronomical cameras from SBIG Astronomical Instruments. Only x86 and amd64 ARCH supported.
-  </longdescription>
   <upstream>
-        <maintainer status="active">
-                <email>sbig@sbig.com</email>
-                <name>SBIG Astronomical Instruments</name>
-        </maintainer>
-        <bugs-to>http://www.diffractionlimited.com/forum/index.php?categories/sbig-products-public.25/</bugs-to>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+        <remote-id type="github">indilib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/libstarshootg/Manifest b/sci-libs/libstarshootg/Manifest
new file mode 100644
index 0000000..2def209
--- /dev/null
+++ b/sci-libs/libstarshootg/Manifest
@@ -0,0 +1 @@
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/libstarshootg/libstarshootg-1.8.3.ebuild b/sci-libs/libstarshootg/libstarshootg-1.8.3.ebuild
new file mode 100644
index 0000000..f639fe1
--- /dev/null
+++ b/sci-libs/libstarshootg/libstarshootg-1.8.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils
+
+MY_PN="indi"
+
+DESCRIPTION="This is the Orion Starshoot G Library SDK for Linux & MacOS"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+
+SLOT="0/1"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libstarshootg/libstarshootg-9999.ebuild b/sci-libs/libstarshootg/libstarshootg-9999.ebuild
new file mode 100644
index 0000000..e92eeca
--- /dev/null
+++ b/sci-libs/libstarshootg/libstarshootg-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 eutils
+
+DESCRIPTION="This is the Orion Starshoot G Library SDK for Linux & MacOS"
+HOMEPAGE="http://indilib.org"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+
+SLOT="0/1"
+
+RDEPEND="${DEPEND}"
+
+S="${EGIT_CHECKOUT_DIR}/${PN}"
diff --git a/sci-libs/libstarshootg/metadata.xml b/sci-libs/libstarshootg/metadata.xml
new file mode 100644
index 0000000..91e70e7
--- /dev/null
+++ b/sci-libs/libstarshootg/metadata.xml
@@ -0,0 +1,13 @@
+<?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>	
+  <upstream>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+        <remote-id type="github">indilib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/libtoupcam/Manifest b/sci-libs/libtoupcam/Manifest
index 7b723af..2def209 100644
--- a/sci-libs/libtoupcam/Manifest
+++ b/sci-libs/libtoupcam/Manifest
@@ -1 +1 @@
-DIST indilib-1.7.5.tar.gz 45154590 SHA256 842ec3ad1a2e19f7bcad7c03d3982b45ffa84c905df751001f620896002c4e09 SHA512 57b9106421dd847ef824a918a129a272e8a8bcc75cb9744fc64c994948e64a484334263c733d115448633ab13b086b83bbdc38473629fefba0445b440435d13c WHIRLPOOL c6ec7615c3c69504015a3205ce185ea359e1fa30b8b0377d446846808ff6dd92f9d97e8fdf840b35c9a11cd0b02a732f86030131a6efcac9b3b6b988670df2ac
+DIST indilib-3rdparty-1.8.3.tar.gz 88646327 SHA256 5d16a4560788920871d0b0b21efee01eb55317f265ba5dc029a6dee09e5586bc SHA512 4b799349492dca0c262c54c5d2fac9a406dc46fd4bf65334db458c3854710917626e39f7584c54b3473693ddfde286f9a10b562571b9857c42dbf97893de87df WHIRLPOOL d6d34fff305dcb31e484e7fadb5f061dba9b4ed197dc471f581618fff32840065cae53ab3c672d005d025d5d8d8280a57509b8655b69ad2b056bd9138a532b3b
diff --git a/sci-libs/libtoupcam/libtoupcam-1.7.5.ebuild b/sci-libs/libtoupcam/libtoupcam-1.7.5.ebuild
deleted file mode 100644
index 2fd23bc..0000000
--- a/sci-libs/libtoupcam/libtoupcam-1.7.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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="This is the Toupcam Library SDK."
-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 ~arm"
-
-SLOT="0"
-
-RDEPEND="${DEPEND}"
-
-INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
-
-S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libtoupcam/libtoupcam-1.8.3.ebuild b/sci-libs/libtoupcam/libtoupcam-1.8.3.ebuild
new file mode 100644
index 0000000..1881fc5
--- /dev/null
+++ b/sci-libs/libtoupcam/libtoupcam-1.8.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils
+
+MY_PN="indi"
+
+DESCRIPTION="This is the Toupcam Library SDK"
+HOMEPAGE="http://indilib.org"
+SRC_URI="https://github.com/${MY_PN}lib/${MY_PN}-3rdparty/archive/v${PV}.tar.gz -> ${MY_PN}lib-3rdparty-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+
+SLOT="0/1"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}"
+
+S="${WORKDIR}/${MY_PN}-3rdparty-${PV}/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libtoupcam/libtoupcam-9999.ebuild b/sci-libs/libtoupcam/libtoupcam-9999.ebuild
index 506f30c..757f44b 100644
--- a/sci-libs/libtoupcam/libtoupcam-9999.ebuild
+++ b/sci-libs/libtoupcam/libtoupcam-9999.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils git-r3 eutils
+inherit cmake git-r3 eutils
 
-DESCRIPTION="This is the Toupcam Library SDK."
+DESCRIPTION="This is the Toupcam Library SDK"
 HOMEPAGE="http://indilib.org"
-EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_REPO_URI="https://github.com/indilib/indi-3rdparty.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-SLOT="0"
+SLOT="0/1"
 
 RDEPEND="${DEPEND}"
 
-S="${EGIT_CHECKOUT_DIR}/3rdparty/${PN}"
+S="${EGIT_CHECKOUT_DIR}/${PN}"
diff --git a/sci-libs/libtoupcam/metadata.xml b/sci-libs/libtoupcam/metadata.xml
index 0e61375..91e70e7 100644
--- a/sci-libs/libtoupcam/metadata.xml
+++ b/sci-libs/libtoupcam/metadata.xml
@@ -5,7 +5,9 @@
     <email>ctibor@brancik.cz</email>
     <name>Ctibor Brančík</name>
   </maintainer>	
-  <longdescription>
-     This is the Toupcam Library SDK for Linux &amp; MacOS. It supports x86-32, x86-64, arm64, and armhf architectures.
-  </longdescription>
+  <upstream>
+        <doc lang="en">http://indilib.org/</doc>
+        <bugs-to>https://github.com/indilib/indi-3rdparty/issues</bugs-to>
+        <remote-id type="github">indilib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sets/indilib-drivers b/sets/indilib-drivers
index a30163e..f0e575c 100644
--- a/sets/indilib-drivers
+++ b/sets/indilib-drivers
@@ -1,8 +1,14 @@
 sci-libs/indilib-driver-aagcloudwatcher
-sci-libs/indilib-driver-altaircam
+sci-libs/indilib-driver-aagcloudwatcherng
+sci-libs/indilib-driver-aok
 sci-libs/indilib-driver-apogee
 sci-libs/indilib-driver-armadillo
 sci-libs/indilib-driver-asi
+sci-libs/indilib-driver-astromechfoc
+sci-libs/indilib-driver-atik
+sci-libs/indilib-driver-avalon
+sci-libs/indilib-driver-beefocus
+sci-libs/indilib-driver-dreamfocuser
 sci-libs/indilib-driver-dsi
 sci-libs/indilib-driver-duino
 sci-libs/indilib-driver-eqmod
@@ -23,12 +29,13 @@ sci-libs/indilib-driver-nexstarevo
 sci-libs/indilib-driver-nightscape
 sci-libs/indilib-driver-qhy
 sci-libs/indilib-driver-qsi
-sci-libs/indilib-driver-radiosim
 sci-libs/indilib-driver-rtlsdr
 sci-libs/indilib-driver-sbig
 sci-libs/indilib-driver-shelyak
 sci-libs/indilib-driver-spectracyber
 sci-libs/indilib-driver-ssag
+sci-libs/indilib-driver-starbook
 sci-libs/indilib-driver-sx
-sci-libs/indilib-driver-toupcam
+sci-libs/indilib-driver-talon6
+sci-libs/indilib-driver-toupbase
 sci-libs/indilib-driver-webcam
diff --git a/sets/indilib-drivers-live b/sets/indilib-drivers-live
index bccddc7..d69a59a 100644
--- a/sets/indilib-drivers-live
+++ b/sets/indilib-drivers-live
@@ -1,35 +1,41 @@
-=sci-libs/indilib-driver-aagcloudwatcher-9999
-=sci-libs/indilib-driver-altaircam-9999
-=sci-libs/indilib-driver-amh-9999
-=sci-libs/indilib-driver-apogee-9999
-=sci-libs/indilib-driver-armadillo-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
-=sci-libs/indilib-driver-fishcamp-9999
-=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-limesdr-9999
-=sci-libs/indilib-driver-maxdomeii-9999
-=sci-libs/indilib-driver-mgen-9999
-=sci-libs/indilib-driver-mi-9999
-=sci-libs/indilib-driver-nexdome-9999
-=sci-libs/indilib-driver-nexstarevo-9999
-=sci-libs/indilib-driver-nightscape-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
-=sci-libs/indilib-driver-spectracyber-9999
-=sci-libs/indilib-driver-ssag-9999
-=sci-libs/indilib-driver-sx-9999
-=sci-libs/indilib-driver-toupcam-9999
-=sci-libs/indilib-driver-webcam-9999
+=sci-libs/indilib-driver-aagcloudwatcher
+=sci-libs/indilib-driver-aagcloudwatcherng
+=sci-libs/indilib-driver-aok
+=sci-libs/indilib-driver-apogee
+=sci-libs/indilib-driver-armadillo
+=sci-libs/indilib-driver-asi
+=sci-libs/indilib-driver-astromechfoc
+=sci-libs/indilib-driver-atik
+=sci-libs/indilib-driver-avalon
+=sci-libs/indilib-driver-beefocus
+=sci-libs/indilib-driver-dreamfocuser
+=sci-libs/indilib-driver-dsi
+=sci-libs/indilib-driver-duino
+=sci-libs/indilib-driver-eqmod
+=sci-libs/indilib-driver-ffmv
+=sci-libs/indilib-driver-fishcamp
+=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-limesdr
+=sci-libs/indilib-driver-maxdomeii
+=sci-libs/indilib-driver-mgen
+=sci-libs/indilib-driver-mi
+=sci-libs/indilib-driver-nexdome
+=sci-libs/indilib-driver-nexstarevo
+=sci-libs/indilib-driver-nightscape
+=sci-libs/indilib-driver-qhy
+=sci-libs/indilib-driver-qsi
+=sci-libs/indilib-driver-rtlsdr
+=sci-libs/indilib-driver-sbig
+=sci-libs/indilib-driver-shelyak
+=sci-libs/indilib-driver-spectracyber
+=sci-libs/indilib-driver-ssag
+=sci-libs/indilib-driver-starbook
+=sci-libs/indilib-driver-sx
+=sci-libs/indilib-driver-talon6
+=sci-libs/indilib-driver-toupbase
+=sci-libs/indilib-driver-webcam
author	Ctibor Brančík <ctibor@brancik.cz>	2020-01-12 17:35:31 +0100
committer	Ctibor Brančík <ctibor@brancik.cz>	2020-01-12 17:35:31 +0100
commit	37e1361564c1a4048529d923039318f0f629c426 (patch)
tree	31a0b59557e510fab98f60d9c0626146dd415a6d
parent	782ae9d7bc1f7af393796f4057387956b6b64067 (diff)
download	brancik-overlay-37e1361564c1a4048529d923039318f0f629c426.tar.gz brancik-overlay-37e1361564c1a4048529d923039318f0f629c426.tar.bz2