Bump sci-libs/indilib and its drivers to version 1.3.0

author: Ctibor Brančík <ctibor@brancik.cz> 2016-11-03 20:14:51 +0100
committer: Ctibor Brančík <ctibor@brancik.cz> 2016-11-03 20:14:51 +0100
commit: 5943f851f7eb00dbec9c5b115ada5b24fe07dcfc (patch)
tree: 13b14650fde8a2b94b72da6bcca526392c032b63
parent: 0ad7861a1793cc0a73df8a164227c040f8a59825 (diff)
download: brancik-overlay-5943f851f7eb00dbec9c5b115ada5b24fe07dcfc.tar.gz
brancik-overlay-5943f851f7eb00dbec9c5b115ada5b24fe07dcfc.tar.bz2
81 files changed, 457 insertions, 193 deletions
diff --git a/sci-libs/indilib-driver-aagcloudwatcher/Manifest b/sci-libs/indilib-driver-aagcloudwatcher/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-aagcloudwatcher/Manifest
+++ b/sci-libs/indilib-driver-aagcloudwatcher/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-aagcloudwatcher/indilib-driver-aagcloudwatcher-1.2.0.ebuild b/sci-libs/indilib-driver-aagcloudwatcher/indilib-driver-aagcloudwatcher-1.3.0.ebuild
index 713ed7d..463acdc 100644
--- a/sci-libs/indilib-driver-aagcloudwatcher/indilib-driver-aagcloudwatcher-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-aagcloudwatcher/indilib-driver-aagcloudwatcher-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the AAG Cloud Watcher (AAGware - http://www.aagware.eu/)"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
@@ -23,4 +24,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-apogee/Manifest b/sci-libs/indilib-driver-apogee/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-apogee/Manifest
+++ b/sci-libs/indilib-driver-apogee/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-apogee/indilib-driver-apogee-1.2.0.ebuild b/sci-libs/indilib-driver-apogee/indilib-driver-apogee-1.3.0.ebuild
index cc5e22a..7bea3c8 100644
--- a/sci-libs/indilib-driver-apogee/indilib-driver-apogee-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-apogee/indilib-driver-apogee-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the Apogee Alta (U & E) line of CCDs"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -24,4 +25,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-asi/Manifest b/sci-libs/indilib-driver-asi/Manifest
new file mode 100644
index 0000000..bda6d84
--- /dev/null
+++ b/sci-libs/indilib-driver-asi/Manifest
@@ -0,0 +1 @@
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-asicam/indilib-driver-asicam-1.2.0.ebuild b/sci-libs/indilib-driver-asi/indilib-driver-asi-1.2.0.ebuild
index f1120f3..23d214a 100644
--- a/sci-libs/indilib-driver-asicam/indilib-driver-asicam-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-asi/indilib-driver-asi-1.2.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the ZWO Optics ASI cameras"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
@@ -23,4 +24,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-asicam/indilib-driver-asicam-9999.ebuild b/sci-libs/indilib-driver-asi/indilib-driver-asi-9999.ebuild
index 8fc6d41..8fc6d41 100644
--- a/sci-libs/indilib-driver-asicam/indilib-driver-asicam-9999.ebuild
+++ b/sci-libs/indilib-driver-asi/indilib-driver-asi-9999.ebuild
diff --git a/sci-libs/indilib-driver-asicam/metadata.xml b/sci-libs/indilib-driver-asi/metadata.xml
index 6cda06c..6cda06c 100644
--- a/sci-libs/indilib-driver-asicam/metadata.xml
+++ b/sci-libs/indilib-driver-asi/metadata.xml
diff --git a/sci-libs/indilib-driver-asicam/Manifest b/sci-libs/indilib-driver-asicam/Manifest
deleted file mode 100644
index 6b87073..0000000
--- a/sci-libs/indilib-driver-asicam/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
diff --git a/sci-libs/indilib-driver-dsi/Manifest b/sci-libs/indilib-driver-dsi/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-dsi/Manifest
+++ b/sci-libs/indilib-driver-dsi/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-dsi/indilib-driver-dsi-1.2.0.ebuild b/sci-libs/indilib-driver-dsi/indilib-driver-dsi-1.3.0.ebuild
index f663a19..7ce8909 100644
--- a/sci-libs/indilib-driver-dsi/indilib-driver-dsi-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-dsi/indilib-driver-dsi-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the Meade Deep Sky Imager"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -23,4 +24,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-duino/Manifest b/sci-libs/indilib-driver-duino/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-duino/Manifest
+++ b/sci-libs/indilib-driver-duino/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-duino/indilib-driver-duino-1.2.0.ebuild b/sci-libs/indilib-driver-duino/indilib-driver-duino-1.3.0.ebuild
index 3df216e..f9505bf 100644
--- a/sci-libs/indilib-driver-duino/indilib-driver-duino-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-duino/indilib-driver-duino-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the Arduino boards"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -23,4 +24,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-eqmod/Manifest b/sci-libs/indilib-driver-eqmod/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-eqmod/Manifest
+++ b/sci-libs/indilib-driver-eqmod/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-eqmod/indilib-driver-eqmod-1.2.0.ebuild b/sci-libs/indilib-driver-eqmod/indilib-driver-eqmod-1.3.0.ebuild
index 3979cb6..48f4097 100644
--- a/sci-libs/indilib-driver-eqmod/indilib-driver-eqmod-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-eqmod/indilib-driver-eqmod-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for mounts compliant to the SkyWatcher Protocol"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
@@ -23,4 +24,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-ffmv/Manifest b/sci-libs/indilib-driver-ffmv/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-ffmv/Manifest
+++ b/sci-libs/indilib-driver-ffmv/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-ffmv/indilib-driver-ffmv-1.2.0.ebuild b/sci-libs/indilib-driver-ffmv/indilib-driver-ffmv-1.3.0.ebuild
index 2eaaa40..c9e57d4 100644
--- a/sci-libs/indilib-driver-ffmv/indilib-driver-ffmv-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-ffmv/indilib-driver-ffmv-1.3.0.ebuild
@@ -4,15 +4,16 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the Point Grey FireFly MV camera"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
-LICENSE="LGPL-2 GPL-3 qhyccd"
+LICENSE="LGPL-2 GPL-3"
 KEYWORDS="~amd64 ~x86"
 
 SLOT="0"
@@ -24,4 +25,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${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 6aa4c10..7d7f4f6 100644
--- a/sci-libs/indilib-driver-ffmv/indilib-driver-ffmv-9999.ebuild
+++ b/sci-libs/indilib-driver-ffmv/indilib-driver-ffmv-9999.ebuild
@@ -7,12 +7,12 @@ EAPI=5
 inherit cmake-utils subversion eutils
 
 INDI_SVN_DIR="${PN%%lib-driver-*}${PN##*-driver}"
-DESCRIPTION="INDI driver the for Point Grey FireFly MV camera"
+DESCRIPTION="INDI driver the for the Point Grey FireFly MV camera"
 HOMEPAGE="http://indilib.org"
 ESVN_REPO_URI="svn://svn.code.sf.net/p/indi/code/trunk/3rdparty/${INDI_SVN_DIR}"
 ESVN_PROJECT="${P}"
 
-LICENSE="LGPL-2 GPL-3 qhyccd"
+LICENSE="LGPL-2 GPL-3"
 KEYWORDS=""
 
 SLOT="0"
diff --git a/sci-libs/indilib-driver-fishcamp/Manifest b/sci-libs/indilib-driver-fishcamp/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-fishcamp/Manifest
+++ b/sci-libs/indilib-driver-fishcamp/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-fishcamp/indilib-driver-fishcamp-1.2.0.ebuild b/sci-libs/indilib-driver-fishcamp/indilib-driver-fishcamp-1.3.0.ebuild
index 4b34a99..a9f7a12 100644
--- a/sci-libs/indilib-driver-fishcamp/indilib-driver-fishcamp-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-fishcamp/indilib-driver-fishcamp-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the Fishcamp Engineering's Starfish CMOS autoguider"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -24,4 +25,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-fli/Manifest b/sci-libs/indilib-driver-fli/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-fli/Manifest
+++ b/sci-libs/indilib-driver-fli/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-fli/indilib-driver-fli-1.2.0.ebuild b/sci-libs/indilib-driver-fli/indilib-driver-fli-1.3.0.ebuild
index 4d27878..4754cff 100644
--- a/sci-libs/indilib-driver-fli/indilib-driver-fli-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-fli/indilib-driver-fli-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the Finger Lakes Instruments CCD and Focuser"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -24,4 +25,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-gige/Manifest b/sci-libs/indilib-driver-gige/Manifest
new file mode 100644
index 0000000..bda6d84
--- /dev/null
+++ b/sci-libs/indilib-driver-gige/Manifest
@@ -0,0 +1 @@
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-gige/indilib-driver-gige-1.3.0.ebuild b/sci-libs/indilib-driver-gige/indilib-driver-gige-1.3.0.ebuild
new file mode 100644
index 0000000..dad5360
--- /dev/null
+++ b/sci-libs/indilib-driver-gige/indilib-driver-gige-1.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
+
+inherit cmake-utils eutils
+
+DESCRIPTION="INDI driver for the Point Grey FireFly MV camera"
+HOMEPAGE="http://indilib.org"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
+
+LICENSE="LGPL-2 GPL-3"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+DEPEND="<sci-libs/indilib-9999
+	>=media-video/aravis-0.6"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${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
new file mode 100644
index 0000000..c2d45d6
--- /dev/null
+++ b/sci-libs/indilib-driver-gige/indilib-driver-gige-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils subversion eutils
+
+INDI_SVN_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+DESCRIPTION="INDI driver the for Point Grey FireFly MV camera"
+HOMEPAGE="http://indilib.org"
+ESVN_REPO_URI="svn://svn.code.sf.net/p/indi/code/trunk/3rdparty/${INDI_SVN_DIR}"
+ESVN_PROJECT="${P}"
+
+LICENSE="LGPL-2 GPL-3 qhyccd"
+KEYWORDS=""
+
+SLOT="0"
+
+DEPEND="=sci-libs/indilib-9999
+	>=media-video/aravis-0.6"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	subversion_src_unpack
+}
diff --git a/sci-libs/indilib-driver-gige/metadata.xml b/sci-libs/indilib-driver-gige/metadata.xml
new file mode 100644
index 0000000..069e9e9
--- /dev/null
+++ b/sci-libs/indilib-driver-gige/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <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>
+	<maintainer status="active">
+		<email>bgilsrud@gmail.com</email>
+		<name>Ben Gilsrud</name>
+	</maintainer>
+        <bugs-to>http://sourceforge.net/p/indi/bugs/</bugs-to>
+        <remote-id type="sourceforge">indi</remote-id>
+  </upstream>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/sci-libs/indilib-driver-gphoto/Manifest b/sci-libs/indilib-driver-gphoto/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-gphoto/Manifest
+++ b/sci-libs/indilib-driver-gphoto/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-1.2.0.ebuild b/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-1.3.0.ebuild
index 102896f..eb1d5e5 100644
--- a/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the gphoto2 compatible cameras"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -26,4 +27,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-gpsd/Manifest b/sci-libs/indilib-driver-gpsd/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-gpsd/Manifest
+++ b/sci-libs/indilib-driver-gpsd/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-gpsd/indilib-driver-gpsd-1.2.0.ebuild b/sci-libs/indilib-driver-gpsd/indilib-driver-gpsd-1.3.0.ebuild
index 12dc5ac..2f91fd2 100644
--- a/sci-libs/indilib-driver-gpsd/indilib-driver-gpsd-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-gpsd/indilib-driver-gpsd-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for GPS daemon"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
@@ -24,4 +25,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-maxdomeii/Manifest b/sci-libs/indilib-driver-maxdomeii/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-maxdomeii/Manifest
+++ b/sci-libs/indilib-driver-maxdomeii/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-maxdomeii/indilib-driver-maxdomeii-1.2.0.ebuild b/sci-libs/indilib-driver-maxdomeii/indilib-driver-maxdomeii-1.3.0.ebuild
index c0a084c..6979b28 100644
--- a/sci-libs/indilib-driver-maxdomeii/indilib-driver-maxdomeii-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-maxdomeii/indilib-driver-maxdomeii-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the Maxdome II"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -23,4 +24,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-mi/Manifest b/sci-libs/indilib-driver-mi/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-mi/Manifest
+++ b/sci-libs/indilib-driver-mi/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-mi/indilib-driver-mi-1.2.0.ebuild b/sci-libs/indilib-driver-mi/indilib-driver-mi-1.3.0.ebuild
index 8f486bc..65d384a 100644
--- a/sci-libs/indilib-driver-mi/indilib-driver-mi-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-mi/indilib-driver-mi-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the Moravian MI CCD cameras"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
@@ -23,4 +24,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-nexstarevo/Manifest b/sci-libs/indilib-driver-nexstarevo/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-nexstarevo/Manifest
+++ b/sci-libs/indilib-driver-nexstarevo/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-nexstarevo/indilib-driver-nexstarevo-1.2.0.ebuild b/sci-libs/indilib-driver-nexstarevo/indilib-driver-nexstarevo-1.3.0.ebuild
index cf2a67e..0bc24a6 100644
--- a/sci-libs/indilib-driver-nexstarevo/indilib-driver-nexstarevo-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-nexstarevo/indilib-driver-nexstarevo-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for Nexstar Evolution mounts"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
@@ -23,4 +24,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-qhy/Manifest b/sci-libs/indilib-driver-qhy/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-qhy/Manifest
+++ b/sci-libs/indilib-driver-qhy/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-qhy/indilib-driver-qhy-1.2.0.ebuild b/sci-libs/indilib-driver-qhy/indilib-driver-qhy-1.3.0.ebuild
index 0234171..e927ec9 100644
--- a/sci-libs/indilib-driver-qhy/indilib-driver-qhy-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-qhy/indilib-driver-qhy-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the QHY CCD cameras"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2 GPL-3 qhyccd"
 KEYWORDS="~amd64 ~x86"
@@ -24,4 +25,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-qsi/Manifest b/sci-libs/indilib-driver-qsi/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-qsi/Manifest
+++ b/sci-libs/indilib-driver-qsi/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-qsi/indilib-driver-qsi-1.2.0.ebuild b/sci-libs/indilib-driver-qsi/indilib-driver-qsi-1.3.0.ebuild
index 3280a23..4d43b91 100644
--- a/sci-libs/indilib-driver-qsi/indilib-driver-qsi-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-qsi/indilib-driver-qsi-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the Quantum Scientific Imaging CCDs & Filter Wheels"
 HOMEPAGE="http://indlib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -24,4 +25,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-sbig/Manifest b/sci-libs/indilib-driver-sbig/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-sbig/Manifest
+++ b/sci-libs/indilib-driver-sbig/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-sbig/indilib-driver-sbig-1.2.0.ebuild b/sci-libs/indilib-driver-sbig/indilib-driver-sbig-1.3.0.ebuild
index b14df4f..ba190b9 100644
--- a/sci-libs/indilib-driver-sbig/indilib-driver-sbig-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-sbig/indilib-driver-sbig-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the Santa Barbra Instruments Group line of CCDs & Filter Wheels"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -18,10 +19,10 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
 DEPEND="<sci-libs/indilib-9999
-	<sci-libs/sbig-9999"
+	<sci-libs/libsbig-9999"
 
 RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-shelyak/.indilib-driver-ffmv-1.3.0.ebuild.kate-swp b/sci-libs/indilib-driver-shelyak/.indilib-driver-ffmv-1.3.0.ebuild.kate-swp
new file mode 100644
index 0000000..cb48218
--- /dev/null
+++ b/sci-libs/indilib-driver-shelyak/.indilib-driver-ffmv-1.3.0.ebuild.kate-swp
diff --git a/sci-libs/indilib-driver-shelyak/Manifest b/sci-libs/indilib-driver-shelyak/Manifest
new file mode 100644
index 0000000..bda6d84
--- /dev/null
+++ b/sci-libs/indilib-driver-shelyak/Manifest
@@ -0,0 +1 @@
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-shelyak/indilib-driver-shelyak-1.3.0.ebuild b/sci-libs/indilib-driver-shelyak/indilib-driver-shelyak-1.3.0.ebuild
new file mode 100644
index 0000000..630a356
--- /dev/null
+++ b/sci-libs/indilib-driver-shelyak/indilib-driver-shelyak-1.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
+
+inherit cmake-utils eutils
+
+DESCRIPTION="INDI driver for Shelyak spectrographs"
+HOMEPAGE="http://indilib.org"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
+
+LICENSE="LGPL-2 GPL-3 qhyccd"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+DEPEND="<sci-libs/indilib-9999
+	media-libs/libdc1394"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${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
new file mode 100644
index 0000000..dfd9c8c
--- /dev/null
+++ b/sci-libs/indilib-driver-shelyak/indilib-driver-shelyak-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils subversion eutils
+
+INDI_SVN_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+DESCRIPTION="INDI driver the for Shelyak spectrographs"
+HOMEPAGE="http://indilib.org"
+ESVN_REPO_URI="svn://svn.code.sf.net/p/indi/code/trunk/3rdparty/${INDI_SVN_DIR}"
+ESVN_PROJECT="${P}"
+
+LICENSE="LGPL-2 GPL-3 qhyccd"
+KEYWORDS=""
+
+SLOT="0"
+
+DEPEND="=sci-libs/indilib-9999
+	media-libs/libdc1394"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	subversion_src_unpack
+}
diff --git a/sci-libs/indilib-driver-shelyak/metadata.xml b/sci-libs/indilib-driver-shelyak/metadata.xml
new file mode 100644
index 0000000..0727f04
--- /dev/null
+++ b/sci-libs/indilib-driver-shelyak/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <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>http://sourceforge.net/p/indi/bugs/</bugs-to>
+        <remote-id type="sourceforge">indi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-spectracyber/Manifest b/sci-libs/indilib-driver-spectracyber/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-spectracyber/Manifest
+++ b/sci-libs/indilib-driver-spectracyber/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-spectracyber/indilib-driver-spectracyber-1.2.0.ebuild b/sci-libs/indilib-driver-spectracyber/indilib-driver-spectracyber-1.3.0.ebuild
index 87fb534..cd76d33 100644
--- a/sci-libs/indilib-driver-spectracyber/indilib-driver-spectracyber-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-spectracyber/indilib-driver-spectracyber-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the Radio Astronomy Supplies' SpectraCyber hydrogen line spectrometer"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -23,4 +24,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-ssag/.indilib-driver-ffmv-1.3.0.ebuild.kate-swp b/sci-libs/indilib-driver-ssag/.indilib-driver-ffmv-1.3.0.ebuild.kate-swp
new file mode 100644
index 0000000..cb48218
--- /dev/null
+++ b/sci-libs/indilib-driver-ssag/.indilib-driver-ffmv-1.3.0.ebuild.kate-swp
diff --git a/sci-libs/indilib-driver-ssag/Manifest b/sci-libs/indilib-driver-ssag/Manifest
new file mode 100644
index 0000000..bda6d84
--- /dev/null
+++ b/sci-libs/indilib-driver-ssag/Manifest
@@ -0,0 +1 @@
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-ssag/indilib-driver-ssag-1.3.0.ebuild b/sci-libs/indilib-driver-ssag/indilib-driver-ssag-1.3.0.ebuild
new file mode 100644
index 0000000..ab53e1f
--- /dev/null
+++ b/sci-libs/indilib-driver-ssag/indilib-driver-ssag-1.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
+
+inherit cmake-utils eutils
+
+DESCRIPTION="INDI driver for the Orion StarShoot Autoguider"
+HOMEPAGE="http://indilib.org"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
+
+LICENSE="openssag"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+DEPEND="<sci-libs/indilib-9999
+	media-libs/libdc1394"
+
+RDEPEND="${DEPEND}"
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${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
new file mode 100644
index 0000000..ea0cc6f
--- /dev/null
+++ b/sci-libs/indilib-driver-ssag/indilib-driver-ssag-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils subversion eutils
+
+INDI_SVN_DIR="${PN%%lib-driver-*}${PN##*-driver}"
+DESCRIPTION="INDI driver the for the Orion StarShoot Autoguider"
+HOMEPAGE="http://indilib.org"
+ESVN_REPO_URI="svn://svn.code.sf.net/p/indi/code/trunk/3rdparty/${INDI_SVN_DIR}"
+ESVN_PROJECT="${P}"
+
+LICENSE="openssag"
+KEYWORDS=""
+
+SLOT="0"
+
+DEPEND="=sci-libs/indilib-9999
+	media-libs/libdc1394"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	subversion_src_unpack
+}
diff --git a/sci-libs/indilib-driver-ssag/metadata.xml b/sci-libs/indilib-driver-ssag/metadata.xml
new file mode 100644
index 0000000..b2f8a9b
--- /dev/null
+++ b/sci-libs/indilib-driver-ssag/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <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>http://sourceforge.net/p/indi/bugs/</bugs-to>
+        <remote-id type="sourceforge">indi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/indilib-driver-sx/Manifest b/sci-libs/indilib-driver-sx/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-sx/Manifest
+++ b/sci-libs/indilib-driver-sx/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-sx/indilib-driver-sx-1.2.0.ebuild b/sci-libs/indilib-driver-sx/indilib-driver-sx-1.3.0.ebuild
index c3002e5..b3129c9 100644
--- a/sci-libs/indilib-driver-sx/indilib-driver-sx-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-sx/indilib-driver-sx-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the SX astronomical equipement"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2 cloudmakers"
 KEYWORDS="~amd64 ~x86"
