Bumped sci-libs/indilib to 0.9.7.

4 files changed, 9 insertions, 111 deletions

diff --git a/sci-libs/indilib/ChangeLog b/sci-libs/indilib/ChangeLog
index cdd3fd2..0a41a12 100644
--- a/sci-libs/indilib/ChangeLog
+++ b/sci-libs/indilib/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/ChangeLog,v 1.21 2011/10/30 15:47:38 ssuominen Exp $
 
+  14 Dec 2013; Ctibor Brančík <ctibor@brancik.cz> indilib-0.9.7.ebuild,
+  +indilib-0.9.7.ebuild
+  +files/0.9.7-fix-zlib-link.patch
+  Removed USE="usb nova fits" as upstream made dependencies mandatory.
+
   30 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> indilib-0.6.ebuild,
   indilib-0.7.2.ebuild:
   Rename obsolete USE="v4l2" to USE="v4l" wrt #385241. Move linux-headers from
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 07c1c74..0273918 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,5 @@
-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 1173 SHA256 21eb051f3c98a0268ca4cc9693747a734cb31d767cb3fa406841b265c005248a SHA512 b189a56cc2483eeb4ec397f618a416048757e08241b8071f55af866610414a2f5a1ce42784095e77196b937171a3e35171691b9251a9b1a77aef8e07377547e1 WHIRLPOOL 86e07472c9fdf8ebc895444e19623c07abd7c634cd99fd4807e6e95c4ae2cc9e44721a49aef5e4ec954fbe2ca40a1d9ae84c5ee1c4f346303f6440e480e76f03
-MISC ChangeLog 2974 SHA256 c28223cc80b24de4f1e0f7fbaefecede219e1524b8a858c49a2cd59ed9b0aa57 SHA512 33e6dc584f8ae66a2617a907674bfc8c45c1fb7486489429b05452085312920ecbe26a592794af208c0748ea5c8d0ae8dafc480918d47c01e7cc7ee39425f925 WHIRLPOOL a5ca2f339e7503f8766b826aa3bb84d8c0b1c9b3ed9b337a32ec646d931507dd6c029084360dc6cd7d0a25052926ca152c07533de8c138b2be4aba14d304409d
+AUX 0.9.7-fix-zlib-link.patch 2445 SHA256 f54d65cf8688c6cfe61312199f4f6a71ece47b9d0e9ce3f836cb62583dc5bf38 SHA512 d776fe17cfb5a257aaeccd7915cdcb88ff90209c41fcba6d3e0744c41837f40ffdc8c939ced36b4d54faa8fc368353e3ccafba825494378a3b70271a4f10c9ac WHIRLPOOL 18ff3186c98215e2ccdf2112a5e32caa84fcb2007430876bc6d32aedcd287d7ec9a80f362b7a4a59db766e52782a409276177eb75ac845ed9105da279d06bebc
+DIST libindi_0.9.7.tar.gz 474954 SHA256 62d4940430718706c5e232f8e7d899efeefc8727112eb4bb0d10d6f33cc97c16 SHA512 92cfa6ab5e70604af6b2b5cdd70550f40e013ea446c043e52a70089e20be69c2717ae1cc85647e32643bb6235c222f0a89144c46f031709654be314ce5512a6f WHIRLPOOL b7142497f43fea5a69134f519a123831896a4a3bfa0926708412d6b6ceffef6cb5483443ba66e40d32e6e5ba61b2eba06699f6953d9c3ee1680fabbd126e6d72
+EBUILD indilib-0.9.7.ebuild 960 SHA256 b0829d366460a06582eb82497d269e02ab4292c70c8ae3e4527f4454585e381c SHA512 d36dfbdad1cd651086eb6ec61c054bbb54c90519834e7d15f496ad3f3c06e5866c60e842848aa3524a70da14b8359dfa8650e0c4559b16e18a7f4e1ced9d8808 WHIRLPOOL 13eef2b3d9c7599913ecb32a748fed9e8baa2823ad912ea37246a1c53c6db8cdd381401f7275ccefd251c927f6ea407d3e00dd15c2bacf0ec9df4886603fb4dd
+MISC ChangeLog 3179 SHA256 db08440fc709826d1d45751452f66c08a10e07cd512f4e61750574a4c867ae6b SHA512 c338d4a4a94e01d05778fa65ef8b3642c8688c7779134a2f87a7e0f381af36f29731a72b6968f04cda46a1d9b4ba8ea3bde57d52293e7d14fe048382972c66b0 WHIRLPOOL edf595552d6801f1592b669830551d077b2d21ea848262486aa8c8d55d5d435774846f58b45796ce26a0bc6201e3242c0b051ea851205db831a5eac1ca1f8b3c
 MISC metadata.xml 335 SHA256 34a0ab97703e3c50a0e80344d8275f27f6d138becfc3c5ada3c4daa688d8e3ef SHA512 89ed49eca1091ba5cd4aadedea903f2dc24d50466b63e2deb96b61c869558ee1619dc24bbe2b008880c94e41a0457db5bfe95ed0d60a0f1f97da6e993f7f8db2 WHIRLPOOL 3b1a32eb17cda554dd5b377d804ee6c2fb13f5f802f5cf2a70a45bdc4cfd895b17bbc67e0e178e66182e253bb3540d3b29242a5bb1ebe56a5504269c792bbd77
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
deleted file mode 100644
index 79ae0f9..0000000
--- a/sci-libs/indilib/files/0.9.6-fix-zlib-link.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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

-@@ -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)

-@@ -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

-@@ -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

-@@ -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

-@@ -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

diff --git a/sci-libs/indilib/indilib-0.9.6.ebuild b/sci-libs/indilib/indilib-0.9.6.ebuild
deleted file mode 100644
index 9ed49a7..0000000
--- a/sci-libs/indilib/indilib-0.9.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/indilib-0.7.2.ebuild,v 1.6 2011/10/30 15:47:38 ssuominen Exp $
-
-EAPI=3
-
-MY_P="lib${PN/lib/}_${PV}"
-
-inherit cmake-utils eutils
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="http://indi.sourceforge.net/index.php/Main_Page"
-SRC_URI="mirror://sourceforge/${PN/lib/}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="nova v4l"
-
-# libfli: not in portage
-# fli? ( >=sci-libs/fli-1.71 )
-RDEPEND="
-	sys-libs/zlib
-	>=sci-libs/cfitsio-3.140
-	virtual/libusb:0
-	nova? ( >=sci-libs/libnova-0.12.1 )
-"
-DEPEND="${RDEPEND}
-	v4l? ( >=sys-kernel/linux-headers-2.6 )
-"
-
-S="${WORKDIR}/${MY_P/_/-}"
-
-src_prepare() {
-	base_src_prepare
-
-	# fix multilib
-	sed -i \
-		-e "s:\${LIB_POSTFIX}:\${LIB_SUFFIX}:g" \
-		CMakeLists.txt || die "sed failed"
-	epatch  "${FILESDIR}/0.9.6-fix-zlib-link.patch"
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with usb)
-		$(cmake-utils_use_with fits CFITSIO)
-		$(cmake-utils_use_with nova)
-	"
-	cmake-utils_src_configure
-}