Version bump. Per bug #351398.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

5 files changed, 92 insertions, 3 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/Manifest b/sci-libs/indilib/Manifest
index 812c75e4e052..4af5b58e16c3 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -2,9 +2,13 @@ AUX 0.6-fix_symlink.patch 3035 RMD160 e28792ac0c04fb993ce746fc66cd0b8cf9472073 S
 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
+AUX 0.7.2-fix_linking_pthread.patch 591 RMD160 f7a6e4397627056cf4dc2badf13836d4245eedb0 SHA1 5f99949422eff8a8dac9b39377da4a5993b6ceb7 SHA256 939b8004e8d651b2ab5b42ca75390ab3d489d81bbd32c00f0e0c54babd7fcc22
+AUX 0.7.2-fix_pkgconfig.patch 470 RMD160 a0e3179d7fa2c609b1943a62290bea2516a8b53b SHA1 a3ac9c99754573c94fc732c12a937cb96579cee4 SHA256 1560353a1ab879c533c5186bd029efdb612bca7024fe280ed3d6e0e3b294ab56
 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
+DIST libindi_0.7.2.tar.gz 441012 RMD160 3b99714a36b614b8ce3e79c838eaa265f74508b1 SHA1 e987b23e8b4984cf38c22e34e16f969fa6ad3af0 SHA256 7e66745d8cfd95b326f257ce8a2ca7c1a0c9fa49ee59ce421e28028af556e371
 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 2038 RMD160 ac9d41bed5e0cbac125056cad16df573a6a872d1 SHA1 e59f431392e3ca8cb13cb3bd295d69c24a08bc33 SHA256 60737ec19aaafdf1aece250db8664166de993dc1ac4107a1c535336d65a16630
+EBUILD indilib-0.7.2.ebuild 1338 RMD160 b73256fba24b1aef753c2cc2273a1c0486daceea SHA1 9503f892e2a7ce7e545a48965f58e803fe801ee7 SHA256 4acc9943a57ba7799cb8f7b37b9048f645b7fb6afc0065b1c473b9efbc474a1f
+MISC ChangeLog 2258 RMD160 21ef747cb5e0d9802b6cdce1624e38498d0fdba6 SHA1 8c7d76f4937e477e918a6501b6957a0a41141545 SHA256 5a91a5116bd23c5203b2006557a16fb625571a73a518d097afaa830884f0264e
 MISC metadata.xml 335 RMD160 942b5fc4c73f9852492b50374514f6e10907ff02 SHA1 a2c11cd53eda2431bc7043414a6092b0a6b12c51 SHA256 34a0ab97703e3c50a0e80344d8275f27f6d138becfc3c5ada3c4daa688d8e3ef
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
+}