fixed bug 238300

5 files changed, 12 insertions, 79 deletions

diff --git a/sci-libs/cbflib/ChangeLog b/sci-libs/cbflib/ChangeLog
index af7470fcf..907913b8e 100644
--- a/sci-libs/cbflib/ChangeLog
+++ b/sci-libs/cbflib/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cbflib-0.8.1-r2 (21 Aug 2009)
+
+  21 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  -cbflib-0.8.1-r1.ebuild, +cbflib-0.8.1-r2.ebuild:
+  upstream changed the tarbal and fixed an runtime bug
+
 *cbflib-0.8.1-r1 (25 Jul 2009)
 
   25 Jul 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest
index bd1d0daa0..6e97ca8f2 100644
--- a/sci-libs/cbflib/Manifest
+++ b/sci-libs/cbflib/Manifest
@@ -2,14 +2,13 @@ AUX 0.8.1-Makefile.patch 10876 RMD160 cac5085af25d967c03f6f8df93638b82981f033c S
 AUX HOMEDIR.patch 422 RMD160 5f20a7f729375dabdcc313cb9d9831b3280add03 SHA1 16444190272229f7a00cdc0a928dd867ae65ef17 SHA256 a43927642f683102f3d2384ccb2ddd4c5fe49604a418631529416c226419c689
 AUX Makefile.patch 6193 RMD160 1cc4f1ed81ca99ce0bd8f0e9741498ffa268b878 SHA1 b55ae3739b28a3ae149a52e96e2f762bba9d8d30 SHA256 02af8f7c3f957ae6ab84dad7894c40b3e1ce03d579a96c795261d3270a5ebb84
 AUX bzip-test.patch 740 RMD160 88a5e1488a14bb442ddf8a5de9b47097cf257e1a SHA1 edbacac832c3ffdfeff4f2968b018ddb7fd2af8a SHA256 feb46f3707953df344ac4334370f7c05c5732397b9f6072ffd59b308b0c05d55
-DIST CBFlib-0.8.1.tar.gz 3724321 RMD160 efcfe25f25f2f1d8905be0823fc50ab4eacd79fc SHA1 477ae46a849a9e8ddd3d7790572147c819d30f04 SHA256 3551960364c76c7894444c54264912aa13841eade9ef1bd95178c7042b3688db
+DIST CBFlib-0.8.1.tar.gz 3532726 RMD160 e2b82cabaeb7da07ca547822f7b3ac8871f6f467 SHA1 2b17b7f79c0e32e0a5a22aa43c93c170296e6d02 SHA256 197660197d0f861da26764d67fcf92fd75cfa3ad1da30df02fb33e6d67c6b5e3
 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
+DIST CBFlib_0.7.9_Data_Files_Input.tar.gz 9889302 RMD160 b0be6ea771eea9bbc70bdf4da0a8096aa4a56993 SHA1 259f29f9c9891716a6337799c2f309440f063ca9 SHA256 fb70c6e9e8415971b9569c41556d9af2f358aebeb8f7ed847b0fcdc3106737d6
+DIST CBFlib_0.7.9_Data_Files_Output.tar.gz 28118936 RMD160 9a556854d0137dcc4d54d39f3875f67c2950e0c1 SHA1 ad57e8bd20cd3d085e834c88212fc0312b181999 SHA256 fb8e642acff695ef9fb1ad73414157001977fe32b3714495ac187fdc15560c1a
 DIST CBFlib_0.8.1_Data_Files_Input.tar.gz 13054828 RMD160 d0528487e798da81b3b6e964ddfb45a5d61f0c50 SHA1 05d3238856f281c9c7a6203922f95b19edf329ce SHA256 c083806fe490768f6dbe87aa6329a5b49fd58f902e17fe9338d17de567494725
 DIST CBFlib_0.8.1_Data_Files_Output.tar.gz 34114303 RMD160 7b3625576f58d7824ce41402d06590eb7f6a8c84 SHA1 5fa182a5cd5e6196336b3b320eb86990f7afa1f2 SHA256 318f38b1dd1495a4ddb899df8b0aea3150d562eece0f82b1ef127becc45c069a
