sci-libs/cbflib: Fix underlinking

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

4 files changed, 94 insertions, 4 deletions

diff --git a/sci-libs/cbflib/ChangeLog b/sci-libs/cbflib/ChangeLog
index d2200a5bb96a..f0e06cf497f7 100644
--- a/sci-libs/cbflib/ChangeLog
+++ b/sci-libs/cbflib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/cbflib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.23 2012/05/21 19:17:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.24 2012/05/30 13:30:19 jlec Exp $
+
+*cbflib-0.9.2.3-r1 (30 May 2012)
+
+  30 May 2012; Justin Lecher <jlec@gentoo.org> files/0.9.2.3-Makefile.patch,
+  +cbflib-0.9.2.3-r1.ebuild:
+  Fix underlinking
 
   21 May 2012; Brent Baude <ranger@gentoo.org> cbflib-0.9.2.3.ebuild:
   Marking cbflib-0.9.2.3 ppc for bug 413815
diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest
index fb045b9ced5e..19d33b13326b 100644
--- a/sci-libs/cbflib/Manifest
+++ b/sci-libs/cbflib/Manifest
@@ -1,7 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 0.9.0-Makefile.patch 3091 RMD160 d976bb6fab07ffb5fa982b84f0c2d02c940c69ca SHA1 0b14f223cf4af87856acdb053918d5a0484987e3 SHA256 361cd3c6a906f6bfe2761196e459aec2735e4bb539586b5589b1a8d2d35a02b4
 AUX 0.9.0-python.patch 574 RMD160 ef346c4d28421d1559c6f6d972f0f6b9089740be SHA1 fe142637682924bdd39aadc86b81028babd9c99b SHA256 632e0820b0479a7f267d34ba8709b8bc828c58e3d63b45d6b78c9c86af0f4594
 AUX 0.9.2.2-Makefile.patch 4597 RMD160 e07da2bb9fb392c581001d816430560da8e1e589 SHA1 4d99026024ad48b5af8e97a129a5f92931132208 SHA256 c1f13709e8f264f0eba1f08624eeced697036c1a9467b2b099a3eadb0e82a0eb
-AUX 0.9.2.3-Makefile.patch 4687 RMD160 2157eb184f542bbcb8c120790e86c305c2cbf509 SHA1 eeae633d4a0d98f0253ca07242e251023391f3f3 SHA256 4b2bbfd206b75c1e0cf7de02b803b6989631c17df32752e7563a476cefe90ec0
+AUX 0.9.2.3-Makefile.patch 4691 RMD160 3ccfe285ec21bd9684858eca14e64071b4cd17ed SHA1 6ea3df270b840c9090f0484894de8f470dc230e5 SHA256 4f819e20c182eccb94ab8bdbde3129375eb1caa06037b3f65270571f70b2bcbf
 DIST CBFlib-0.9.0_14Feb10.tar.gz 4456643 RMD160 a90052a584f982df456a9426d07f2fd506c55ef4 SHA1 b05ab50f6a9f921444f3bb27cbbc72797be4f41f SHA256 7f79d0de9b07b6c544f2da1bf66b83460006fca75a36eacbbc8f839694ff2eba
 DIST CBFlib-0.9.2.2.tar.gz 4549837 RMD160 485c68fb350f5f8daf6462300c8b7c9f7ce016e0 SHA1 a6eadf241d570e11fd10ab6f913ad702f5ac4296 SHA256 ce289756d643aa2ab79fd1614183ccee7ad06f128d1d8d59c97d7c107ce5f802
 DIST CBFlib-0.9.2.3.tar.gz 4553047 RMD160 ac694d1c3aa9b8df7c7a3ee69f35fa4b828e4196 SHA1 11253c9d5ed16f4d75bc585103f839014175c890 SHA256 e69169e0d15a018cfa96efc8d664d478e9231af69274db1250ca6d2a406bd4c7
@@ -9,6 +12,15 @@ DIST CBFlib_0.9.2_Data_Files_Input.tar.gz 17102003 RMD160 517c7615e657f5c3e94284
 DIST CBFlib_0.9.2_Data_Files_Output.tar.gz 36009958 RMD160 537be448076a670beeef4b153987009210442332 SHA1 673ad3fe184d5e2fc150a34b871c43e0357e00fc SHA256 311cebff470b7d4f94b7888252cca879e6e0745f4e2eb6fa9e21cf84f984029b
 EBUILD cbflib-0.9.0-r3.ebuild 2271 RMD160 96d3f7e5b6f911d9cc278c2b62d5eebe86b09dca SHA1 c67f578a55708a55cd9d83b973bcbbe0be118be2 SHA256 d1a7397dd31afbff0384e28b08dd3876f688e089aa744b0e3827cbf5a7f24a6b
 EBUILD cbflib-0.9.2.2.ebuild 1720 RMD160 5ab8b5733375a64d1fc6b027c608cbcdd7e5f0bf SHA1 09831ece4b0e8da9eff458fb9aec81bb36bb8c75 SHA256 cd58ade7768578c0ade97254425956609869fe945d72c0bd2c7aadf42a4876a6
