commit: ad2a62bc31c33655bd3b1732fed18e63329d69f5
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 7 12:07:55 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Dec 7 12:32:29 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad2a62bc
sci-libs/cbflib: Drop old
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/cbflib/Manifest | 1 -
sci-libs/cbflib/cbflib-0.9.2.4.ebuild | 68 ------------
sci-libs/cbflib/files/0.9.2.3-Makefile.patch | 150 ---------------------------
3 files changed, 219 deletions(-)
diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest
index cc5c869..3991e71 100644
--- a/sci-libs/cbflib/Manifest
+++ b/sci-libs/cbflib/Manifest
@@ -1,2 +1 @@
-DIST CBFlib-0.9.2.4.tar.gz 4564355 SHA256
c7d11a70e6454a6801e8f30d56db6639fa814aa25775bf54109325073c4a08c1 SHA512
e1ee1fe39b3d15e5d707d973c5666f198e3c9006b4c449fa56287032661a7ecfbeadad0fda528310f9cdd9f33856004333784a840d193a5c7db6c5c071fb07e5
WHIRLPOOL
ded867cda1757196ad2188eda7a1a09999411a3d1a452172880fabdc5504aa346e44b2c8c25d921f674897ec7f8edf3da4de79d4843f68ecbb72634631ea43dd
DIST CBFlib-0.9.3.3.tar.gz 5787633 SHA256
d6c3cc2c6c0aed2a3aa7c74dc645ad223470dc76bb2181242534d4c322bb00dc SHA512
e041c26770e12e09110d7c4f39737406c6ade6cae6fa941cd31dd3b90432a034426272b8daa851a8a23baceb7189479d2d8bde882b7cfdb8ae666fadc5be57ff
WHIRLPOOL
8e9e0004cdd2411c9d37b588afa274e1c2b955fe361fc3df597acc30526958d5722993f36f33672769ef55eca51b87917f57ec56528a7711a934d9f8de2b8019
diff --git a/sci-libs/cbflib/cbflib-0.9.2.4.ebuild
b/sci-libs/cbflib/cbflib-0.9.2.4.ebuild
deleted file mode 100644
index 374ab24..0000000
--- a/sci-libs/cbflib/cbflib-0.9.2.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic fortran-2 toolchain-funcs
-
-MY_P1="CBFlib-${PV}"
-#MY_P2="CBFlib_${PV}"
-MY_P2="CBFlib_0.9.3"
-
-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"
-
-S=${WORKDIR}/${MY_P1}
-
-RESTRICT="test"
-
-src_prepare(){
- rm -rf Py* drel* dRel* ply*
- epatch "${FILESDIR}"/0.9.2.3-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
- use doc && dohtml -r README.html html_graphics doc
-}
diff --git a/sci-libs/cbflib/files/0.9.2.3-Makefile.patch
b/sci-libs/cbflib/files/0.9.2.3-Makefile.patch
deleted file mode 100644
index b7c5042..0000000
--- a/sci-libs/cbflib/files/0.9.2.3-Makefile.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 44e303d998c72d5d502705895a536b3657a7c4c5 Mon Sep 17 00:00:00 2001
-Message-Id:
<44e303d998c72d5d502705895a536b3657a7c4c5.1323790511.git.j...@gentoo.org>
-From: Justin Lecher <[email protected]>
-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 = 3
-+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) $(NOREGEXFLAG) $(PYCIFRWFLAG) $(SOCFLAGS)
$(INCLUDES) $(WARNINGS) -c $(SOURCE)
-- $(CC) -o $@ *.o $(SOLDFLAGS) $(EXTRALIBS)
-- rm *.o
-+$(SOLIB)/libcbf.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
-+ $(CC) $(CFLAGS) $(NOREGEXFLAG) $(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) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) -c
$(EXAMPLES)/img.c
-+ $(CC) $(CFLAGS) $(NOREGEXFLAG) $(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) $(NOREGEXFLAG) $(SOCFLAGS) $(INCLUDES)
$(WARNINGS) -c $(EXAMPLES)/img.c
-- $(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 -lm
-+ 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
-