@@ -23,4 +24,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-driver-tess/Manifest b/sci-libs/indilib-driver-tess/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/indilib-driver-tess/Manifest
+++ b/sci-libs/indilib-driver-tess/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib-driver-tess/indilib-driver-tess-1.2.0.ebuild b/sci-libs/indilib-driver-tess/indilib-driver-tess-1.3.0.ebuild
index c7eb674..59eef5b 100644
--- a/sci-libs/indilib-driver-tess/indilib-driver-tess-1.2.0.ebuild
+++ b/sci-libs/indilib-driver-tess/indilib-driver-tess-1.3.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-MY_PN="lib${PN%%lib-driver-*}"
+MY_PN="${PN%%lib-driver-*}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils eutils
 
 DESCRIPTION="INDI driver for the TESS custom stronomical board"
 HOMEPAGE="http://tech.groups.yahoo.com/group/ObservatorioRemoto/"
-SRC_URI="http://sourceforge.net/projects/indi/files/${MY_PN}_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -23,4 +24,4 @@ RDEPEND="${DEPEND}"
 
 INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}${PN##*-driver}"
 
-S="${WORKDIR}/${MY_PN}_3rdparty_${PV}/${INDI_TARGET_DIRECTORY}"
-\ No newline at end of file
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/indilib-drivers/indilib-drivers-1.2.0.ebuild b/sci-libs/indilib-drivers/indilib-drivers-1.3.0.ebuild
index f3c6df7..ffe459f 100644
--- a/sci-libs/indilib-drivers/indilib-drivers-1.2.0.ebuild
+++ b/sci-libs/indilib-drivers/indilib-drivers-1.3.0.ebuild
@@ -14,13 +14,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE_INDILIB_DRIVERS="
 	aagcloudwatcher
 	apogee
-	asicam
+	asi
 	dsi
 	duino
 	eqmod
 	ffmv
 	fishcamp
 	fli
+	gige
 	gphoto2
 	gpsd
 	maxdomeii
@@ -29,7 +30,9 @@ IUSE_INDILIB_DRIVERS="
 	qhy
 	qsi
 	sbig
+	sheylak
 	spectracyber
+	ssag
 	sx
 	tess
 	"
@@ -38,13 +41,14 @@ IUSE="${IUSE_INDILIB_DRIVERS}"
 
 PDEPEND="aagcloudwatcher? ( sci-libs/indilib-driver-aagcloudwatcher )
 	apogee? ( sci-libs/indilib-driver-apogee )
-	asicam? ( sci-libs/indilib-driver-asicam )
+	asi? ( sci-libs/indilib-driver-asi )
 	dsi? ( sci-libs/indilib-driver-dsi )
 	duino? ( sci-libs/indilib-driver-duino )
 	eqmod? ( sci-libs/indilib-driver-eqmod )
 	ffmv? ( sci-libs/indilib-driver-ffmv )
 	fishcamp? ( sci-libs/indilib-driver-fishcamp )
 	fli? ( sci-libs/indilib-driver-fli )
+	gige? ( sci-libs/indilib-driver-gige )
 	gphoto2? ( sci-libs/indilib-driver-gphoto )
 	gpsd? ( sci-libs/indilib-driver-gpsd )
 	maxdomeii? ( sci-libs/indilib-driver-maxdomeii )
@@ -53,6 +57,8 @@ PDEPEND="aagcloudwatcher? ( sci-libs/indilib-driver-aagcloudwatcher )
 	qhy? ( sci-libs/indilib-driver-qhy )
 	qsi? ( sci-libs/indilib-driver-qsi )
 	sbig? ( sci-libs/indilib-driver-sbig )
+	sheylak? ( sci-libs/indilib-driver-sheylak )
 	spectracyber? ( sci-libs/indilib-driver-spectracyber )
+	ssag? ( sci-libs/indilib-driver-ssag )
 	sx? ( sci-libs/indilib-driver-sx )
 	tess? ( sci-libs/indilib-driver-tess )"
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index ce627cc..bda6d84 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1 +1 @@
-DIST libindi_1.2.0.tar.gz 1425804 SHA256 a1cf17a4f0a0ca30afd4c131b82e181aeb42a68cda176d5b4c6945436ced2321 SHA512 4d7b67e3ff6000132c2971e58942c5f95822d156c6f9587697b6179137cd40997527d62886d0f5fe053980d1a404b61191d1c54194e9a7154bd10b0e3a7c05d6 WHIRLPOOL fe710841e63acc806b17414df231cd178680da8ed8e7c719c32e34cae9d2203362a9cce0cb7e0593d46dda98f9bb8e9b2cc7d28442e491fb11e1786b3145feca
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/indilib/files/indilib-1.2.0-symlinks.patch b/sci-libs/indilib/files/indilib-1.2.0-symlinks.patch
deleted file mode 100644
index d2b6221..0000000
--- a/sci-libs/indilib/files/indilib-1.2.0-symlinks.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- CMakeLists.txt	2016-02-02 06:52:24.000000000 +0100
-+++ CMakeLists.txt.new	2016-02-04 21:34:27.813492812 +0100
-@@ -264,19 +264,11 @@
- 
- install(TARGETS indi_lx200generic RUNTIME DESTINATION bin )
- 
--file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake
--"exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200classic)\n
--exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200autostar)\n
--exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200_16)\n
--exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200gps)\n
--exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200ap)\n
--exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200gemini)\n
--exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200zeq25)\n
--exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200pulsar2)\n
--exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200fs2)\n
--exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200ss2000pc)\n
--")
--set_target_properties(indi_lx200generic PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake)
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200classic\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200autostar\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200_16\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx20gps\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200ap\" )" )
- #################################################################################
- 
- ########### Celestron GPS ############
diff --git a/sci-libs/indilib/files/indiserver.sh b/sci-libs/indilib/files/indiserver.sh
index 6a99ef9..3cb69c5 100644
--- a/sci-libs/indilib/files/indiserver.sh
+++ b/sci-libs/indilib/files/indiserver.sh
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 
 if [ ! "${INDISERVER_USER}" ]; then
 	INDISERVER_USER="indiserver"
