Fix wrongly generated patch.

5 files changed, 55 insertions, 56 deletions

diff --git a/sci-libs/indilib-driver-gphoto/Manifest b/sci-libs/indilib-driver-gphoto/Manifest
index d5029c3..063ef57 100644
--- a/sci-libs/indilib-driver-gphoto/Manifest
+++ b/sci-libs/indilib-driver-gphoto/Manifest
@@ -1,2 +1,2 @@
-AUX fix_zlib_link.patch 766 SHA256 5f6a4647ea4ea1210cfc40fd225162f5583adcf95d9c98111fb975e3dbeed2c1 SHA512 a33917aeff3aa82acb62f7b11c0ecc0395cb108c2b8300e22a7f8e3e4097113a0501654884dc293ddcea33df43d695646f0fbe0e4c9afe85bc6abf67e83bbf8e WHIRLPOOL 12f6c6e4b0d9f8a6698faada591ec330049889bf14ecaf66948118a919ba665cea34e5f6ab3c54baef358d86038946357a8034b1095bee3a84461583aae5cc12
-EBUILD indilib-driver-gphoto-9999.ebuild 573 SHA256 06632f2fbed5f3b0c5a72c61a223562373c5f561238a4a546df8e0211ffe2e83 SHA512 a496404c83a0f8403adeb72ecab2ee739734d9d82d27983a4bace7266e1b85182a887051a06096b92d4547a2b79131c9553f0dd86b377f59e726c23ae0f84b3d WHIRLPOOL be8b8b22eea48abc54445f4b1cfe95c9c45d5c34613d94af0e98ada8a4e6779779b5f62a96c61eff2e42b578b1b478cdc0c0c2798bdce69147fea72866d2d0d0
+AUX fix_zlib_link.patch 748 SHA256 91a546e31357a5e9112c64f5b88d21226aceee4c8332d7c71eb5c2cb3f998a82 SHA512 732c82c457f760e2afc798b37af012d257e98edd4e5890d49048f42b21d86fa7636430b688a6527587873108a599902215180602a25061b623e21b9637973105 WHIRLPOOL 350bbe5b580ee300300eb01357138675eee5bc799908053fa7a9cf0d43d2ab5016a9ec6785df88f26211f2caf6308fa5248ea9f8c3839b546d8798585b5af8db
+EBUILD indilib-driver-gphoto-9999.ebuild 573 SHA256 f98b33cc11f2abe80feb7d905a1e891cde706d9cf9227d2430594c2c79b5309e SHA512 f90c12dc14a1d392906b6152b9585be77351dd62705b0f050e9dbf0ec80bc76b52b739f79a2f9be07bd274243ba9da1ec9e585f9f7f63589091479399a4ed6de WHIRLPOOL 0d94eeb708b546d13ec7b40e302ac663e98744cd59ea9836b410d00040f6f8b935909c500b60cad28f0ee5dfba7b4de56c31507fac1765c882824bf4c03a71d9
diff --git a/sci-libs/indilib-driver-gphoto/files/fix_zlib_link.patch b/sci-libs/indilib-driver-gphoto/files/fix_zlib_link.patch
index ef4b990..20fe36f 100644
--- a/sci-libs/indilib-driver-gphoto/files/fix_zlib_link.patch
+++ b/sci-libs/indilib-driver-gphoto/files/fix_zlib_link.patch
@@ -5,7 +5,7 @@
  add_executable(indi_gphoto_ccd ${indigphoto_SRCS})
  
 -target_link_libraries(indi_gphoto_ccd ${INDI_LIBRARIES} ${INDI_MAIN_LIBRARIES} ${CFITSIO_LIBRARIES} ${LIBGPHOTO2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} gphoto2_port)
-+target_link_libraries(indi_gphoto_ccd ${ZLIB_LIBRARIES} ${INDI_LIBRARIES} ${INDI_MAIN_LIBRARIES} ${CFITSIO_LIBRARIES} ${LIBGPHOTO2_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} gphoto2_port)
++target_link_libraries(indi_gphoto_ccd ${ZLIB_LIBRARIES} ${INDI_LIBRARIES} ${INDI_MAIN_LIBRARIES} ${CFITSIO_LIBRARIES} ${LIBGPHOTO2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} gphoto2_port)
  install(TARGETS indi_gphoto_ccd RUNTIME DESTINATION bin )
  
  install(FILES indi_gphoto.xml DESTINATION ${INDI_DATA_DIR})
