Version Bump

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

5 files changed, 192 insertions, 76 deletions

diff --git a/sci-libs/cbflib/ChangeLog b/sci-libs/cbflib/ChangeLog
index 33496b3ddeb8..211649ff8a49 100644
--- a/sci-libs/cbflib/ChangeLog
+++ b/sci-libs/cbflib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/cbflib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.19 2011/06/28 19:30:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.20 2011/12/14 08:29:48 jlec Exp $
+
+*cbflib-0.9.2.2 (14 Dec 2011)
+
+  14 Dec 2011; Justin Lecher <jlec@gentoo.org> +files/0.9.2.2-Makefile.patch,
+  -files/0.8.1-Makefile.patch, -cbflib-0.8.1-r7.ebuild, +cbflib-0.9.2.2.ebuild:
+  Version Bump
 
   28 Jun 2011; Justin Lecher <jlec@gentoo.org> cbflib-0.8.1-r7.ebuild,
   cbflib-0.9.0-r3.ebuild, metadata.xml:
diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest
index fb68450378a9..4b585acb633c 100644
--- a/sci-libs/cbflib/Manifest
+++ b/sci-libs/cbflib/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX 0.8.1-Makefile.patch 1382 RMD160 79a344ee3654403ade4ddbc1a3bd1133f47e4e79 SHA1 7311cdafc01881555403cafb62e09a4f467f3e22 SHA256 92b3108840d2ccf7392ac24db52bb86fed7a9561cb3db9ccbf29e6c4e9e76cc5
 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
-DIST CBFlib-0.8.1.tar.gz 3532726 RMD160 e2b82cabaeb7da07ca547822f7b3ac8871f6f467 SHA1 2b17b7f79c0e32e0a5a22aa43c93c170296e6d02 SHA256 197660197d0f861da26764d67fcf92fd75cfa3ad1da30df02fb33e6d67c6b5e3
+AUX 0.9.2.2-Makefile.patch 4597 RMD160 e07da2bb9fb392c581001d816430560da8e1e589 SHA1 4d99026024ad48b5af8e97a129a5f92931132208 SHA256 c1f13709e8f264f0eba1f08624eeced697036c1a9467b2b099a3eadb0e82a0eb
 DIST CBFlib-0.9.0_14Feb10.tar.gz 4456643 RMD160 a90052a584f982df456a9426d07f2fd506c55ef4 SHA1 b05ab50f6a9f921444f3bb27cbbc72797be4f41f SHA256 7f79d0de9b07b6c544f2da1bf66b83460006fca75a36eacbbc8f839694ff2eba
-EBUILD cbflib-0.8.1-r7.ebuild 1710 RMD160 daa1735afca4919337a9f076962cafec525a52c7 SHA1 e27bf35eb9a1a1b3234de1fad32b9359f40c0dd7 SHA256 b971f1569b4dd0e17b2c987ad5e368dd2dbd793d8faa7de94e09934440083690
+DIST CBFlib-0.9.2.2.tar.gz 4549837 RMD160 485c68fb350f5f8daf6462300c8b7c9f7ce016e0 SHA1 a6eadf241d570e11fd10ab6f913ad702f5ac4296 SHA256 ce289756d643aa2ab79fd1614183ccee7ad06f128d1d8d59c97d7c107ce5f802
+DIST CBFlib_0.9.2_Data_Files_Input.tar.gz 17102003 RMD160 517c7615e657f5c3e942844d7055a37fb2dc067c SHA1 c48a9f372713f54f3bac390dea2b3ba977027422 SHA256 4414166a5a5b5ef6e4c460bb6941bd0aca53e7a41dbc9e5bdf0c6d44cf00d5ac
+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
-MISC ChangeLog 3135 RMD160 2608c465406e1c214ee4a38d6dcc29c5e32d4728 SHA1 2a48c40441ea461a080b4a6c76ca200ea8dc89fe SHA256 5e97d76a8c0ae8b9bc3d64cb6b4ce2eb6bf28f95853019a6db874fc46ba7fd94
+EBUILD cbflib-0.9.2.2.ebuild 1775 RMD160 c98aa1898cb2624982774b72d28491ceb8bfa599 SHA1 faf86008872fd75325a40f4f47b37f2fb9181b8a SHA256 00aa693fb9f383849d30ffceedcf0dbb0e59a39e78ab9726e496bda84409642a
+MISC ChangeLog 3340 RMD160 40923f8e7ae18837045aa584a233c3211a57c396 SHA1 b07d027a315f57d4fcc1321aaee3a4005dce66f0 SHA256 d7ae46062605ebc7610dcf3a264f4590869ba088d93cd96232bbc25c9ea04d9d
 MISC metadata.xml 876 RMD160 5eeb9243491d73e4d8a5631e32204c15d7506f9e SHA1 a0e2e09ae6369fd0d6fb4e6dd49cb4bac18f5d15 SHA256 071da33ed31350cc15bac652a2ff5382bd2b27c1b8edc4b13baa8d5076f91eea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk4KK+AACgkQgAnW8HDreRYzWwCdHvYzaU38pf+IxADKk7unj2yY