diff --git a/sci-libs/indilib/indilib-1.2.0.ebuild b/sci-libs/indilib/indilib-1.3.0.ebuild
index c86b75d..03f24be 100644
--- a/sci-libs/indilib/indilib-1.2.0.ebuild
+++ b/sci-libs/indilib/indilib-1.3.0.ebuild
@@ -4,18 +4,19 @@
 
 EAPI=5
 
-MY_PN="lib${PN/lib/}"
+MY_PN="${PN/lib/}"
+MY_PV="${PV/.0/}"
 
 inherit cmake-utils udev user
 
 DESCRIPTION="INDI Astronomical Control Protocol library"
 HOMEPAGE="http://www.indilib.org/"
-SRC_URI="mirror://sourceforge/${PN/lib/}/${MY_PN}_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2.1+ BSD GPL-2+ LGPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="drivers"
+IUSE="drivers qt5"
 
 RDEPEND="
 	sci-libs/cfitsio
@@ -24,6 +25,9 @@ RDEPEND="
 	sys-libs/zlib
 	virtual/jpeg:0
 	virtual/libusb:1
+	dev-libs/pth
+    net-misc/curl
+	qt5? ( >=x11-libs/qtnetwork-5.6.2 )
 "
 DEPEND="${RDEPEND}
 	sys-kernel/linux-headers
