sci-libs/indilib codebase moved to github, all indilib ebuilds updated accordingly.

4 files changed, 33 insertions, 35 deletions

diff --git a/sci-libs/libqhy/Manifest b/sci-libs/libqhy/Manifest
index bda6d84..7addb01 100644
--- a/sci-libs/libqhy/Manifest
+++ b/sci-libs/libqhy/Manifest
@@ -1 +1 @@
-DIST indi-1.3.zip 21066027 SHA256 7fe6013daac8d946d0f5ce80d8e858c57a619c3f039b5d2b1430950044f994fa SHA512 ad58ca76f4c0f4f269bd4d48e003807ce1fa337adb3ab2106082bd8917f384cb4de1572268bb272f45603e1b5d04e090f30fee42ed2ef5a9868a2d7b2b971eaa WHIRLPOOL 4bc58e6aa7bd36441e401afb3637061b64d9b24b34412592b4842ea7ae20b62c1920134795d6e7b62356105104c63cb1b07e3f75a8189f0e9ffa777d0bbdd54c
+DIST indilib-1.3.0.tar.gz 20145103 SHA256 80d48b3a7284a8fe738fafc527870ee07b8acb28b6b5538df2b2a2d916503177 SHA512 d6d9d4c5e901dae44248d841e1bcc7b6c4d934165e29b2d8baa8561f5e7432af03b1684bf670c52c221893e435e2cde4e79de18d41a5aac31c49a14d6f1328b4 WHIRLPOOL fe029cdbea6b9b90a11e14b4b73ae0e108ae9fbbf892139142a4859352ca3710f1304005b3d0cc0f63fd8d8df17be0b018db283ca984aba3e2d3c873a1d8f021
diff --git a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch
index 9b42a2f..39fc0f1 100644
--- a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch
+++ b/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch
@@ -1,26 +1,25 @@
---- CMakeLists.txt	2016-11-03 23:07:27.274473275 +0100
-+++ CMakeLists.txt.new	2016-11-03 23:09:45.604228575 +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 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})

-@@ -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-11-05 13:55:27.257074822 +0100
++++ CMakeLists.txt.new	2016-11-05 13:56:06.675022408 +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,6 +42,8 @@
+    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.3.0.ebuild b/sci-libs/libqhy/libqhy-1.3.0.ebuild
index 5948e8f..b08eb04 100644
--- a/sci-libs/libqhy/libqhy-1.3.0.ebuild
+++ b/sci-libs/libqhy/libqhy-1.3.0.ebuild
@@ -11,7 +11,7 @@ MY_PV="${PV/.0/}"
 
 DESCRIPTION="SDK and firmware for the QHY CCD cameras"
 HOMEPAGE="http://indilib.org"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-${MY_PV}.zip"
+SRC_URI="https://github.com/${PN}lib/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${MY_PN}lib-${PV}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2 qhyccd"
 KEYWORDS="~amd64 ~x86 ~arm"
diff --git a/sci-libs/libqhy/libqhy-9999.ebuild b/sci-libs/libqhy/libqhy-9999.ebuild
index 851d3bd..714ed6a 100644
--- a/sci-libs/libqhy/libqhy-9999.ebuild
+++ b/sci-libs/libqhy/libqhy-9999.ebuild
@@ -7,25 +7,24 @@ EAPI=5
 LIBQHY_VERSION="0.1.7"
 LIBQHY_SOVERSION="0"
 
-inherit cmake-utils subversion eutils
+inherit cmake-utils git-2 eutils
 
 DESCRIPTION="SDK and firmware for the QHY CCD cameras"
 HOMEPAGE="http://indilib.org"
-ESVN_REPO_URI="svn://svn.code.sf.net/p/indi/code/trunk/3rdparty/${PN}"
-ESVN_PROJECT="${P}"
+EGIT_REPO_URI="https://github.com/indilib/indi.git"
+EGIT_PROJECT="indilib"
+EGIT_SOURCEDIR="${WORKDIR}/${P}"
 
 LICENSE="GPL-3 LGPL-2 qhyccd"
 KEYWORDS=""
 
 SLOT="0"
 
-ESVN_PATCHES=( "${FILESDIR}/libqhy-9999_fix_cmake_symlinks.patch" )
+PATCHES=( "${FILESDIR}/libqhy-9999_fix_cmake_symlinks.patch" )
 
 DEPEND="virtual/libusb:1
 	media-libs/opencv"
 
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	subversion_src_unpack
-}
+S="${EGIT_SOURCEDIR}/3rdparty/${PN}"