-+W8AnRSxIbwguwmC34EMNRoIGGXeMO2M
-=e6py
+iEYEAREKAAYFAk7oXoIACgkQgAnW8HDreRZtZACfSsYe5GwDb0GxS0fWapCrHUf2
+gy4AnRQef6QceyNr0ZrJ6QHgItHDVrh4
+=b82w
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cbflib/cbflib-0.8.1-r7.ebuild b/sci-libs/cbflib/cbflib-0.9.2.2.ebuild
index 4282bcf103dd..c1b16d8a3fa0 100644
--- a/sci-libs/cbflib/cbflib-0.8.1-r7.ebuild
+++ b/sci-libs/cbflib/cbflib-0.9.2.2.ebuild
@@ -1,27 +1,28 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.8.1-r7.ebuild,v 1.4 2011/06/28 19:30:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.9.2.2.ebuild,v 1.1 2011/12/14 08:29:48 jlec Exp $
 
-EAPI=3
+EAPI=4
 
 inherit eutils flag-o-matic fortran-2 toolchain-funcs
 
 MY_P1="CBFlib-${PV}"
-MY_P2="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? (
-#		${BASE_TEST_URI}/${MY_P2}_Data_Files_Input.tar.gz
-#		${BASE_TEST_URI}/${MY_P2}_Data_Files_Output.tar.gz
-#	)"
+BASE_TEST_URI="http://arcib.dowling.edu/software/CBFlib/downloads/version_${PV}/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz
+	 test? (
+		${BASE_TEST_URI}/${MY_P2}_Data_Files_Input.tar.gz
+		${BASE_TEST_URI}/${MY_P2}_Data_Files_Output.tar.gz
+	)"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
 
 DEPEND="virtual/fortran	"
 RDEPEND="${DEPEND}"
@@ -30,11 +31,12 @@ RDEPEND="${DEPEND}"
 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
+	append-cflags -D_USE_XOPEN_EXTENDED -DCBF_DONT_USE_LONG_LONG
 
 	sed \
 		-e "s|^CC.*$|CC = $(tc-getCC)|" \
@@ -50,18 +52,21 @@ src_prepare(){
 }
 
 src_compile() {
-	emake -j1 shared || die
+	emake -j1 shared
 }
 