@@ -32,11 +36,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog README TODO )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.0-symlinks.patch"
-)
-
-S=${WORKDIR}/${MY_PN}_${PV}
+S=${WORKDIR}/${MY_PN}-${MY_PV}/libindi
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/sci-libs/libapogee/Manifest b/sci-libs/libapogee/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/libapogee/Manifest
+++ b/sci-libs/libapogee/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/libapogee/libapogee-1.2.0.ebuild b/sci-libs/libapogee/libapogee-1.3.0.ebuild
index 891e2f6..81493a2 100644
--- a/sci-libs/libapogee/libapogee-1.2.0.ebuild
+++ b/sci-libs/libapogee/libapogee-1.3.0.ebuild
@@ -6,9 +6,12 @@ EAPI=5
 
 inherit cmake-utils eutils
 
+MY_PN="indi"
+MY_PV="${PV/.0/}"
+
 DESCRIPTION="Driver for the Apogee ALTA device drivers"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/libindi_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86 ~arm"
@@ -20,4 +23,6 @@ DEPEND="virtual/libusb:1
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/libindi_3rdparty_${PV}/${PN}"
-\ No newline at end of file
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libfishcamp/Manifest b/sci-libs/libfishcamp/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/libfishcamp/Manifest
+++ b/sci-libs/libfishcamp/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/libfishcamp/libfishcamp-1.2.0.ebuild b/sci-libs/libfishcamp/libfishcamp-1.3.0.ebuild
index 114ccbb..d6fb10b 100644
--- a/sci-libs/libfishcamp/libfishcamp-1.2.0.ebuild
+++ b/sci-libs/libfishcamp/libfishcamp-1.3.0.ebuild
@@ -6,13 +6,18 @@ EAPI=5
 
 inherit cmake-utils eutils
 
