Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 108 insertions, 2 deletions

diff --git a/sci-libs/indilib/ChangeLog b/sci-libs/indilib/ChangeLog
index 942088797ff1..70f5592acbb1 100644
--- a/sci-libs/indilib/ChangeLog
+++ b/sci-libs/indilib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/indilib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/ChangeLog,v 1.13 2010/01/19 00:47:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/ChangeLog,v 1.14 2010/08/20 09:21:12 scarabeus Exp $
+
+*indilib-0.6.2 (20 Aug 2010)
+
+  20 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0.6.2-fix_fits_harddep.patch, +indilib-0.6.2.ebuild,
+  +files/0.6.2-fix_symlinks.patch:
+  Version bump.
 
   19 Jan 2010; Jeroen Roovers <jer@gentoo.org> indilib-0.6.ebuild:
   Stable for HPPA too.
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index ca8fd502f7ad..812c75e4e052 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,6 +1,10 @@
 AUX 0.6-fix_symlink.patch 3035 RMD160 e28792ac0c04fb993ce746fc66cd0b8cf9472073 SHA1 225e19fc422dd0ac2aff178fca6cc9ad3ba47566 SHA256 180a1fd4b0939efbedb675f90d6b9f96bcd2516c59bea0f87be79083bd83b87a
 AUX 0.6-multilib.patch 928 RMD160 bc2a8ea0b7a23ee7cae1cee1d13591398ec6d5c9 SHA1 faf3f653269458b4bb004f567c1b53d4e7d8a13e SHA256 cf56386ea42c474be1cbe6a3a9883e205001eaba34b0055e94483902a901a6be
+AUX 0.6.2-fix_fits_harddep.patch 1061 RMD160 c1560646a531cf909f61258ac77721ac46036f81 SHA1 6b39ebe56762bd4d8ffd8ecca44f67c065148a51 SHA256 f4488c695276b827e656bbe4231007b129e1d3173781666d7f7ff68a41e2a4d7
+AUX 0.6.2-fix_symlinks.patch 2298 RMD160 ec1ac1b53fe6b121f719d742191a69c4b3893303 SHA1 eaed71aaf1e255081d14b3dd2d22122fb362031d SHA256 bcd19347ceb8a085920952f28dfce724cff48e4f10af4fede8c962e812e61caa
 DIST libindi0_0.6.tar.gz 295657 RMD160 1ec9fd8daa04db458b80ab2e153a6025faa0406f SHA1 70b6a4cf4447874a0cf65dd8ece2d77dc397826d SHA256 65e44107326f04fd868deb5441eaee26d43626c8fffec92cbbd4a07d1c860292
+DIST libindi_0.6.2.tar.gz 404382 RMD160 330e8f75cf806bd39f2933810caa10e7e7e5f433 SHA1 40113b52acbdae714cd174d9ca3953c19f0ab0b3 SHA256 e760259cb26aabfacae0f347e5099fc5dd83243ed9e26052abbbe898b9aad456
+EBUILD indilib-0.6.2.ebuild 1252 RMD160 349575a71fe1fab12ece4d86a4dc81273c9b5c28 SHA1 aa79cc0bee3d7c8f2c07092efdf837859a8776c3 SHA256 9afb7126d62c0cfa07473e555615366af18327a41427ccca2081fb5962a2df84
 EBUILD indilib-0.6.ebuild 1085 RMD160 7ae6189746b0e33b75685c1be863c029bb6b4460 SHA1 7ac0a42a41109f4743da772d37e7e499cdeca822 SHA256 7cbad600076fc69f93231d16c6c057780ce82bf2083f6d0baaf89325ddbf2fc9
-MISC ChangeLog 1833 RMD160 e24df1960ab00ac2e36ea397dc381741706cead9 SHA1 c4ff17ce7eadcceb7b45382a94dc4326c0381b9a SHA256 a4ed415c5e573eeb5689141bccb3135634bb48e42719fb3fa5b83b2b4606f670
+MISC ChangeLog 2038 RMD160 ac9d41bed5e0cbac125056cad16df573a6a872d1 SHA1 e59f431392e3ca8cb13cb3bd295d69c24a08bc33 SHA256 60737ec19aaafdf1aece250db8664166de993dc1ac4107a1c535336d65a16630
 MISC metadata.xml 335 RMD160 942b5fc4c73f9852492b50374514f6e10907ff02 SHA1 a2c11cd53eda2431bc7043414a6092b0a6b12c51 SHA256 34a0ab97703e3c50a0e80344d8275f27f6d138becfc3c5ada3c4daa688d8e3ef