-# test app is borked in this version
-# produces buffer overflows
-#src_test(){
-#	emake -j1 tests || die
-#}
+src_test(){
+	emake -j1 basic
+}
 
 src_install() {
 	insinto /usr/include/${PN}
-	doins include/* || die
+	doins include/*.h
+
+	dolib.so solib/lib*
 
-	dolib.so solib/* || die
+	dodoc README
+	if use doc; then
+		dohtml -r README.html html_graphics doc
+	fi
 }
diff --git a/sci-libs/cbflib/files/0.8.1-Makefile.patch b/sci-libs/cbflib/files/0.8.1-Makefile.patch
deleted file mode 100644
index d36a5dbffd24..000000000000
--- a/sci-libs/cbflib/files/0.8.1-Makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42
-index e5912ce..cfc658a 100644
---- a/Makefile_LINUX_gcc42
-+++ b/Makefile_LINUX_gcc42
-@@ -288,13 +288,13 @@ RANLIB  = /usr/bin/ranlib
- #
- # 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
-@@ -844,7 +844,7 @@ endif
- 
- $(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
- 	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
--	$(CC) -o $@ *.o $(SOLDFLAGS)
-+	$(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.0.8 $(SOCFLAGS) $(SOLDFLAGS) -o $@ *.o -lgfortran -lm
- 	rm *.o
- 
- #
-@@ -860,7 +860,7 @@ endif
- 	
- $(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
- 	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
--	$(CC) -o $@ *.o $(SOLDFLAGS)
-+	$(CC) $(LDFLAGS) -Wl,-soname,libimg.so.0.8 $(SOLDFLAGS) -o $@ *.o -lm
- 	rm *.o
- 
- #
-@@ -887,7 +887,7 @@ endif
- $(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
- ifneq ($(F90C),)
- 	$(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE)
--	$(F90C) -o $@ *.o $(SOLDFLAGS)
-+	$(F90C) $(LDFLAGS) -Wl,-soname,libcbf.so.0.8 $(SOLDFLAGS) -o $@ *.o
- 	rm *.o
- else
- 	echo "Define F90C to build $(SOLIB)/libfcb.so"
diff --git a/sci-libs/cbflib/files/0.9.2.2-Makefile.patch b/sci-libs/cbflib/files/0.9.2.2-Makefile.patch
new file mode 100644
index 000000000000..a25760307275
--- /dev/null
+++ b/sci-libs/cbflib/files/0.9.2.2-Makefile.patch
@@ -0,0 +1,150 @@
+From 44e303d998c72d5d502705895a536b3657a7c4c5 Mon Sep 17 00:00:00 2001
+Message-Id: <44e303d998c72d5d502705895a536b3657a7c4c5.1323790511.git.jlec@gentoo.org>
+From: Justin Lecher <jlec@gentoo.org>
+Date: Tue, 13 Dec 2011 16:10:43 +0100
+Subject: [PATCH] 0.9.0 Makefile.patch
+
+Conflicts:
+
+	Makefile_LINUX_gcc42
+---
+ Makefile_LINUX_gcc42 |   63 ++++++++++++++++++++++++++-----------------------
+ 1 files changed, 33 insertions(+), 30 deletions(-)
+
+diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42
+index a74be5f..1cfb066 100644
+--- a/Makefile_LINUX_gcc42
++++ b/Makefile_LINUX_gcc42
+@@ -250,7 +250,10 @@
+ 
+ 
+ # Version string
+-VERSION = 0.9.2
++MAJOR = 0
++MINOR = 9
++MICRO = 2
++VERSION = ${MAJOR}.${MINOR}.${MICRO}
+ 
+ 
+ #
+@@ -290,7 +293,7 @@ SHAR	= /usr/bin/shar
+ #
+ # Program to use to create archives
+ #
+-AR	= /usr/bin/ar
++AR	= ar
+ 
+ #
+ # Program to use to add an index to an archive
+@@ -300,13 +303,13 @@ RANLIB  = /usr/bin/ranlib
+ #
+ # Program to use to decompress a data file
+ #
+-DECOMPRESS = /usr/bin/bunzip2
++DECOMPRESS = bunzip2
+ 
+ 
+ #
+ # Program to use to compress a data file
+ #
+-COMPRESS = /usr/bin/bzip2
++COMPRESS = bzip2
+ 
+ #
+ # Program to use to generate a signature
+@@ -509,21 +512,18 @@ SOURCE   =  $(SRC)/cbf.c               \
+ 
+ 
+ F90SOURCE = $(SRC)/fcb_atol_wcnt.f90     \
+-			$(SRC)/fcb_ci_strncmparr.f90 \
+-			$(SRC)/fcb_exit_binary.f90   \
+-			$(SRC)/fcb_nblen_array.f90   \
+-			$(SRC)/fcb_next_binary.f90   \
+-			$(SRC)/fcb_open_cifin.f90    \
+-			$(SRC)/fcb_packed.f90        \
+-			$(SRC)/fcb_read_bits.f90     \
+-			$(SRC)/fcb_read_byte.f90     \
+-			$(SRC)/fcb_read_image.f90    \
+-			$(SRC)/fcb_read_line.f90     \
+-			$(SRC)/fcb_read_xds_i2.f90   \
+-			$(SRC)/fcb_skip_whitespace.f90 \
+-			$(EXAMPLES)/test_fcb_read_image.f90 \
+-			$(EXAMPLES)/test_xds_binary.f90
+-			
++		    $(SRC)/fcb_ci_strncmparr.f90 \
++		    $(SRC)/fcb_exit_binary.f90   \
++		    $(SRC)/fcb_nblen_array.f90   \
++		    $(SRC)/fcb_next_binary.f90   \
++		    $(SRC)/fcb_open_cifin.f90    \
++		    $(SRC)/fcb_packed.f90        \
++		    $(SRC)/fcb_read_bits.f90     \
++		    $(SRC)/fcb_read_byte.f90     \
++		    $(SRC)/fcb_read_image.f90    \
++		    $(SRC)/fcb_read_line.f90     \
++		    $(SRC)/fcb_read_xds_i2.f90   \
++		    $(SRC)/fcb_skip_whitespace.f90
+ 		   
+ #
+ # Header files
+@@ -701,7 +701,7 @@ all::	$(BIN)/test_xds_binary   \
+ 		$(BIN)/test_fcb_read_image
+ endif
+ 
+-shared:	$(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so
++shared:	$(SOLIB)/libcbf.so.${VERSION} $(SOLIB)/libfcb.so.${VERSION} $(SOLIB)/libimg.so.${VERSION}
+ 
+ javawrapper: shared $(JCBF) $(JCBF)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so
+ 
+@@ -915,25 +915,27 @@ ifneq ($(RANLIB),)
+ 	$(RANLIB) $@
+ endif
+ 
+-$(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+-	$(CC) $(CFLAGS) $(NOLLFLAG) $(PYCIFRWFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
+-	$(CC) -o $@ *.o $(SOLDFLAGS) $(EXTRALIBS)
+-	rm *.o
++$(SOLIB)/libcbf.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
++	mv *.o $(SOLIB)
++	$(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ $(SOLIB)/*.o $(EXTRALIBS)
++	ln -sf libcbf.so.$(VERSION) $(SOLIB)/libcbf.so
+ 
+ #
+ # IMG library
+ #
+ $(LIB)/libimg.a: $(EXAMPLES)/img.c $(HEADERS) $(COMMONDEP) $(LIB)
+-	$(CC) $(CFLAGS) $(NOLLFLAG) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
++	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
+ 	$(AR) cr $@ img.o
+ ifneq ($(RANLIB),)
+ 	$(RANLIB) $@
+ endif
+ 	rm img.o
+ 	
+-$(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+-	$(CC) $(CFLAGS) $(NOLLFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
+-	$(CC) -o $@ img.o $(SOLDFLAGS)
++$(SOLIB)/libimg.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
++	$(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o
++	ln -sf libimg.so.$(VERSION) $(SOLIB)/libimg.so
+ 	rm img.o
+ 
+ #
+@@ -957,10 +959,11 @@ else
+ 	echo "Define F90C to build $(LIB)/libfcb.a"
+ endif
+ 
+-$(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++$(SOLIB)/libfcb.so.${VERSION}: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+ ifneq ($(F90C),)
+ 	$(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE)
+-	$(F90C) $(F90FLAGS) -o $@ *.o $(SOLDFLAGS)
++	$(F90C) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(F90FLAGS) -o $@ *.o
++	ln -sf libfcb.so.$(VERSION) $(SOLIB)/libfcb.so
+ 	rm *.o
+ else
+ 	echo "Define F90C to build $(SOLIB)/libfcb.so"
+-- 
+1.7.8
+