+MY_PN="indi"
+MY_PV="${PV/.0/}"
+
 DESCRIPTION="Firmware for the Fishcamp Engineering's Starfish CMOS autoguider"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/libindi_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="fishcamp"
 KEYWORDS="~amd64 ~x86 ~arm"
 
 SLOT="0"
 
-S="${WORKDIR}/libindi_3rdparty_${PV}/${PN}"
-\ No newline at end of file
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libfli/Manifest b/sci-libs/libfli/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/libfli/Manifest
+++ b/sci-libs/libfli/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/libfli/libfli-1.2.0.ebuild b/sci-libs/libfli/libfli-1.3.0.ebuild
index c8814bc..13567ce 100644
--- a/sci-libs/libfli/libfli-1.2.0.ebuild
+++ b/sci-libs/libfli/libfli-1.3.0.ebuild
@@ -6,9 +6,12 @@ EAPI=5
 
 inherit cmake-utils eutils
 
+MY_PN="indi"
+MY_PV="${PV/.0/}"
+
 DESCRIPTION="Driver for the Finger Lakes Instruments CCD and Focuser"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/libindi_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86 ~arm"
@@ -19,4 +22,6 @@ DEPEND="virtual/libusb:1"
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/libindi_3rdparty_${PV}/${PN}"
-\ No newline at end of file
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libqhy/Manifest b/sci-libs/libqhy/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/libqhy/Manifest
+++ b/sci-libs/libqhy/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/libqhy/files/libqhy-1.1.0_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-1.3.0_fix_cmake_symlinks.patch
index b30a256..c559cd4 100644
--- a/sci-libs/libqhy/files/libqhy-1.1.0_fix_cmake_symlinks.patch
+++ b/sci-libs/libqhy/files/libqhy-1.3.0_fix_cmake_symlinks.patch
@@ -1,26 +1,26 @@
---- CMakeLists.txt	2015-09-06 15:21:03.000000000 +0200
-+++ CMakeLists.txt.new	2015-11-24 23:07:29.754679041 +0100
-@@ -31,12 +31,6 @@
-  ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l")
- ENDIF(UNIX AND NOT WIN32)
- 
--# Make sure symbolic links are installed
--file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake "
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION})\n
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so)\n
--")
--
- install(FILES qhyccd.h qhyccdcamdef.h qhyccderr.h qhyccdstruct.h DESTINATION include/libqhy)
- install(FILES ${CMAKE_BINARY_DIR}/libqhy.so.${LIBQHY_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX})
- install(FILES 85-qhy.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
-@@ -46,7 +40,9 @@
-    file(INSTALL DESTINATION ${FIRMWARE_INSTALL_DIR} TYPE FILE FILES \${QHY_FIRMWARE})"
-  )
- 
--install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake)
-+# Make sure symbolic links are installed
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libqhy.so.${LIBQHY_VERSION}\" \"libqhy.so.${LIBQHY_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libqhy.so.${LIBQHY_SOVERSION}\" \"libqhy.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
- 
- ENDIF (APPLE)
- 
+--- CMakeLists.txt	2016-10-30 10:10:00.000000000 +0100
++++ CMakeLists.txt.new	2016-11-03 00:00:53.900449996 +0100
+@@ -33,12 +33,6 @@
+  ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l")
+ ENDIF(UNIX AND NOT WIN32)
+ 
+-# Make sure symbolic links are installed
+-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake "
+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION})\n
+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so)\n
+-")
+-
+ install(FILES qhyccd.h qhyccdcamdef.h qhyccderr.h qhyccdstruct.h log4z.h DESTINATION include/libqhy)
+ install(FILES ${CMAKE_BINARY_DIR}/libqhy.so.${LIBQHY_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX})
+ install(FILES 85-qhy.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
+@@ -48,7 +42,9 @@
+    file(INSTALL DESTINATION ${FIRMWARE_INSTALL_DIR} TYPE FILE FILES \${QHY_FIRMWARE})"
+  )
+ 
+-install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake)
++# Make sure symbolic links are installed
++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libqhy.so.${LIBQHY_VERSION}\" \"libqhy.so.${LIBQHY_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libqhy.so.${LIBQHY_SOVERSION}\" \"libqhy.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
+ 
+ ENDIF (APPLE)
+ 
diff --git a/sci-libs/libqhy/libqhy-1.2.0.ebuild b/sci-libs/libqhy/libqhy-1.3.0.ebuild
index ef5a138..7732177 100644
--- a/sci-libs/libqhy/libqhy-1.2.0.ebuild
+++ b/sci-libs/libqhy/libqhy-1.3.0.ebuild
@@ -6,9 +6,12 @@ EAPI=5
 
 inherit cmake-utils eutils
 
