summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-01-13 13:19:20 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-01-13 13:19:20 +0000
commitdb85bec24ebf6a4960d1e4701ea554bb5ec0c109 (patch)
treeae1c4a7c357873315fbcd583a64c194e60efbe89 /sci-libs/indilib
parentStable on amd64 wrt bug #351484 (diff)
downloadgentoo-2-db85bec24ebf6a4960d1e4701ea554bb5ec0c109.tar.gz
gentoo-2-db85bec24ebf6a4960d1e4701ea554bb5ec0c109.tar.bz2
gentoo-2-db85bec24ebf6a4960d1e4701ea554bb5ec0c109.zip
Version bump. Per bug #351398.
(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/indilib')
-rw-r--r--sci-libs/indilib/ChangeLog11
-rw-r--r--sci-libs/indilib/files/0.7.2-fix_linking_pthread.patch12
-rw-r--r--sci-libs/indilib/files/0.7.2-fix_pkgconfig.patch10
-rw-r--r--sci-libs/indilib/indilib-0.7.2.ebuild56
4 files changed, 87 insertions, 2 deletions
diff --git a/sci-libs/indilib/ChangeLog b/sci-libs/indilib/ChangeLog
index 70f5592acbb1..c991ded50a68 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.14 2010/08/20 09:21:12 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/ChangeLog,v 1.15 2011/01/13 13:19:20 scarabeus Exp $
+
+*indilib-0.7.2 (13 Jan 2011)
+
+ 13 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/0.7.2-fix_linking_pthread.patch, +files/0.7.2-fix_pkgconfig.patch,
+ +indilib-0.7.2.ebuild:
+ Version bump. Per bug #351398.
*indilib-0.6.2 (20 Aug 2010)
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
new file mode 100644
index 000000000000..7ea0330655ec
--- /dev/null
+++ b/sci-libs/indilib/files/0.7.2-fix_linking_pthread.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..0617531d7b37
--- /dev/null
+++ b/sci-libs/indilib/files/0.7.2-fix_pkgconfig.patch
@@ -0,0 +1,10 @@
+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.7.2.ebuild b/sci-libs/indilib/indilib-0.7.2.ebuild
new file mode 100644
index 000000000000..d30c9d9e35a2
--- /dev/null
+++ b/sci-libs/indilib/indilib-0.7.2.ebuild
@@ -0,0 +1,56 @@
+# 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.1 2011/01/13 13:19:20 scarabeus 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="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}/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
+}