revert messed up commits

3 files changed, 130 insertions, 0 deletions

diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest
index 8cc212466..e912c0637 100644
--- a/sci-libs/cbflib/Manifest
+++ b/sci-libs/cbflib/Manifest
@@ -1,8 +1,10 @@
 AUX HOMEDIR.patch 422 RMD160 5f20a7f729375dabdcc313cb9d9831b3280add03 SHA1 16444190272229f7a00cdc0a928dd867ae65ef17 SHA256 a43927642f683102f3d2384ccb2ddd4c5fe49604a418631529416c226419c689
+AUX Makefile.patch 2057 RMD160 fa87e6cd850dbf0dddad73897ac7b3913ed95612 SHA1 8720409961116707c48717bbe37d99fd5e459f76 SHA256 a12464e95e26806815e53a72d87cc516c760e0f147acc30d578b61b9c4aba444
 AUX bzip-test.patch 740 RMD160 88a5e1488a14bb442ddf8a5de9b47097cf257e1a SHA1 edbacac832c3ffdfeff4f2968b018ddb7fd2af8a SHA256 feb46f3707953df344ac4334370f7c05c5732397b9f6072ffd59b308b0c05d55
 DIST CBFlib_0.7.9.tar.gz 3576763 RMD160 693c743273ba997ebefd4fa3ee63dc090000de21 SHA1 a8513bc2faf38bdaac2755a32e260ff4c22e9025 SHA256 dfc801d11bd0ba96b8cbba8a205aa27699b73b13a5e3abe7f98bfd2fcbc66e78
 DIST CBFlib_0.7.9_Data_Files_Input.tar.gz 13054940 RMD160 c59a0a2017874f16b06d6beba0ec978271621b34 SHA1 36e494661dd8f1dab2692afc4dd38d11921872b7 SHA256 f4ebf6d53bb3d1cc07ff7dbb22cc1d1794f9b7c41609143182721eee39773637
 DIST CBFlib_0.7.9_Data_Files_Output.tar.gz 34113743 RMD160 6928024f349362c2b2e2b1a4ccd1b5b0deb7f172 SHA1 7a44a6cba9b7cf3f16d0c36a1e470cfa3e68abce SHA256 60cd56a5478ee8507576b3c5aee64004cd87fd4ff85e50fb2cbf294ac8856d60