+MY_PN="indi"
+MY_PV="${PV/.0/}"
+
 DESCRIPTION="SDK and firmware for the QHY CCD cameras"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/libindi_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="GPL-3 LGPL-2 qhyccd"
 KEYWORDS="~amd64 ~x86 ~arm"
@@ -20,6 +23,8 @@ DEPEND="virtual/libusb:1
 
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/libqhy-1.1.0_fix_cmake_symlinks.patch" )
+PATCHES=( "${FILESDIR}/libqhy-1.3.0_fix_cmake_symlinks.patch" )
+
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}"
 
-S="${WORKDIR}/libindi_3rdparty_${PV}/${PN}"
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libqsi/Manifest b/sci-libs/libqsi/Manifest
index 6b87073..bda6d84 100644
--- a/sci-libs/libqsi/Manifest
+++ b/sci-libs/libqsi/Manifest
@@ -1 +1 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/libqsi/libqsi-1.2.0.ebuild b/sci-libs/libqsi/libqsi-1.3.0.ebuild
index 793b381..322e936 100644
--- a/sci-libs/libqsi/libqsi-1.2.0.ebuild
+++ b/sci-libs/libqsi/libqsi-1.3.0.ebuild
@@ -6,9 +6,12 @@ EAPI=5
 
 inherit cmake-utils eutils
 
