3 files changed, 5 insertions, 162 deletions
diff --git a/sci-libs/cbflib/ChangeLog b/sci-libs/cbflib/ChangeLog
index 1c76fd393435..66114f7ad082 100644
--- a/sci-libs/cbflib/ChangeLog
+++ b/sci-libs/cbflib/ChangeLog
@@ -1,6 +1,10 @@
 # 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.31 2012/12/04 11:17:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.32 2012/12/04 11:49:31 jlec Exp $
+
+  04 Dec 2012; Justin Lecher <jlec@gentoo.org> -cbflib-0.9.0-r3.ebuild,
+  -cbflib-0.9.2.3.ebuild:
+  Drop old
 
   04 Dec 2012;  <ago@gentoo.org> cbflib-0.9.2.4.ebuild:
   Stable for x86, wrt bug #440368
diff --git a/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild b/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild
deleted file mode 100644
index 494652d48af0..000000000000
--- a/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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.0-r3.ebuild,v 1.8 2012/10/18 21:33:44 jlec Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils flag-o-matic fortran-2 toolchain-funcs
-
-PYTHON_MODNAME="pycbf.py"
-MY_P1="CBFlib-${PV}"
-MY_P2="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="mirror://sourceforge/${PN}/${MY_P1}_14Feb10.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 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc python"
-
-S="${WORKDIR}/${MY_P1}"
-
-src_prepare(){
-	rm -rf Py* drel* dRel* ply*
-	epatch "${FILESDIR}"/${PV}-Makefile.patch
-	edos2unix pycbf/setup.py
-	epatch "${FILESDIR}"/${PV}-python.patch
-	cp Makefile_LINUX_gcc42 Makefile
-
-	append-fflags -fno-range-check
-	append-cflags -D_USE_XOPEN_EXTENDED
-
-	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 || die
-
-	if use python; then
-		cd pycbf
-		distutils_src_compile
-	fi
-}
-
-# test app is borked in this version
-# produces buffer overflows
-#src_test(){
-#	emake -j1 tests || die
-#}
-
-src_install() {
-	insinto /usr/include/${PN}
-	doins include/*.h || die
-
-	dolib.so solib/lib* || die
-
-	dodoc README || die
-	if use doc; then
-		dohtml -r README.html html_graphics doc || die
-	fi
-	if use python; then
-		cd pycbf
-		distutils_src_install
-	fi
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/sci-libs/cbflib/cbflib-0.9.2.3.ebuild b/sci-libs/cbflib/cbflib-0.9.2.3.ebuild
deleted file mode 100644
index 88499bb3a907..000000000000
--- a/sci-libs/cbflib/cbflib-0.9.2.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.ebuild,v 1.4 2012/10/18 21:33:44 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"
-
-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
-}