-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
-EBUILD cbflib-0.8.1-r1.ebuild 1554 RMD160 084f034041c0c11a6ce4a74c92ac63db99429bf2 SHA1 0dbea411b96fbf2a0635f63d6f94724e76499cd8 SHA256 0a738850e924d627bf1c97843e5dc6a15c4c3a7c133b9c9890a312eb8b0f8b5c
-MISC ChangeLog 568 RMD160 0adbcc53694fa04880ebf8ce968694bd2de27fc5 SHA1 800d27ed329e9cb43cb3762f5d33c1e0c7d9a376 SHA256 6a5cd0e249c3644eb3f8468376593ecef6a544d3195fa1f577f376d2d6d57dc0
+EBUILD cbflib-0.7.9-r1.ebuild 1177 RMD160 05263ab28278c108bef28003f5dacf6b1ebe02bc SHA1 a8523f1eeb7f3c0f05a540ef5dc7e4e9facafb05 SHA256 372009c3c6833d4949cdd7fe002a5e44731f2b2ad38141c69439f7a284bd75a5
+EBUILD cbflib-0.8.1-r2.ebuild 1553 RMD160 f5e0b008dcc6d536728549b1fbf3e4e4d2d26f8a SHA1 f15ccd87f6ac5e1dcf6865dd36974387dcbf8e89 SHA256 839fb0d598ee3617a4bd53f71a2486b348b0f90d4ac3d7d92a8053ba0b5e6ff0
+MISC ChangeLog 765 RMD160 6ea33bc85f86f968731e87d5ca6fb5242ad0a426 SHA1 f464befda472752152b356c18b0aa38a91f3c897 SHA256 1117c5136c67e2ab6158c87fbc4bdb16be1cf478a2624fd9fc98f0a544f1bcb8
 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
index e19c15c18..c89aff577 100644
--- a/sci-libs/cbflib/cbflib-0.7.9-r1.ebuild
+++ b/sci-libs/cbflib/cbflib-0.7.9-r1.ebuild
@@ -53,4 +53,3 @@ src_test(){
 src_install() {
 	emake DESTDIR="${D}" install || die "Install failed"
 }
-
diff --git a/sci-libs/cbflib/cbflib-0.7.9.ebuild b/sci-libs/cbflib/cbflib-0.7.9.ebuild
deleted file mode 100644
index 4ee6bd288..000000000
--- a/sci-libs/cbflib/cbflib-0.7.9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils flag-o-matic toolchain-funcs versionator
-
-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
-
-#	if [[ "$(gcc-major-version)$(gcc-minor-version)" -ge 42 ]] && ( use x86 || use amd64 ) ; then
-	if version_is_at_least "4.2" "$(gcc-version)" && ( use x86 || use amd64 ) ; then
-	sed -e "330,375s:^CFLAGS.*$:CFLAGS  = ${CFLAGS} -ansi -D_POSIX_SOURCE:g" \
-	    -e "330,375s:^F90FLAGS.*$:F90FLAGS = ${FFLAGS} -fno-range-check:g" \
-	    -i Makefile
-	else
-	sed -e "330,375s:^F90LDFLAGS.*$:F90LDFLAGS = -bind_at_load:g" \
-	    -i Makefile
-	fi
-
-	append-flags -fno-strength-reduce
-
-	sed -e "1,50s:^CFLAGS.*$:CFLAGS  = ${CFLAGS}:g" \
-	    -i getopt-1.1.4_cbf/Makefile
-
-	epatch "${FILESDIR}"/HOMEDIR.patch
-
-	if use test; then
-		epatch "${FILESDIR}"/bzip-test.patch
-	fi
-}
-
-src_compile(){
-	emake -j1 \
-	CC="$(tc-getCC)" \
-	LDFLAGS=${LDFLAGS} \
-	all
-}
-
-src_test(){
-	emake -j1 tests
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-}
-
diff --git a/sci-libs/cbflib/cbflib-0.8.1-r1.ebuild b/sci-libs/cbflib/cbflib-0.8.1-r2.ebuild
index fd8e2f6ee..37006d8a0 100644
--- a/sci-libs/cbflib/cbflib-0.8.1-r1.ebuild
+++ b/sci-libs/cbflib/cbflib-0.8.1-r2.ebuild
@@ -67,4 +67,3 @@ src_install() {
 	dolib.a lib/libfcb.a || die
 	dolib.so solib/* || die
 }
-