+MY_PN="indi"
+MY_PV="${PV/.0/}"
+
 DESCRIPTION="Driver for the Quantum Scientific Imaging CCDs & Filter Wheels"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/libindi_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="qsi"
 KEYWORDS="~amd64 ~x86 ~arm"
@@ -19,4 +22,6 @@ DEPEND="dev-embedded/libftdi:0"
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/libindi_3rdparty_${PV}/${PN}"
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
diff --git a/sci-libs/libsbig/Manifest b/sci-libs/libsbig/Manifest
new file mode 100644
index 0000000..bda6d84
--- /dev/null
+++ b/sci-libs/libsbig/Manifest
@@ -0,0 +1 @@
+DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
diff --git a/sci-libs/sbig/files/sbig-1.1.0_fix_cmake_symlinks.patch b/sci-libs/libsbig/files/libsbig-1.3.0_fix_cmake_symlinks.patch
index c92485e..bc5038b 100644
--- a/sci-libs/sbig/files/sbig-1.1.0_fix_cmake_symlinks.patch
+++ b/sci-libs/libsbig/files/libsbig-1.3.0_fix_cmake_symlinks.patch
@@ -1,21 +1,21 @@
---- CMakeLists.txt	2015-09-06 15:21:02.000000000 +0200
-+++ CMakeLists.txt.new	2015-11-24 22:48:39.732250495 +0100
+--- CMakeLists.txt	2016-10-30 10:10:00.000000000 +0100
++++ CMakeLists.txt.new	2016-11-02 23:52:51.688242341 +0100
 @@ -22,14 +22,11 @@