+EBUILD cbflib-0.9.2.3-r1.ebuild 1799 RMD160 fec139142220b5a4139d7fe6cd083ca81f1536b2 SHA1 dbb807c38ffd0fe5c69c73d505be055920f881fd SHA256 22f8316b9e61f5f381f9ba6af2b1b7514d78c6b20f596600d42d2270b015a637
 EBUILD cbflib-0.9.2.3.ebuild 1797 RMD160 121599abc2f767bc807fdd52d75a8d92b7f5b316 SHA1 0fae0fcc92b7521e4716d553a1506ad9edae6469 SHA256 4d8656b11c1db10ae35fd80f251f960b054cf0005421c29c9672ee39407df8a6
-MISC ChangeLog 3740 RMD160 8d12097f29739e3321119ce8db03e3f854c2e032 SHA1 d35ed86eb47fd64bb717f06b87701f2002b90edb SHA256 978babb4b4277b29b44194c250f1d71725e6ad8a304f13b198a8c15e37607412
+MISC ChangeLog 3898 RMD160 482f0dc8ca848045242a82161474fd9444060667 SHA1 27418f44d4f005a4e908d14dda38131374bd9d0b SHA256 51d9a9e6e2a31404adda28ad68cf95792607e4063d496114c757ca6ed7b40096
 MISC metadata.xml 876 RMD160 5eeb9243491d73e4d8a5631e32204c15d7506f9e SHA1 a0e2e09ae6369fd0d6fb4e6dd49cb4bac18f5d15 SHA256 071da33ed31350cc15bac652a2ff5382bd2b27c1b8edc4b13baa8d5076f91eea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/GIPAACgkQgAnW8HDreRafigCffmN0DinVH3FYo4Fh6/rSGj40
+788AnRbP5DfSGli+KHHnWJ7Fkr+k1Vrs
+=42sq
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/cbflib/cbflib-0.9.2.3-r1.ebuild b/sci-libs/cbflib/cbflib-0.9.2.3-r1.ebuild
new file mode 100644
index 000000000000..6bed8a508bd1
--- /dev/null
+++ b/sci-libs/cbflib/cbflib-0.9.2.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.9.2.3-r1.ebuild,v 1.1 2012/05/30 13:30:19 jlec Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic fortran-2 toolchain-funcs
+
+MY_P1="CBFlib-${PV}"
+#MY_P2="CBFlib_${PV}"
+MY_P2="CBFlib_0.9.2"
+
+DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files"
+HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/"
+BASE_TEST_URI="http://arcib.dowling.edu/software/CBFlib/downloads/version_${PV}/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz
+	test? (
+		mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Input.tar.gz
+		mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Output.tar.gz
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="virtual/fortran"
+RDEPEND="${DEPEND}"
+#test? ( sys-process/time )"
+
+S=${WORKDIR}/${MY_P1}
+
+src_prepare(){
+	rm -rf Py* drel* dRel* ply*
+	epatch "${FILESDIR}"/${PV}-Makefile.patch
+	cp Makefile_LINUX_gcc42 Makefile
+
+	append-fflags -fno-range-check
+	append-cflags -D_USE_XOPEN_EXTENDED -DCBF_DONT_USE_LONG_LONG
+
+	sed \
+		-e "s|^CC.*$|CC = $(tc-getCC)|" \
+		-e "s|^C++.*$|C++ = $(tc-getCXX)|" \
+		-e "s|C++|CXX|g" \
+		-e "s|^CFLAGS.*$|CFLAGS = ${CFLAGS}|" \
+		-e "s|^F90C.*$|F90C = $(tc-getFC)|" \
+		-e "s|^F90FLAGS.*$|F90FLAGS = ${FFLAGS}|" \
+		-e "s|^SOLDFLAGS.*$|SOLDFLAGS = -shared ${LDFLAGS}|g" \
+		-e "s| /bin| ${EPREFIX}/bin|g" \
+		-e "s|/usr|${EPREFIX}/usr|g" \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake -j1 shared
+}
+
+src_test(){
+	emake -j1 basic
+}
+
+src_install() {
+	insinto /usr/include/${PN}
+	doins include/*.h
+
+	dolib.so solib/lib*
+
+	dodoc README
+	if use doc; then
+		dohtml -r README.html html_graphics doc
+	fi
+}
diff --git a/sci-libs/cbflib/files/0.9.2.3-Makefile.patch b/sci-libs/cbflib/files/0.9.2.3-Makefile.patch
index 55f798f0116d..b7c504225218 100644
--- a/sci-libs/cbflib/files/0.9.2.3-Makefile.patch
+++ b/sci-libs/cbflib/files/0.9.2.3-Makefile.patch
@@ -126,7 +126,7 @@ index a74be5f..1cfb066 100644
 -	$(CC) -o $@ img.o $(SOLDFLAGS)
 +$(SOLIB)/libimg.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
 +	$(CC) $(CFLAGS) $(SOCFLAGS) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
-+	$(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o
++	$(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o -lm
 +	ln -sf libimg.so.$(VERSION) $(SOLIB)/libimg.so
  	rm img.o