diff --git a/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild b/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild
index b584571..c9a3638 100644
--- a/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild
+++ b/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 inherit cmake-utils subversion eutils
 
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index ccaa7f1..6b97ab5 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,4 +1,4 @@
-AUX 0.9.6-fix-zlib-link.patch 1768 SHA256 02ad660c72db54ff07b00f178c067de5e2d70729ef35463d28acd3629cf26ba3 SHA512 2134baf8d0bf9472601350e5b3288a13fcd786cb46f12dc268797f3ebfeb14a216993554593a13d688c6932d8af360a4b02644cbf26be3264ddc59f1e536a8a2 WHIRLPOOL 2d532560f9b228946068c5328a754faf4ffaf4bad32d3bb5cc9c73b8164b60c4dee01d4187b0e56ee3028ae1a0221d5d021d723c461d0929959dd9b2977f7b1d
+AUX 0.9.6-fix-zlib-link.patch 1805 SHA256 32ee1ce0aa7376513aa4161712a1c3f5e1c38f7e1c1b8f8df4cdec8bf9a049a5 SHA512 f1eed657fbccf08554510577a5bc58933705848888c48dd40bae8710c11db1cbfdfb2cd5fb658f9fae356fc4e3756c007237e2822943cb664e1207a11f254e26 WHIRLPOOL b76dd48c92b2521145b94a523df18df5dea6047c025269ad1e15cc59bb07c1ff8520785ea01f19ba592bdfa1e0e640c8ff80be8b2884645553036dababba3e13
 DIST libindi_0.9.6.tar.gz 393523 SHA256 44ef0a943fe9f312f874b2e76b9892bd850c60cbd936f608fb2c224375d6d0b3 SHA512 6fb07652dfd64894c80cb3f91cf2e94af27b5bded5ae3d9bfeab93c501f4f9ab64e24fe377e65bba9bba92cd1858df5ec0626cc19a26d3f8d3f4cec314fb42bd WHIRLPOOL 571da798d3869a14feefde887854dc9e036a50ed1e05adf2e88c83cd340c38f84678596638d82cabb3dbbe7e6f0ddd38243f2cdde6faf5eb9fb9b57d9e979338
 EBUILD indilib-0.9.6.ebuild 1201 SHA256 21ddaff977a7090f22d5cd2ec71b05cedef028b8f632e5a60c076cc70d82daa7 SHA512 756fbc2736d08588b3882c31565acbdf1a5adfaf8323834f2e5e7cf3074912d02eb9ed9459961a654fadd3e24842edcacf4958bc2bb28a602d40d09968bf7f4b WHIRLPOOL d96f17b912cdb0a6321365c045e52b4efc0a2035b7a87084d64a69521e8df808d55a09ae8816a6e1304f24e4a30bd7806d1afe67227d605a72feb290660ced5f
 MISC ChangeLog 2974 SHA256 c28223cc80b24de4f1e0f7fbaefecede219e1524b8a858c49a2cd59ed9b0aa57 SHA512 33e6dc584f8ae66a2617a907674bfc8c45c1fb7486489429b05452085312920ecbe26a592794af208c0748ea5c8d0ae8dafc480918d47c01e7cc7ee39425f925 WHIRLPOOL a5ca2f339e7503f8766b826aa3bb84d8c0b1c9b3ed9b337a32ec646d931507dd6c029084360dc6cd7d0a25052926ca152c07533de8c138b2be4aba14d304409d
diff --git a/sci-libs/indilib/files/0.9.6-fix-zlib-link.patch b/sci-libs/indilib/files/0.9.6-fix-zlib-link.patch
index d833bc4..79ae0f9 100644
--- a/sci-libs/indilib/files/0.9.6-fix-zlib-link.patch
+++ b/sci-libs/indilib/files/0.9.6-fix-zlib-link.patch
@@ -1,57 +1,56 @@
- 
---- libindi-0.9.6/CMakeLists.txt        2012-11-19 21:39:14.000000000 +0100
-+++ libindi-0.9.6_new/CMakeLists.txt    2012-12-01 19:54:47.199396572 +0100
+--- libindi-0.9.6/CMakeLists.txt	2012-12-01 20:41:05.374258103 +0100
++++ libindi-0.9.6.new/CMakeLists.txt	2012-12-01 20:42:42.365770665 +0100
 @@ -633,7 +633,7 @@