-  ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l")
- ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
- 
--# Make sure symbolic links are installed
--file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake "
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION})\n
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so)\n
--")
--
- install( FILES ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX})
- install( FILES sbigudrv.h DESTINATION include/libsbig)
- install( FILES sbigucam.hex sbiglcam.hex sbigfcam.hex sbigpcam.hex stfga.bin DESTINATION ${FIRMWARE_INSTALL_DIR})
- install( FILES 51-sbig-debian.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
--install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake)
-+
-+# Make sure symbolic links are installed
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_VERSION}\" \"libsbigudrv.so.${SBIG_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_SOVERSION}\" \"libsbigudrv.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
+  ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l")
+ ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
+ 
+-# Make sure symbolic links are installed
+-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake "
+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION})\n
+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so)\n
+-")
+-
+ install( FILES ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX})
+ install( FILES sbigudrv.h DESTINATION include/libsbig)
+ install( FILES sbigucam.hex sbiglcam.hex sbigfcam.hex sbigpcam.hex stfga.bin DESTINATION ${FIRMWARE_INSTALL_DIR})
+ install( FILES 51-sbig-debian.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
+-install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake)
++
++# Make sure symbolic links are installed
++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_VERSION}\" \"libsbigudrv.so.${SBIG_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_SOVERSION}\" \"libsbigudrv.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
diff --git a/sci-libs/sbig/files/sbig-9999_fix_cmake_symlinks.patch b/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch
index 6ae4249..6ae4249 100644
--- a/sci-libs/sbig/files/sbig-9999_fix_cmake_symlinks.patch
+++ b/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch
diff --git a/sci-libs/sbig/sbig-1.2.0.ebuild b/sci-libs/libsbig/libsbig-1.3.0.ebuild
index 9e224f8..2d9ba1c 100644
--- a/sci-libs/sbig/sbig-1.2.0.ebuild
+++ b/sci-libs/libsbig/libsbig-1.3.0.ebuild
@@ -6,15 +6,20 @@ EAPI=5
 
 inherit cmake-utils
 
+MY_PN="indi"
+MY_PV="${PV/.0/}"
+
 DESCRIPTION="Driver for the Santa Barbara Instruments Group line of CCDs & Filter Wheels"
 HOMEPAGE="http://indilib.org"
-SRC_URI="http://sourceforge.net/projects/indi/files/libindi_3rdparty_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="sbig"
 KEYWORDS="~arm ~amd64 ~x86"
 
 SLOT="0"
 
-S="${WORKDIR}/libindi_3rdparty_${PV}/${PN}"
+INDI_TARGET_DIRECTORY="${PN%%lib-driver-*}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/3rdparty/${INDI_TARGET_DIRECTORY}"
 
-PATCHES=( "${FILESDIR}/sbig-1.1.0_fix_cmake_symlinks.patch" )
+PATCHES=( "${FILESDIR}/libsbig-1.3.0_fix_cmake_symlinks.patch" )
diff --git a/sci-libs/sbig/sbig-9999.ebuild b/sci-libs/libsbig/libsbig-9999.ebuild
index 7e02651..ff5cbf9 100644
--- a/sci-libs/sbig/sbig-9999.ebuild
+++ b/sci-libs/libsbig/libsbig-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-SBIG_VERSION="2.1.0"
+SBIG_VERSION="2.1.1"
 SBIG_SOVERSION="2"
 
 inherit cmake-utils subversion
@@ -19,8 +19,8 @@ KEYWORDS=""
 
 SLOT="0"
 
-ESVN_PATCHES=( "${FILESDIR}/sbig-9999_fix_cmake_symlinks.patch" )
+ESVN_PATCHES=( "${FILESDIR}/libsbig-9999_fix_cmake_symlinks.patch" )
 
 src_unpack() {
 	subversion_src_unpack
-}
-\ No newline at end of file
+}
diff --git a/sci-libs/sbig/metadata.xml b/sci-libs/libsbig/metadata.xml
index 133470d..133470d 100644
--- a/sci-libs/sbig/metadata.xml
+++ b/sci-libs/libsbig/metadata.xml
diff --git a/sci-libs/sbig/Manifest b/sci-libs/sbig/Manifest
deleted file mode 100644
index 6b87073..0000000
--- a/sci-libs/sbig/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libindi_3rdparty_1.2.0.tar.gz 20946276 SHA256 c60a44ac47e7c08a9f635ccc207e0d341775df47bf0e94452f1782d619078759 SHA512 60a62a5d3bdf1a67fe89912ec31e6eecdb4923527531e7cc1f12cf16a07f8082a81c59ad3655cd3aa7420e0abd32c4c882a45b486a03db952ff031e04ba637e6 WHIRLPOOL a0b0c390fd23e271d7d8ff7421324a19c88e80926bfefdf3aaf7d600c8d39e1369dd0bafe8c8f9a6b42d6205f16bf84cd4f1ec9645824056eba397ac6059d9b9
author	Ctibor Brančík <ctibor@brancik.cz>	2016-11-03 20:14:51 +0100
committer	Ctibor Brančík <ctibor@brancik.cz>	2016-11-03 20:14:51 +0100
commit	5943f851f7eb00dbec9c5b115ada5b24fe07dcfc (patch)
tree	13b14650fde8a2b94b72da6bcca526392c032b63
parent	0ad7861a1793cc0a73df8a164227c040f8a59825 (diff)
download	brancik-overlay-5943f851f7eb00dbec9c5b115ada5b24fe07dcfc.tar.gz brancik-overlay-5943f851f7eb00dbec9c5b115ada5b24fe07dcfc.tar.bz2