diff options
-rw-r--r-- | sci-libs/indilib/ChangeLog | 11 | ||||
-rw-r--r-- | sci-libs/indilib/files/0.6-fix_symlink.patch | 39 | ||||
-rw-r--r-- | sci-libs/indilib/files/0.6-multilib.patch | 21 | ||||
-rw-r--r-- | sci-libs/indilib/files/0.6.2-fix_fits_harddep.patch | 18 | ||||
-rw-r--r-- | sci-libs/indilib/files/0.6.2-fix_symlinks.patch | 23 | ||||
-rw-r--r-- | sci-libs/indilib/files/0.7.2-fix_linking_pthread.patch | 12 | ||||
-rw-r--r-- | sci-libs/indilib/files/0.7.2-fix_pkgconfig.patch | 10 | ||||
-rw-r--r-- | sci-libs/indilib/indilib-0.6.ebuild | 46 | ||||
-rw-r--r-- | sci-libs/indilib/indilib-0.7.2.ebuild | 57 | ||||
-rw-r--r-- | sci-libs/indilib/indilib-0.9.5.ebuild | 43 |
10 files changed, 53 insertions, 227 deletions
diff --git a/sci-libs/indilib/ChangeLog b/sci-libs/indilib/ChangeLog index d2d07790f471..7c26441d8d15 100644 --- a/sci-libs/indilib/ChangeLog +++ b/sci-libs/indilib/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sci-libs/indilib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/ChangeLog,v 1.24 2012/08/20 17:08:21 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/ChangeLog,v 1.25 2012/09/01 18:00:23 scarabeus Exp $ + +*indilib-0.9.5 (01 Sep 2012) + + 01 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> +indilib-0.9.5.ebuild, + -files/0.6-fix_symlink.patch, -files/0.6-multilib.patch, + -files/0.6.2-fix_fits_harddep.patch, -files/0.6.2-fix_symlinks.patch, + -files/0.7.2-fix_linking_pthread.patch, -files/0.7.2-fix_pkgconfig.patch, + -indilib-0.6.ebuild, -indilib-0.7.2.ebuild: + Version bump to latest. Drop some older. 20 Aug 2012; Jeroen Roovers <jer@gentoo.org> indilib-0.6.ebuild, indilib-0.7.2.ebuild, indilib-0.9.1.ebuild: diff --git a/sci-libs/indilib/files/0.6-fix_symlink.patch b/sci-libs/indilib/files/0.6-fix_symlink.patch deleted file mode 100644 index cf447c029da1..000000000000 --- a/sci-libs/indilib/files/0.6-fix_symlink.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urN libindi0-0.6.old/CMakeLists.txt libindi0-0.6/CMakeLists.txt ---- libindi0-0.6.old/CMakeLists.txt 2008-11-18 10:45:06.000000000 +0100 -+++ libindi0-0.6/CMakeLists.txt 2009-09-07 12:49:21.000000000 +0200 -@@ -146,7 +146,7 @@ - ${CMAKE_SOURCE_DIR}/drivers/telescope/lx200gps.cpp
- ${CMAKE_SOURCE_DIR}/drivers/telescope/lx200generic.cpp
- ${CMAKE_SOURCE_DIR}/drivers/telescope/lx200classic.cpp
-- ${CMAKE_SOURCE_DIR}/drivers/telescope/lx200apdriver.c
-+ ${CMAKE_SOURCE_DIR}/drivers/telescope/lx200apdriver.c
- ${CMAKE_SOURCE_DIR}/drivers/telescope/lx200ap.cpp )
-
- add_executable(indi_lx200generic ${lx200generic_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
-@@ -159,14 +159,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 ############
-@@ -521,4 +518,4 @@ -
- install( FILES indiapi.h indidevapi.h base64.h eventloop.h ${CMAKE_SOURCE_DIR}/libs/lilxml.h
- ${CMAKE_SOURCE_DIR}/libs/indicom.h DESTINATION ${INCLUDE_INSTALL_DIR}/libindi COMPONENT Devel)
-- -\ Chybí znak konce řádku na konci souboru -+
diff --git a/sci-libs/indilib/files/0.6-multilib.patch b/sci-libs/indilib/files/0.6-multilib.patch deleted file mode 100644 index 3f7ab720f2fb..000000000000 --- a/sci-libs/indilib/files/0.6-multilib.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN libindi0-0.6.old/CMakeLists.txt libindi0-0.6/CMakeLists.txt ---- libindi0-0.6.old/CMakeLists.txt 2008-11-18 10:45:06.000000000 +0100 -+++ libindi0-0.6/CMakeLists.txt 2009-09-15 10:35:17.000000000 +0200 -@@ -96,7 +96,7 @@ - ######## INDI Static Library #########
- ######################################
- add_library(indidriver STATIC ${indimain_SRCS})
--install(TARGETS indidriver ARCHIVE DESTINATION lib${LIB_POSTFIX})
-+install(TARGETS indidriver ARCHIVE DESTINATION lib${LIB_SUFFIX})
-
- ######################################
- ######## INDI Shared Library #########
-@@ -114,7 +114,7 @@ - target_link_libraries(indi ${FLI_LIBRARIES})
- endif(FLI_FOUND)
-
--install(TARGETS indi LIBRARY DESTINATION lib${LIB_POSTFIX})
-+install(TARGETS indi LIBRARY DESTINATION lib${LIB_SUFFIX})
- set_target_properties(indi PROPERTIES VERSION ${INDI_VERSION} SOVERSION ${INDI_SOVERSION})
-
- #####################################
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 deleted file mode 100644 index ac033bf8e5de..000000000000 --- a/sci-libs/indilib/files/0.6.2-fix_fits_harddep.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 9b0255eaf0a2..000000000000 --- a/sci-libs/indilib/files/0.6.2-fix_symlinks.patch +++ /dev/null @@ -1,23 +0,0 @@ -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/files/0.7.2-fix_linking_pthread.patch b/sci-libs/indilib/files/0.7.2-fix_linking_pthread.patch deleted file mode 100644 index 7ea0330655ec..000000000000 --- a/sci-libs/indilib/files/0.7.2-fix_linking_pthread.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libindi-0.7.2.old/CMakeLists.txt libindi-0.7.2/CMakeLists.txt ---- libindi-0.7.2.old/CMakeLists.txt 2011-01-13 13:56:50.773108903 +0100 -+++ libindi-0.7.2/CMakeLists.txt 2011-01-13 14:12:52.486108902 +0100 -@@ -164,7 +164,7 @@ - ############# INDI Client Library ################
- ##################################################
- add_library(indiclient STATIC ${indibase_SRCS})
--target_link_libraries(indiclient indi)
-+target_link_libraries(indiclient indi pthread)
- install(TARGETS indiclient ARCHIVE DESTINATION lib${LIB_POSTFIX})
-
- #####################################
diff --git a/sci-libs/indilib/files/0.7.2-fix_pkgconfig.patch b/sci-libs/indilib/files/0.7.2-fix_pkgconfig.patch deleted file mode 100644 index 0617531d7b37..000000000000 --- a/sci-libs/indilib/files/0.7.2-fix_pkgconfig.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -urN libindi-0.7.2.old/libindi.pc.cmake libindi-0.7.2/libindi.pc.cmake ---- libindi-0.7.2.old/libindi.pc.cmake 2011-01-13 13:56:50.769108903 +0100 -+++ libindi-0.7.2/libindi.pc.cmake 2011-01-13 13:57:13.421108903 +0100 -@@ -8,5 +8,5 @@ - URL=http://www.indilib.org/ - Version: @CMAKE_INDI_VERSION_STRING@ - Libs: -L@LIB_DESTINATION@ -lindi --Cflags: -I@INCLUDE_INSTALL_DIR@ -@INCLUDE_INSTALL_DIR@/libindi -+Cflags: -I@INCLUDE_INSTALL_DIR@ -I@INCLUDE_INSTALL_DIR@/libindi - diff --git a/sci-libs/indilib/indilib-0.6.ebuild b/sci-libs/indilib/indilib-0.6.ebuild deleted file mode 100644 index 1fa6fc38fe71..000000000000 --- a/sci-libs/indilib/indilib-0.6.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/indilib-0.6.ebuild,v 1.11 2012/08/20 17:08:21 jer Exp $ - -EAPI="2" - -MY_P="lib${PN/lib/}0_${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 ppc ppc64 x86" -IUSE="fits nova usb v4l" - -# 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 ) -" -DEPEND="${RDEPEND} - v4l? ( >=sys-kernel/linux-headers-2.6 ) -" - -S="${WORKDIR}/${MY_P/_/-}" - -PATCHES=( - "${FILESDIR}"/${PV}-fix_symlink.patch - "${FILESDIR}"/${PV}-multilib.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 -} diff --git a/sci-libs/indilib/indilib-0.7.2.ebuild b/sci-libs/indilib/indilib-0.7.2.ebuild deleted file mode 100644 index bfb5da0ac599..000000000000 --- a/sci-libs/indilib/indilib-0.7.2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2012 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.7 2012/08/20 17:08:21 jer 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 ppc ppc64 x86" -IUSE="fits nova usb v4l" - -# 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 ) -" -DEPEND="${RDEPEND} - v4l? ( >=sys-kernel/linux-headers-2.6 ) -" - -PATCHES=( - "${FILESDIR}/0.6.2-fix_fits_harddep.patch" - "${FILESDIR}/0.6.2-fix_symlinks.patch" - "${FILESDIR}/${PV}-fix_pkgconfig.patch" - "${FILESDIR}/${PV}-fix_linking_pthread.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 -} diff --git a/sci-libs/indilib/indilib-0.9.5.ebuild b/sci-libs/indilib/indilib-0.9.5.ebuild new file mode 100644 index 000000000000..9352c63ea290 --- /dev/null +++ b/sci-libs/indilib/indilib-0.9.5.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/indilib-0.9.5.ebuild,v 1.1 2012/09/01 18:00:22 scarabeus Exp $ + +EAPI=4 + +MY_PN="lib${PN/lib/}" + +inherit cmake-utils + +DESCRIPTION="INDI Astronomical Control Protocol library" +HOMEPAGE="http://indi.sourceforge.net/index.php/Main_Page" +SRC_URI="mirror://sourceforge/${PN/lib/}/${MY_PN}_${PV}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="nova v4l" + +RDEPEND=" + >=sci-libs/cfitsio-3.140 + sys-libs/zlib + virtual/libusb:0 + nova? ( >=sci-libs/libnova-0.12.1 ) +" +DEPEND="${RDEPEND} + v4l? ( >=sys-kernel/linux-headers-2.6 ) +" + +DOCS=( AUTHORS ChangeLog README README.drivers TODO ) + +PATCHES=( + "${FILESDIR}/0.9.1-fix_symlinks.patch" +) + +S=${WORKDIR}/${MY_PN}-${PV} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_with nova) + ) + cmake-utils_src_configure +} |