- 
- add_executable(tutorial_one ${tutorialone_SRCS})
- 
--target_link_libraries(tutorial_one indidriver m)
-+target_link_libraries(tutorial_one indidriver m ${ZLIB_LIBRARIES})
- 
- ########### Tutorial two ##############
- set(tutorialtwo_SRCS
+ 

+ add_executable(tutorial_one ${tutorialone_SRCS})

+ 

+-target_link_libraries(tutorial_one indidriver m)

++target_link_libraries(tutorial_one indidriver m ${ZLIB_LIBRARIES})

+ 

+ ########### Tutorial two ##############

+ set(tutorialtwo_SRCS

 @@ -643,7 +643,7 @@
- 
- add_executable(tutorial_two ${tutorialtwo_SRCS})
- 
--target_link_libraries(tutorial_two indidriver m)
-+target_link_libraries(tutorial_two indidriver m ${ZLIB_LIBRARIES})
- 
- ########### Tutorial three ##############
- if (CFITSIO_FOUND)
+ 

+ add_executable(tutorial_two ${tutorialtwo_SRCS})

+ 

+-target_link_libraries(tutorial_two indidriver m)

++target_link_libraries(tutorial_two indidriver m ${ZLIB_LIBRARIES})

+ 

+ ########### Tutorial three ##############

+ if (CFITSIO_FOUND)

 @@ -654,7 +654,7 @@
- 
- add_executable(tutorial_three ${tutorialthree_SRCS})
- 
--target_link_libraries(tutorial_three indidriver m)
-+target_link_libraries(tutorial_three indidriver m ${ZLIB_LIBRARIES})
- endif (CFITSIO_FOUND)
- ########### Tutorial four ##############
- set(tutorialfour_SRCS
+ 

+ add_executable(tutorial_three ${tutorialthree_SRCS})

+ 

+-target_link_libraries(tutorial_three indidriver m)

++target_link_libraries(tutorial_three indidriver m ${ZLIB_LIBRARIES})

+ endif (CFITSIO_FOUND)

+ ########### Tutorial four ##############

+ set(tutorialfour_SRCS

 @@ -664,7 +664,7 @@
- 
- add_executable(tutorial_four ${tutorialfour_SRCS})
- 
--target_link_libraries(tutorial_four indidriver m)
-+target_link_libraries(tutorial_four indidriver m ${ZLIB_LIBRARIES})
- 
- ########### Tutorial five - dome driver ##############
- set(tutorialdome_SRCS
+ 

+ add_executable(tutorial_four ${tutorialfour_SRCS})

+ 

+-target_link_libraries(tutorial_four indidriver m)

++target_link_libraries(tutorial_four indidriver m ${ZLIB_LIBRARIES})

+ 

+ ########### Tutorial five - dome driver ##############

+ set(tutorialdome_SRCS

 @@ -674,7 +674,7 @@
- 
- add_executable(tutorial_dome ${tutorialdome_SRCS})
- 
--target_link_libraries(tutorial_dome indidriver)
-+target_link_libraries(tutorial_dome indidriver ${ZLIB_LIBRARIES})
- 
- ########### Tutorial five - rain driver ##############
- set(tutorialrain_SRCS
+ 

+ add_executable(tutorial_dome ${tutorialdome_SRCS})

+ 

+-target_link_libraries(tutorial_dome indidriver)

++target_link_libraries(tutorial_dome indidriver ${ZLIB_LIBRARIES})

+ 

+ ########### Tutorial five - rain driver ##############

+ set(tutorialrain_SRCS

 @@ -684,7 +684,7 @@
- 
- add_executable(tutorial_rain ${tutorialrain_SRCS})
- 
--target_link_libraries(tutorial_rain indidriver)
-+target_link_libraries(tutorial_rain indidriver ${ZLIB_LIBRARIES})
- 
- ########### Client Tutorial ##############
- set(tutorialclient_SRCS
\ No newline at end of file
+ 

+ add_executable(tutorial_rain ${tutorialrain_SRCS})

+ 

+-target_link_libraries(tutorial_rain indidriver)

++target_link_libraries(tutorial_rain indidriver ${ZLIB_LIBRARIES})

+ 

+ ########### Client Tutorial ##############

+ set(tutorialclient_SRCS