summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCtibor <ctibor.brancik@seznam.cz>2013-12-14 16:50:38 +0100
committerCtibor <ctibor.brancik@seznam.cz>2013-12-14 16:50:38 +0100
commit77d90c1ab7aedb5ea5b4318b59e97f153c0ccba5 (patch)
tree89990bf7733d9e90a5ea71ec27de49cd47f0d2b8
parent6237f8dc4aa4ab1aa56f7905b164dcb96df9ecd3 (diff)
parent8255b5bc438e0f576e3e5e91007ede50ba4789b6 (diff)
downloadbrancik-overlay-77d90c1ab7aedb5ea5b4318b59e97f153c0ccba5.tar.gz
brancik-overlay-77d90c1ab7aedb5ea5b4318b59e97f153c0ccba5.tar.bz2
Merge branch 'master' of ssh://git.brancik.cz/gentoo-overlay
-rw-r--r--sci-libs/indilib-driver-gphoto/Manifest3
-rw-r--r--sci-libs/indilib-driver-gphoto/files/fix_zlib_link.patch11
-rw-r--r--sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild5
3 files changed, 1 insertions, 18 deletions
diff --git a/sci-libs/indilib-driver-gphoto/Manifest b/sci-libs/indilib-driver-gphoto/Manifest
index 166d980..3e6aa69 100644
--- a/sci-libs/indilib-driver-gphoto/Manifest
+++ b/sci-libs/indilib-driver-gphoto/Manifest
@@ -1,2 +1 @@
-AUX fix_zlib_link.patch 720 SHA256 0659b83f11aa1e05438b56672c50a25a77ab0a6028ab6d5ce790474aedfab387 SHA512 c1a9e66c2a9cd416185b2ca8b1a72e4c0e18beb6960146478deaadeadbdc2bafe76cdb5fa7d6f62d4dda98aee77cf01d8a15ef207f1d18e7a39e41b16a763b73 WHIRLPOOL 2b42d09729402b66d7e0b1647899177c514d696054ae8e7601a367a320c4b9bf3a0ae71700182ec3e6d3a87c853675a04c45a79da3b7a81a827199e8ed552227
-EBUILD indilib-driver-gphoto-9999.ebuild 561 SHA256 8044238adae24e2b60f91c292942d61546df9a39dac10dc9ff7aefb09a801a3e SHA512 f0118ec65026d245777bc3f76179f5e7e9bd363df51f73556c143e6f841d30baebfb2cd50987bf6dfcf2dd11dee4f680fd64dd8407923355ed9e83319eb54f83 WHIRLPOOL 05490e720b10a71f2017e0cb510a9a131ca2bff300f5c652cd6b23a5a588e7fd30b99194171f0cbf911b17055ab428cf0d85174cd7733bc549a513df38e077fd
+EBUILD indilib-driver-gphoto-9999.ebuild 471 SHA256 f560884eaecff363642c1f1ebeb29a91acac6ee25b464cfd31fa5df0b90c1517 SHA512 f8917b0acc8a3dd76492694e4e8b0236de012d1d1a5bda265e5ea885ff357dc2ce54bbf3a399cddcf7bf651586eefad64069f9aeac5a3c8b3e93f0f5d9dfa0a8 WHIRLPOOL 69201c57e062cfbcb409f07ec8d6f15d5128740122212c22f2b01513a9c0a263994095281d65a2b2544dc58e995c99b56cb0d67b3079596590a289a77827b405
diff --git a/sci-libs/indilib-driver-gphoto/files/fix_zlib_link.patch b/sci-libs/indilib-driver-gphoto/files/fix_zlib_link.patch
deleted file mode 100644
index 7bd1810..0000000
--- a/sci-libs/indilib-driver-gphoto/files/fix_zlib_link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- indilib-driver-gphoto-9999/CMakeLists.txt 2012-12-01 23:55:33.605162516 +0100
-+++ indilib-driver-gphoto-9999.new/CMakeLists.txt 2012-12-01 23:57:37.329853691 +0100
-@@ -35,7 +35,7 @@
-
- add_executable(indi_gphoto_ccd ${indigphoto_SRCS})
-
--target_link_libraries(indi_gphoto_ccd ${INDI_MAIN_LIBRARIES} ${CFITSIO_LIBRARIES} ${LIBGPHOTO2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} gphoto2_port)
-+target_link_libraries(indi_gphoto_ccd ${INDI_MAIN_LIBRARIES} ${CFITSIO_LIBRARIES} ${LIBGPHOTO2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${ZLIB_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 8d3d829..b75632e 100644
--- a/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild
+++ b/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild
@@ -20,8 +20,3 @@ DEPEND="sci-libs/indilib \
media-libs/libgphoto2[jpeg]"
RDEPEND="${DEPEND}"
-
-src_unpack() {
- subversion_src_unpack
- epatch "${FILESDIR}/fix_zlib_link.patch"
-}