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

4 files changed, 11 insertions, 38 deletions

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=(