diff --git a/sci-libs/indilib/files/0.6.2-fix_fits_harddep.patch b/sci-libs/indilib/files/0.6.2-fix_fits_harddep.patch
new file mode 100644
index 000000000000..ac033bf8e5de
--- /dev/null
+++ b/sci-libs/indilib/files/0.6.2-fix_fits_harddep.patch
@@ -0,0 +1,18 @@
+diff -urN libindi-0.6.2/CMakeLists.txt libindi-0.6.2.new//CMakeLists.txt
+--- libindi-0.6.2/CMakeLists.txt	2010-07-20 06:40:26.000000000 +0200
++++ libindi-0.6.2.new//CMakeLists.txt	2010-08-20 11:04:46.803858551 +0200
+@@ -37,9 +37,11 @@
+ 

+ macro_optional_find_package(CFITSIO)

+ 

+-if (NOT CFITSIO_FOUND OR CFITSIO_VERSION_MAJOR LESS 3)

+-  message(FATAL_ERROR "CFITSIO version too old, Please install cfitsio 3.x and try again. http://indi.sf.net")

+-endif (NOT CFITSIO_FOUND OR CFITSIO_VERSION_MAJOR LESS 3)

++if (WITH_CFITSIO)

++	if (NOT CFITSIO_FOUND OR CFITSIO_VERSION_MAJOR LESS 3)

++  		message(FATAL_ERROR "CFITSIO version too old, Please install cfitsio 3.x and try again. http://indi.sf.net")

++	endif (NOT CFITSIO_FOUND OR CFITSIO_VERSION_MAJOR LESS 3)

++endif (WITH_CFITSIO)

+ 

+ macro_bool_to_01(CFITSIO_FOUND HAVE_CFITSIO_H)

+ macro_log_feature(CFITSIO_FOUND "libcfitsio" "A library for reading and writing data files in FITS (Flexible Image Transport System) data format" "http://indi.sf.net" FALSE "3.03" "Provides INDI with FITS I/O support.")

diff --git a/sci-libs/indilib/files/0.6.2-fix_symlinks.patch b/sci-libs/indilib/files/0.6.2-fix_symlinks.patch
new file mode 100644
index 000000000000..9b0255eaf0a2
--- /dev/null
+++ b/sci-libs/indilib/files/0.6.2-fix_symlinks.patch
@@ -0,0 +1,23 @@
+diff -urN libindi-0.6.2/CMakeLists.txt libindi-0.6.2.new//CMakeLists.txt
+--- libindi-0.6.2/CMakeLists.txt	2010-07-20 06:40:26.000000000 +0200
++++ libindi-0.6.2.new//CMakeLists.txt	2010-08-20 11:12:31.668952699 +0200
+@@ -178,14 +178,11 @@
+ 

+ install(TARGETS indi_lx200generic RUNTIME DESTINATION bin )

+ 

+-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake

+-"exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200classic)\n

+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200autostar)\n

+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200_16)\n

+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200gps)\n

+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200ap)\n

+-")

+-set_target_properties(indi_lx200generic PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake)

++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200classic\" )" )

++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200autostar\" )" )

++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200_16\" )" )

++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200gps\" )" )

++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200ap\" )" )

+ #################################################################################

+ 

+ ########### Celestron GPS ############

diff --git a/sci-libs/indilib/indilib-0.6.2.ebuild b/sci-libs/indilib/indilib-0.6.2.ebuild
new file mode 100644
index 000000000000..ae1f9fe4cdce
--- /dev/null
+++ b/sci-libs/indilib/indilib-0.6.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/indilib-0.6.2.ebuild,v 1.1 2010/08/20 09:21:12 scarabeus Exp $
+
+EAPI="2"
+
+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="fits nova usb v4l2"
+
+# libfli: not in portage
+# fli? ( >=sci-libs/fli-1.71 )
+RDEPEND="
+	sys-libs/zlib
+	fits? ( >=sci-libs/cfitsio-3.140 )
+	nova? ( >=sci-libs/libnova-0.12.1 )
+	usb? ( virtual/libusb:0 )
+	v4l2? ( >=sys-kernel/linux-headers-2.6 )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-fix_fits_harddep.patch"
+	"${FILESDIR}/${PV}-fix_symlinks.patch"
+)
+
+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"
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with usb)
+		$(cmake-utils_use_with fits CFITSIO)
+		$(cmake-utils_use_with nova)
+	"
+	cmake-utils_src_configure
+}