From 98018c0ea896b8fb56a7bf255e66d35f2a3d8c22 Mon Sep 17 00:00:00 2001
From: Ctibor <ctibor.brancik@seznam.cz>
Date: Wed, 18 Feb 2015 20:51:28 +0100
Subject: Make new patch for sci-libs/libqhy based on patch for
 sci-libs/indilib.

---
 .../files/libqhy-1.0.0_fix_cmake_symlinks.patch    | 22 ++++++++++++++++++++++
 .../files/libqhy-9999_fix_cmake_symlink.patch      | 22 ----------------------
 sci-libs/libqhy/libqhy-1.0.0.ebuild                |  2 ++
 sci-libs/libqhy/libqhy-9999.ebuild                 |  9 +--------
 4 files changed, 25 insertions(+), 30 deletions(-)
 create mode 100644 sci-libs/libqhy/files/libqhy-1.0.0_fix_cmake_symlinks.patch
 delete mode 100644 sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlink.patch

diff --git a/sci-libs/libqhy/files/libqhy-1.0.0_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-1.0.0_fix_cmake_symlinks.patch
new file mode 100644
index 0000000..ae6d19f
--- /dev/null
+++ b/sci-libs/libqhy/files/libqhy-1.0.0_fix_cmake_symlinks.patch
@@ -0,0 +1,22 @@
+--- libindi_3rdparty/libqhy/CMakeLists.txt	2015-02-15 09:56:34.000000000 +0100
++++ libindi_3rdparty.new/libqhy/CMakeLists.txt	2015-02-18 20:45:54.098288860 +0100
+@@ -21,10 +21,8 @@
+ ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
+ 
+ # 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(CODE "exec_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_VERSION}\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION}\" )" )
++install(CODE "exec_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION}\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so)\" )" )
+ 
+ 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})
+@@ -35,6 +33,3 @@
+    file(INSTALL DESTINATION ${FIRMWARE_INSTALL_DIR} TYPE FILE FILES \${QHY_FIRMWARE})"
+  )
+  
+-install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake)
+-
+-
diff --git a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlink.patch b/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlink.patch
deleted file mode 100644
index ad383cf..0000000
--- a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlink.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libqhy/CMakeLists.txt	2015-02-14 16:50:49.000000000 +0100
-+++ libqhy.new/CMakeLists.txt	2015-02-14 23:48:33.766330952 +0100
-@@ -20,12 +20,6 @@
-  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_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})
-@@ -35,6 +29,3 @@
-    file(INSTALL DESTINATION ${FIRMWARE_INSTALL_DIR} TYPE FILE FILES \${QHY_FIRMWARE})"
-  )
-  
--install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake)
--
--
diff --git a/sci-libs/libqhy/libqhy-1.0.0.ebuild b/sci-libs/libqhy/libqhy-1.0.0.ebuild
index 6b04739..6074aaa 100644
--- a/sci-libs/libqhy/libqhy-1.0.0.ebuild
+++ b/sci-libs/libqhy/libqhy-1.0.0.ebuild
@@ -20,4 +20,6 @@ DEPEND="virtual/libusb:1
 
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/libqhy-1.0.0_fix_cmake_symlinks.patch" )
+
 S="${WORKDIR}/libindi_3rdparty/${PN}"
\ No newline at end of file
diff --git a/sci-libs/libqhy/libqhy-9999.ebuild b/sci-libs/libqhy/libqhy-9999.ebuild
index 9914e4c..b0a21eb 100644
--- a/sci-libs/libqhy/libqhy-9999.ebuild
+++ b/sci-libs/libqhy/libqhy-9999.ebuild
@@ -19,7 +19,7 @@ KEYWORDS=""
 
 SLOT="0"
 
-ESVN_PATCHES=( "${FILESDIR}/libqhy-9999_fix_cmake_symlink.patch" )
+ESVN_PATCHES=( "${FILESDIR}/libqhy-1.0.0_fix_cmake_symlink.patch" )
 
 DEPEND="virtual/libusb:1
 	media-libs/opencv"
@@ -28,11 +28,4 @@ RDEPEND="${DEPEND}"
 
 src_unpack() {
 	subversion_src_unpack
-}
-
-src_install() {
-	cmake-utils_src_install
-	cd "${D}"/usr/lib || die
-	ln -snf libqhy.so."${LIBQHY_VERSION}" libqhy.so."${LIBQHY_SOVERSION}" || die
-	ln -snf libqhy.so."${LIBQHY_SOVERSION}" libqhy.so || die
 }
\ No newline at end of file
-- 
cgit v1.2.3