Version bump.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 103 insertions, 1 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/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
+}