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

3 files changed, 35 insertions, 30 deletions

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}"