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

4 files changed, 19 insertions, 26 deletions

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>