+EBUILD cbflib-0.7.9-r1.ebuild 1178 RMD160 5e31d8777bc4336c02f1289911e4bb277e6ca729 SHA1 7d88478bdf2e7135f922d0448240d9fd86602872 SHA256 7b30e9975f38f22fa469923a6a43f57bef1ad3167b1a42a8fc033fadf90919d3
 EBUILD cbflib-0.7.9.ebuild 1667 RMD160 72cdaeca4101d5a35235e0323840277b71eeb032 SHA1 d48ccbc933c8cd656183de0768a0bd0cebb688a6 SHA256 74916491345431bd37b4749e1474eebfb909c2c470c208f08fb3b39b96a19663
 MISC ChangeLog 199 RMD160 fe69839a6289e00c9333276a55f38e7eb0dcb288 SHA1 27acd25a5066031ed157b916215d55b797c88a4d SHA256 ed5434b16a01dafa8a30d1df61b7de76076f878b326fff347c0fe324c022fe93
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
diff --git a/sci-libs/cbflib/cbflib-0.7.9-r1.ebuild b/sci-libs/cbflib/cbflib-0.7.9-r1.ebuild
new file mode 100644
index 000000000..e19c15c18
--- /dev/null
+++ b/sci-libs/cbflib/cbflib-0.7.9-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_P="CBFlib_${PV}"
+
+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="http://www.bernstein-plus-sons.com/software/${MY_P}.tar.gz
+	 test? (
+		${BASE_TEST_URI}/${MY_P}_Data_Files_Input.tar.gz
+		${BASE_TEST_URI}/${MY_P}_Data_Files_Output.tar.gz
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+RESTRICT="mirror"
+S="${WORKDIR}/${MY_P}"
+
+src_unpack(){
+	unpack ${A}
+	cd "${S}"
+
+	cp Makefile_LINUX Makefile
+
+	epatch "${FILESDIR}"/Makefile.patch
+}
+
+src_compile(){
+	append-fflags -fno-range-check
+
+	emake -j1 \
+	CC="$(tc-getCC)" \
+	C++="$(tc-getCXX)" \
+	F90C="$(tc-getFC)" \
+	F90FLAGS="${FFLAGS}" \
+	LDFLAGS="${LDFLAGS}" all || \
+	die "make failed"
+}
+
+src_test(){
+	emake -j1 tests || die "test failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+}
+
diff --git a/sci-libs/cbflib/files/Makefile.patch b/sci-libs/cbflib/files/Makefile.patch
new file mode 100644
index 000000000..42414f918
--- /dev/null
+++ b/sci-libs/cbflib/files/Makefile.patch
@@ -0,0 +1,72 @@
+--- Makefile	2009-03-02 22:42:03.000000000 +0100
++++ Makefile.new	2009-03-02 22:41:55.000000000 +0100
+@@ -288,13 +288,13 @@
+ #
+ # Program to use to decompress a data file
+ #
+-DECOMPRESS = /usr/bin/bunzip2
++DECOMPRESS = /bin/bunzip2
+ 
+ 
+ #
+ # Program to use to compress a data file
+ #
+-COMPRESS = /usr/bin/bzip2
++COMPRESS = /bin/bzip2
+ 
+ #
+ # Program to use to generate a signature
+@@ -330,12 +330,12 @@
+ #########################################################
+ CC	= gcc
+ C++	= g++
+-CFLAGS  = -g -O2  -Wall -ansi -pedantic
++CFLAGS  += -ansi -D_POSIX_SOURCE
+ F90C = gfortran
+-F90FLAGS = -g
++F90FLAGS += -fno-range-check
+ F90LDFLAGS = 
+ M4FLAGS = -Dfcb_bytes_in_rec=131072
+-TIME = time
++# TIME = time
+ 
+ ifneq ($(NOFORTRAN),)
+ F90C =
+@@ -357,7 +357,7 @@
+ DATADIRI  = $(ROOT)/../CBFlib_$(VERSION)_Data_Files_Input
+ DATADIRO  = $(ROOT)/../CBFlib_$(VERSION)_Data_Files_Output
+ DATADIRS  = $(ROOT)/../CBFlib_$(VERSION)_Data_Files_Output_Sigs_Only
+-INSTALLDIR  = $(HOME)
++INSTALLDIR  = $(DESTDIR)/usr
+ 
+ #
+ # URLs from which to retrieve the data directories
+@@ -667,7 +667,6 @@
+ 		-cp $(INSTALLDIR)/bin/testflatpacked $(INSTALLDIR)/bin/testflatpacked_old
+ 		cp $(BIN)/testflatpacked $(INSTALLDIR)/bin/testflatpacked
+ 		-rm -rf $(INSTALLDIR)/include/cbflib_old
+-		-cp -r $(INSTALLDIR)/include/cbflib $(INSTALLDIR)/include/cbflib_old
+ 		-rm -rf $(INSTALLDIR)/include/cbflib
+ 		cp -r $(INCLUDE) $(INSTALLDIR)/include/cbflib
+ 		chmod 644 $(INSTALLDIR)/lib/libcbf.a
+@@ -681,6 +680,7 @@
+ 		chmod 755 $(INSTALLDIR)/bin/testflat
+ 		chmod 755 $(INSTALLDIR)/bin/testflatpacked
+ 		chmod -R 644 $(INSTALLDIR)/include/cbflib
++		chmod 775 $(INSTALLDIR)/include/cbflib
+ 		
+ 		
+ #
+--- getopt-1.1.4_cbf/Makefile   2007-11-17 04:41:43.000000000 +0100
++++ getopt-1.1.4_cbf/Makefile.new       2009-03-02 23:03:35.000000000 +0100
+@@ -44,7 +44,7 @@
+          -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+          -Wnested-externs -Winline
+ OPTIMIZE=-O3 -fno-strength-reduce
+-CFLAGS=$(WARNINGS) $(OPTIMIZE)
++CFLAGS += -fno-strength-reduce
+ LDFLAGS=
+ 
+ sources=getopt.c
+
+