InCvs

26 files changed, 0 insertions, 1209 deletions

diff --git a/sci-libs/cbflib/ChangeLog b/sci-libs/cbflib/ChangeLog
deleted file mode 100644
index 8caa35ed9..000000000
--- a/sci-libs/cbflib/ChangeLog
+++ /dev/null
@@ -1,42 +0,0 @@
-# ChangeLog for sci-libs/cbflib
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*cbflib-0.8.1-r4 (02 Jan 2010)
-
-  02 Jan 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
-  +cbflib-0.8.1-r4.ebuild:
-  PREFIX ready
-
-  26 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
-  cbflib-0.8.1-r3.ebuild:
-  QA
-
-*cbflib-0.8.1-r3 (22 Aug 2009)
-
-  22 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
-  files/0.8.1-Makefile.patch, -cbflib-0.8.1-r2.ebuild,
-  +cbflib-0.8.1-r3.ebuild:
-  QA rpath and soname fixed
-
-*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>
-  files/0.8.1-Makefile.patch, -cbflib-0.8.1.ebuild, +cbflib-0.8.1-r1.ebuild:
-  added missing fortran compatibility
-
-*cbflib-0.8.1 (20 Jul 2009)
-
-  20 Jul 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
-  files/0.8.1-Makefile.patch, cbflib-0.8.1.ebuild:
-  version bump and EAPI 2
-
-  20 Feb 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> ChangeLog:
-  Initial add
-
diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest
deleted file mode 100644
index 6fc22dc89..000000000
--- a/sci-libs/cbflib/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX 0.8.1-Makefile.patch 10985 RMD160 7181d1e0994c96ef3c5df10ff64b7608e1162ab4 SHA1 74f0161b2dc49f9e325dda7437579c463fd00555 SHA256 b4e89d00592c4965565c44753b4a19542fc87490eaba18c5dd0cb8027b1f9ae8
-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 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 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 1177 RMD160 05263ab28278c108bef28003f5dacf6b1ebe02bc SHA1 a8523f1eeb7f3c0f05a540ef5dc7e4e9facafb05 SHA256 372009c3c6833d4949cdd7fe002a5e44731f2b2ad38141c69439f7a284bd75a5
-EBUILD cbflib-0.8.1-r3.ebuild 1570 RMD160 ced09d27609ad04cc66a65ec5d5ecb3e21938141 SHA1 06057692019f48bebb15d7d218e2aa35b849fe93 SHA256 dab90ab48254d458846b0739fb8710f552f2ea30bc1ab3f15410c9032bcf539b
-EBUILD cbflib-0.8.1-r4.ebuild 1649 RMD160 ff3861d4f16b5446b30f6e7b978977c6c804ff01 SHA1 dbf734f906418135235edbdea5c8e924539531e0 SHA256 ce989aa3ee5636918dc459f4100dfb5be0976d98fc5c23c8e80f32cb4942c985
-MISC ChangeLog 1186 RMD160 c3acc6b246df52e051a077f3e40340a109d11073 SHA1 3460e59a79425e62366d760dd62be44388b8c9cf SHA256 08a649cb6a3ec1e518de816adebd35fc030fee60f550e37ed5fd14a759f2c7af
-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
deleted file mode 100644
index c89aff577..000000000
--- a/sci-libs/cbflib/cbflib-0.7.9-r1.ebuild
+++ /dev/null
@@ -1,55 +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
-
-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/cbflib-0.8.1-r3.ebuild b/sci-libs/cbflib/cbflib-0.8.1-r3.ebuild
deleted file mode 100644
index 94f20ba86..000000000
--- a/sci-libs/cbflib/cbflib-0.8.1-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs base
-
-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}.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"
-IUSE="test"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${MY_P1}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-Makefile.patch
-	)
-
-src_prepare(){
-	cp Makefile_LINUX_gcc42 Makefile
-
-	base_src_prepare
-
-	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} -fPIC:" \
-		-e "s:^F90C.*$:F90C = $(tc-getFC):" \
-		-e "s:^F90FLAGS.*$:F90FLAGS = ${FFLAGS} -fPIC:" \
-		-e "s:^DOWNLOAD.*$:LDFLAGS = ${LDFLAGS} -fPIC:" \
-		-e "s:^SOLDFLAGS.*$:SOLDFLAGS = -shared:g" \
-		-i Makefile || \
-		die "make failed"
-}
-
-src_compile() {
-	emake -j1 all || die
-}
-
-src_test(){
-	emake -j1 tests || die "test failed"
-}
-
-src_install() {
-	emake INSTALLDIR="${D}/usr" install || die "Install failed"
-
-	# Install all what emake missed
-	dolib.a lib/libfcb.a || die
-	dolib.so solib/* || die
-}
diff --git a/sci-libs/cbflib/cbflib-0.8.1-r4.ebuild b/sci-libs/cbflib/cbflib-0.8.1-r4.ebuild
deleted file mode 100644
index 52c26a8f2..000000000
--- a/sci-libs/cbflib/cbflib-0.8.1-r4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs base
-
-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}.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"
-IUSE="test"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${MY_P1}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-Makefile.patch
-	)
-
-src_prepare(){
-	cp Makefile_LINUX_gcc42 Makefile
-
-	base_src_prepare
-
-	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} -fPIC:" \
-		-e "s:^F90C.*$:F90C = $(tc-getFC):" \
-		-e "s:^F90FLAGS.*$:F90FLAGS = ${FFLAGS} -fPIC:" \
-		-e "s:^DOWNLOAD.*$:LDFLAGS = ${LDFLAGS} -fPIC:" \
-		-e "s:^SOLDFLAGS.*$:SOLDFLAGS = -shared:g" \
-		-e "s: /bin: ${EPREFIX}/bin:g" \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-i Makefile || \
-		die "make failed"
-}
-
-src_compile() {
-	emake -j1 all || die
-}
-
-src_test(){
-	emake -j1 tests || die "test failed"
-}
-
-src_install() {
-	emake INSTALLDIR="${D}/${EPREFIX}/usr" install || die "Install failed"
-
-	# Install all what emake missed
-	dolib.a lib/libfcb.a || die
-	dolib.so solib/* || die
-}
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 bf52dddd6..000000000
--- a/sci-libs/cbflib/files/0.8.1-Makefile.patch
+++ /dev/null
@@ -1,300 +0,0 @@
-sed \
--e '/rm \*\.o/d' \
--e 's:$(CC) -o $@ \*\.o $(SOLDFLAGS):$(CC) $(LDFLAGS) -o $@ *.o:g' \
--e 's:$(F90C) -o $@ \*\.o $(SOLDFLAGS):$(F90C) $(LDFLAGS) -o $@ *.o:g' \
--e '900,2000s:$(CC) $(CFLAGS) :$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) -o $@ :g' \
--e '900,2000s:$(C++) $(CFLAGS) :$(C++) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) -o $@ :g' \
--e '900,2000s:$(F90C) $(F90FLAGS) :$(F90C) $(F90FLAGS) $(SOCFLAGS) $(LDFLAGS) -o $@ :g' \
--e 's:-lcbf -lm -limg -o $@:-lcbf -lm -limg:g' \
--e 's:-lcbf -lm -o $@:-lcbf -lm:g' \
--e 's:-lfcb -o $@:-lfcb -lm:g' \
--e '900,2000s:-L$(LIB):-L$(SOLIB):g' \
--e 's|: $(LIB)/libcbf.a|: $(SOLIB)/libcbf.so|g' \
--e 's|: $(LIB)/libfcb.a|: $(SOLIB)/libfcb.so|g' \
--e 's:/usr/bin/bunzip2:/bin/bunzip2:g' \
--e 's:/usr/bin/bzip2:/bin/bunzip2:g' \
--e 's|install:  all|install:|g' \
-Makefile > Makefile.new
---- Makefile	2009-07-18 17:24:25.000000000 +0200
-+++ Makefile.new	2009-07-18 17:24:31.000000000 +0200
-@@ -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/bunzip2
- 
- #
- # Program to use to generate a signature
-@@ -702,7 +702,7 @@
- 	./.symlinks $(SLFLAGS)
- 	touch symlinksdone
- 
--install:  all $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/bin \
-+install: $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/bin \
- 		    $(INSTALLDIR)/include $(INSTALLDIR)/include/cbflib
- 		-chmod -R 755 $(INSTALLDIR)/include/cbflib
- 		-chmod 755 $(INSTALLDIR)/lib/libcbf.a
-@@ -837,15 +837,13 @@
- $(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) $(LIB)
- 	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
- 	$(AR) cr $@ *.o
--	rm *.o
- ifneq ($(RANLIB),)
- 	$(RANLIB) $@
- endif
- 
- $(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
- 	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
--	$(CC) -o $@ *.o $(SOLDFLAGS)
--	rm *.o
-+	$(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.0.8 $(SOCFLAGS) $(SOLDFLAGS) -o $@ *.o -lgfortran
- 
- #
- # IMG library
-@@ -853,15 +851,13 @@
- $(LIB)/libimg.a: $(EXAMPLES)/img.c $(HEADERS) $(COMMONDEP) $(LIB)
- 	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
- 	$(AR) cr $@ *.o
--	rm *.o
- ifneq ($(RANLIB),)
- 	$(RANLIB) $@
- endif
- 	
- $(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
- 	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
--	$(CC) -o $@ *.o $(SOLDFLAGS)
--	rm *.o
-+	$(CC) $(LDFLAGS) -Wl,-soname,libimg.so.0.8 $(SOLDFLAGS) -o $@ *.o
- 
- #
- # CBF and IMG libraries
-@@ -876,7 +872,6 @@
- ifneq ($(F90C),)
- 	$(F90C) $(F90FLAGS) -c $(F90SOURCE)
- 	$(AR) cr $@ *.o
--	rm *.o
- ifneq ($(RANLIB),)
- 	$(RANLIB) $@
- endif
-@@ -887,8 +882,7 @@
- $(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
- ifneq ($(F90C),)
- 	$(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE)
--	$(F90C) -o $@ *.o $(SOLDFLAGS)
--	rm *.o
-+	$(F90C) $(LDFLAGS) -Wl,-soname,libcbf.so.0.8 $(SOLDFLAGS) -o $@ *.o
- else
- 	echo "Define F90C to build $(SOLIB)/libfcb.so"
- endif
-@@ -914,8 +908,8 @@
- 	$(JAR) cf $@ org
- 
- $(SOLIB)/libcbf_wrap.so: $(JAVADIR)/cbflib-$(VERSION).jar $(SOLIB)/libimg.so
--	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) $(JAVAINCLUDES) -c $(SRC)/cbf_wrap.c
--	$(CC) -o $@ *.o $(SOLDFLAGS) -L$(SOLIB) -lcbf
-+	$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(SOCFLAGS) $(INCLUDES) $(WARNINGS) $(JAVAINCLUDES) -c $(SRC)/cbf_wrap.c
-+	$(CC) $(LDFLAGS) -Wl,-soname,libcbf_wrap.so.0.8 $(SOLDFLAGS) -o $@ *.o -L$(SOLIB) -lcbf
- 
- #
- # F90SOURCE
-@@ -942,131 +936,131 @@
- #
- # convert_image example program
- #
--$(BIN)/convert_image: $(LIB)/libcbf.a $(EXAMPLES)/convert_image.c $(EXAMPLES)/img.c \
-+$(BIN)/convert_image: $(SOLIB)/libcbf.so $(EXAMPLES)/convert_image.c $(EXAMPLES)/img.c \
- 					$(GOPTLIB)	$(GOPTINC)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/convert_image.c $(EXAMPLES)/img.c $(GOPTLIB) -L$(LIB) \
--		  -lcbf -lm -o $@
-+	$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/convert_image.c $(EXAMPLES)/img.c $(GOPTLIB) -L$(SOLIB) \
-+		  -lcbf -lm
- #
- # convert_minicbf example program
- #
--$(BIN)/convert_minicbf: $(LIB)/libcbf.a $(EXAMPLES)/convert_minicbf.c \
-+$(BIN)/convert_minicbf: $(SOLIB)/libcbf.so $(EXAMPLES)/convert_minicbf.c \
- 					$(GOPTLIB)	$(GOPTINC)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/convert_minicbf.c $(GOPTLIB) -L$(LIB) \
--		  -lcbf -lm -o $@
-+	$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/convert_minicbf.c $(GOPTLIB) -L$(SOLIB) \
-+		  -lcbf -lm
- 
- #
- # makecbf example program
- #
--$(BIN)/makecbf: $(LIB)/libcbf.a $(EXAMPLES)/makecbf.c $(LIB)/libimg.a
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/makecbf.c  -L$(LIB) \
--		  -lcbf -lm -limg -o $@
-+$(BIN)/makecbf: $(SOLIB)/libcbf.so $(EXAMPLES)/makecbf.c $(SOLIB)/libimg.so
-+	$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/makecbf.c  -L$(SOLIB) \
-+		  -lcbf -lm -limg
- 
- 
- #
- # adscimg2cbf example program
- #
--$(BIN)/adscimg2cbf: $(LIB)/libcbf.a $(EXAMPLES)/adscimg2cbf.c $(EXAMPLES)/adscimg2cbf_sub.c
--	$(CC) $(CFLAGS) -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/adscimg2cbf.c $(EXAMPLES)/adscimg2cbf_sub.c  -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/adscimg2cbf: $(SOLIB)/libcbf.so $(EXAMPLES)/adscimg2cbf.c $(EXAMPLES)/adscimg2cbf_sub.c
-+	$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/adscimg2cbf.c $(EXAMPLES)/adscimg2cbf_sub.c  -L$(SOLIB) \
-+		  -lcbf -lm
- 
- #
- # cbf2adscimg example program
- #
--$(BIN)/cbf2adscimg: $(LIB)/libcbf.a $(EXAMPLES)/cbf2adscimg.c $(EXAMPLES)/cbf2adscimg_sub.c
--	$(CC) $(CFLAGS) -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/cbf2adscimg.c $(EXAMPLES)/cbf2adscimg_sub.c  -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/cbf2adscimg: $(SOLIB)/libcbf.so $(EXAMPLES)/cbf2adscimg.c $(EXAMPLES)/cbf2adscimg_sub.c
-+	$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/cbf2adscimg.c $(EXAMPLES)/cbf2adscimg_sub.c  -L$(SOLIB) \
-+		  -lcbf -lm
- 
- #
- # img2cif example program
- #
--$(BIN)/img2cif: $(LIB)/libcbf.a $(EXAMPLES)/img2cif.c $(LIB)/libimg.a \
-+$(BIN)/img2cif: $(SOLIB)/libcbf.so $(EXAMPLES)/img2cif.c $(SOLIB)/libimg.so \
- 					$(GOPTLIB) 	$(GOTPINC)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/img2cif.c $(GOPTLIB) -L$(LIB) \
--		  -lcbf -lm -limg -o $@
-+	$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/img2cif.c $(GOPTLIB) -L$(SOLIB) \
-+		  -lcbf -lm -limg
- 
- #
- # cif2cbf example program
- #
--$(BIN)/cif2cbf: $(LIB)/libcbf.a $(EXAMPLES)/cif2cbf.c $(LIB)/libimg.a \
-+$(BIN)/cif2cbf: $(SOLIB)/libcbf.so $(EXAMPLES)/cif2cbf.c $(SOLIB)/libimg.so \
- 					$(GOPTLIB)	$(GOPTINC)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/cif2cbf.c $(GOPTLIB) -L$(LIB) \
--		  -lcbf -lm -limg -o $@
-+	$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/cif2cbf.c $(GOPTLIB) -L$(SOLIB) \
-+		  -lcbf -lm -limg
- #
- # testcell example program
- #
--$(BIN)/testcell: $(LIB)/libcbf.a $(EXAMPLES)/testcell.C
--	$(C++) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/testcell.C -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/testcell: $(SOLIB)/libcbf.so $(EXAMPLES)/testcell.C
-+	$(C++) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/testcell.C -L$(SOLIB) \
-+		  -lcbf -lm
- 
- #
- # cif2c example program
- #
--$(BIN)/cif2c: $(LIB)/libcbf.a $(EXAMPLES)/cif2c.c
--	$(C++) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/cif2c.c -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/cif2c: $(SOLIB)/libcbf.so $(EXAMPLES)/cif2c.c
-+	$(C++) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/cif2c.c -L$(SOLIB) \
-+		  -lcbf -lm
- 
- #
- # sauter_test example program
- #
--$(BIN)/sauter_test: $(LIB)/libcbf.a $(EXAMPLES)/sauter_test.C
--	$(C++) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/sauter_test.C -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/sauter_test: $(SOLIB)/libcbf.so $(EXAMPLES)/sauter_test.C
-+	$(C++) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/sauter_test.C -L$(SOLIB) \
-+		  -lcbf -lm
- 
- #
- # testreals example program
- #
--$(BIN)/testreals: $(LIB)/libcbf.a $(EXAMPLES)/testreals.c
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/testreals.c -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/testreals: $(SOLIB)/libcbf.so $(EXAMPLES)/testreals.c
-+	$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/testreals.c -L$(SOLIB) \
-+		  -lcbf -lm
- #
- # testflat example program
- #
--$(BIN)/testflat: $(LIB)/libcbf.a $(EXAMPLES)/testflat.c
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/testflat.c -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/testflat: $(SOLIB)/libcbf.so $(EXAMPLES)/testflat.c
-+	$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/testflat.c -L$(SOLIB) \
-+		  -lcbf -lm
- #
- # testflatpacked example program
- #
--$(BIN)/testflatpacked: $(LIB)/libcbf.a $(EXAMPLES)/testflatpacked.c
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/testflatpacked.c -L$(LIB) \
--		  -lcbf -lm -o $@
-+$(BIN)/testflatpacked: $(SOLIB)/libcbf.so $(EXAMPLES)/testflatpacked.c
-+	$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/testflatpacked.c -L$(SOLIB) \
-+		  -lcbf -lm
- 
- ifneq ($(F90C),)
- #
- # test_xds_binary example program
- #
--$(BIN)/test_xds_binary: $(LIB)/libfcb.a $(EXAMPLES)/test_xds_binary.f90
--	$(F90C) $(F90FLAGS) $(F90LDFLAGS) $(EXAMPLES)/test_xds_binary.f90 \
--		-L$(LIB) -lfcb -o $@
-+$(BIN)/test_xds_binary: $(SOLIB)/libfcb.so $(EXAMPLES)/test_xds_binary.f90
-+	$(F90C) $(F90FLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(F90LDFLAGS) $(EXAMPLES)/test_xds_binary.f90 \
-+		-L$(SOLIB) -lfcb -lm
- 
- #
- # test_fcb_read_image example program
- #
--$(BIN)/test_fcb_read_image: $(LIB)/libfcb.a $(EXAMPLES)/test_fcb_read_image.f90
--	$(F90C) $(F90FLAGS) $(F90LDFLAGS) $(EXAMPLES)/test_fcb_read_image.f90 \
--		-L$(LIB) -lfcb -o $@
-+$(BIN)/test_fcb_read_image: $(SOLIB)/libfcb.so $(EXAMPLES)/test_fcb_read_image.f90
-+	$(F90C) $(F90FLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(F90LDFLAGS) $(EXAMPLES)/test_fcb_read_image.f90 \
-+		-L$(SOLIB) -lfcb -lm
- endif
- 
- #
- # testcbf (C)
- #
- $(BIN)/ctestcbf: $(EXAMPLES)/testcbf.c $(LIB)/libcbf.a
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
--		      $(EXAMPLES)/testcbf.c -L$(LIB) \
--		  -lcbf -lm -o $@
-+	$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \
-+		      $(EXAMPLES)/testcbf.c -L$(SOLIB) \
-+		  -lcbf -lm
- 
- #
- # testcbf (Java)
diff --git a/sci-libs/cbflib/files/HOMEDIR.patch b/sci-libs/cbflib/files/HOMEDIR.patch
deleted file mode 100644
index d158d825c..000000000
--- a/sci-libs/cbflib/files/HOMEDIR.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2008-09-16 17:03:36.602973240 +0200
-+++ Makefile	2008-09-16 17:04:49.054975881 +0200
-@@ -358,7 +358,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
diff --git a/sci-libs/cbflib/files/Makefile.patch b/sci-libs/cbflib/files/Makefile.patch
deleted file mode 100644
index 245c92935..000000000
--- a/sci-libs/cbflib/files/Makefile.patch
+++ /dev/null
@@ -1,188 +0,0 @@
---- 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
- 		
- 		
- #
---- Makefile	2009-03-06 15:04:55.338223367 +0100
-+++ Makefile.new	2009-03-06 15:05:04.591555828 +0100
-@@ -839,7 +839,7 @@
- #
- $(BIN)/convert_image: $(LIB)/libcbf.a $(EXAMPLES)/convert_image.c $(EXAMPLES)/img.c \
- 					$(GOPTLIB)	$(GOPTINC)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $(WARNINGS) \
-               $(EXAMPLES)/convert_image.c $(EXAMPLES)/img.c $(GOPTLIB) -L$(LIB) \
- 	      -lcbf -lm -o $@
- #
-@@ -847,7 +847,7 @@
- #
- $(BIN)/convert_minicbf: $(LIB)/libcbf.a $(EXAMPLES)/convert_minicbf.c \
- 					$(GOPTLIB)	$(GOPTINC)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $(WARNINGS) \
-               $(EXAMPLES)/convert_minicbf.c $(GOPTLIB) -L$(LIB) \
- 	      -lcbf -lm -o $@
- 
-@@ -855,7 +855,7 @@
- # makecbf example program
- #
- $(BIN)/makecbf: $(LIB)/libcbf.a $(EXAMPLES)/makecbf.c $(LIB)/libimg.a
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $(WARNINGS) \
-               $(EXAMPLES)/makecbf.c  -L$(LIB) \
- 	      -lcbf -lm -limg -o $@
- 
-@@ -864,7 +864,7 @@
- # adscimg2cbf example program
- #
- $(BIN)/adscimg2cbf: $(LIB)/libcbf.a $(EXAMPLES)/adscimg2cbf.c $(EXAMPLES)/adscimg2cbf_sub.c
--	$(CC) $(CFLAGS) -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \
-               $(EXAMPLES)/adscimg2cbf.c $(EXAMPLES)/adscimg2cbf_sub.c  -L$(LIB) \
- 	      -lcbf -lm -o $@
- 
-@@ -872,7 +872,7 @@
- # cbf2adscimg example program
- #
- $(BIN)/cbf2adscimg: $(LIB)/libcbf.a $(EXAMPLES)/cbf2adscimg.c $(EXAMPLES)/cbf2adscimg_sub.c
--	$(CC) $(CFLAGS) -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \
- 		      $(EXAMPLES)/cbf2adscimg.c $(EXAMPLES)/cbf2adscimg_sub.c  -L$(LIB) \
- 		  -lcbf -lm -o $@
- 
-@@ -881,7 +881,7 @@
- #
- $(BIN)/img2cif: $(LIB)/libcbf.a $(EXAMPLES)/img2cif.c $(LIB)/libimg.a \
- 					$(GOPTLIB) 	$(GOTPINC)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $(WARNINGS) \
-               $(EXAMPLES)/img2cif.c $(GOPTLIB) -L$(LIB) \
- 	      -lcbf -lm -limg -o $@
- 
-@@ -890,14 +890,14 @@
- #
- $(BIN)/cif2cbf: $(LIB)/libcbf.a $(EXAMPLES)/cif2cbf.c $(LIB)/libimg.a \
- 					$(GOPTLIB)	$(GOPTINC)
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $(WARNINGS) \
-               $(EXAMPLES)/cif2cbf.c $(GOPTLIB) -L$(LIB) \
- 	      -lcbf -lm -limg -o $@
- #
- # testcell example program
- #
- $(BIN)/testcell: $(LIB)/libcbf.a $(EXAMPLES)/testcell.C
--	$(C++) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
-+	$(C++) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $(WARNINGS) \
-               $(EXAMPLES)/testcell.C -L$(LIB) \
- 	      -lcbf -lm -o $@
- 
-@@ -905,7 +905,7 @@
- # cif2c example program
- #
- $(BIN)/cif2c: $(LIB)/libcbf.a $(EXAMPLES)/cif2c.c
--	$(C++) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
-+	$(C++) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $(WARNINGS) \
-               $(EXAMPLES)/cif2c.c -L$(LIB) \
- 	      -lcbf -lm -o $@
- 
-@@ -913,7 +913,7 @@
- # sauter_test example program
- #
- $(BIN)/sauter_test: $(LIB)/libcbf.a $(EXAMPLES)/sauter_test.C
--	$(C++) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
-+	$(C++) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $(WARNINGS) \
-               $(EXAMPLES)/sauter_test.C -L$(LIB) \
- 	      -lcbf -lm -o $@
- 
-@@ -921,21 +921,21 @@
- # testreals example program
- #
- $(BIN)/testreals: $(LIB)/libcbf.a $(EXAMPLES)/testreals.c
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $(WARNINGS) \
-               $(EXAMPLES)/testreals.c -L$(LIB) \
- 	      -lcbf -lm -o $@
- #
- # testflat example program
- #
- $(BIN)/testflat: $(LIB)/libcbf.a $(EXAMPLES)/testflat.c
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $(WARNINGS) \
-               $(EXAMPLES)/testflat.c -L$(LIB) \
- 	      -lcbf -lm -o $@
- #
- # testflatpacked example program
- #
- $(BIN)/testflatpacked: $(LIB)/libcbf.a $(EXAMPLES)/testflatpacked.c
--	$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $(WARNINGS) \
-               $(EXAMPLES)/testflatpacked.c -L$(LIB) \
- 	      -lcbf -lm -o $@
- 	      
---- 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
-
-
diff --git a/sci-libs/cbflib/files/bzip-test.patch b/sci-libs/cbflib/files/bzip-test.patch
deleted file mode 100644
index 797f9ab79..000000000
--- a/sci-libs/cbflib/files/bzip-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.orig	2008-09-19 15:46:36.000000000 +0200
-+++ Makefile	2008-09-19 15:47:50.000000000 +0200
-@@ -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
-
-## justin 090919 I am not able to fix this.
-
---- Makefile.orig	2008-09-19 16:35:43.000000000 +0200
-+++ Makefile	2008-09-19 16:36:25.000000000 +0200
-@@ -335,7 +335,7 @@
- F90FLAGS = -O2 -march=prescott -pipe -fomit-frame-pointer -fno-range-check
- F90LDFLAGS = 
- M4FLAGS = -Dfcb_bytes_in_rec=131072
--TIME = time
-+#TIME = time
- 
- ifneq ($(NOFORTRAN),)
- F90C =
-
diff --git a/sci-libs/cbflib/metadata.xml b/sci-libs/cbflib/metadata.xml
deleted file mode 100644
index efb490d78..000000000
--- a/sci-libs/cbflib/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>sci@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/sci-libs/cqrlib/ChangeLog b/sci-libs/cqrlib/ChangeLog
deleted file mode 100644
index 20fc0bfb8..000000000
--- a/sci-libs/cqrlib/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-# ChangeLog for sci-libs/cqrlib
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*cqrlib-1.0.3 (25 Jul 2009)
-
-  25 Jul 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
-  +files/1.0.3-LDFLAGS.patch, +cqrlib-1.0.3.ebuild, +metadata.xml:
-  new ebuild written by me
-
diff --git a/sci-libs/cqrlib/Manifest b/sci-libs/cqrlib/Manifest
deleted file mode 100644
index e879f9b86..000000000
--- a/sci-libs/cqrlib/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 1.0.3-LDFLAGS.patch 1184 RMD160 56138c4cfd56ec15b60514d7c7abf74a98303d83 SHA1 670e85bb50575b8d341e6a8e0096e864a09782ca SHA256 b23577fedecee714c9c0898390075ee94b7aaa2e39ac31bf3317c1b46d202dec
-DIST CQRlib-1.0.3.tar.gz 31940 RMD160 b3ca3ea9d454098f666a9657f848d8176a71f3cf SHA1 4f9669a5db8da569937c440082647158bacced61 SHA256 e4b2323c8f27e3b625c79d5363176e9e6d7e4f90bac3895822b956bf8433fa45
-EBUILD cqrlib-1.0.3.ebuild 986 RMD160 c13603699efa2a02cfd681139dce375f7b937cef SHA1 986c9cc66ed75f49a27c5041150777209fe4b1c9 SHA256 9de295c0a01a76a9c9547c25a4057504292d1bc19e9454fb1d152075a3596ff1
-MISC ChangeLog 297 RMD160 f5727f9b9e43453d24b4f884ac4d9f17c236206d SHA1 c90b63a813112d2a05aae599ee227bac9e7b9724 SHA256 c60f5b0dc8457b5c72112de3a268a8d260f851ea46580ffbf5967bf12b490ff5
-MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
diff --git a/sci-libs/cqrlib/cqrlib-1.0.3.ebuild b/sci-libs/cqrlib/cqrlib-1.0.3.ebuild
deleted file mode 100644
index d52ae93fb..000000000
--- a/sci-libs/cqrlib/cqrlib-1.0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit base flag-o-matic toolchain-funcs
-
-MY_PN=CQRlib
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An ANSI C implementation of a utility library for quaternion arithmetic and quaternion rotation math"
-HOMEPAGE="http://cqrlib.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/cvector"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-LDFLAGS.patch
-	)
-
-src_compile() {
-	append-flags -ansi
-	emake \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS}" \
-		all || die
-}
-
-src_test() {
-	emake tests || die "test failed"
-}
-
-src_install() {
-	dobin bin/* || die "failed to install bins"
-	dolib.a lib/.libs/*.a || die "failed to install libs"
-
-	insinto /usr/include
-	doins *.h || die "failed to install includes"
-
-	dodoc README_CQRlib.txt
-}
diff --git a/sci-libs/cqrlib/files/1.0.3-LDFLAGS.patch b/sci-libs/cqrlib/files/1.0.3-LDFLAGS.patch
deleted file mode 100644
index fb6c054d8..000000000
--- a/sci-libs/cqrlib/files/1.0.3-LDFLAGS.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile	2009-07-08 18:12:50.000000000 +0200
-+++ Makefile.new	2009-07-25 13:18:36.000000000 +0200
-@@ -86,10 +86,10 @@
- endif
- 
- COMPILE_COMMAND        =  $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
--LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) -rpath $(INSTALLDIR)/lib
--BUILD_COMMAND_LOCAL    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
--BUILD_COMMAND_DYNAMIC  =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
--BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
-+LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) $(LDFLAGS)
-+BUILD_COMMAND_LOCAL    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES)
-+BUILD_COMMAND_DYNAMIC  =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -dynamic -I/usr/include
-+BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -static -I/usr/include
- INSTALL_COMMAND        =  $(LIBTOOL) --mode=install cp
- INSTALL_FINISH_COMMAND =  $(LIBTOOL) --mode=finish
- 
diff --git a/sci-libs/cqrlib/metadata.xml b/sci-libs/cqrlib/metadata.xml
deleted file mode 100644
index efb490d78..000000000
--- a/sci-libs/cqrlib/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>sci@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/sci-libs/neartree/ChangeLog b/sci-libs/neartree/ChangeLog
deleted file mode 100644
index 6d95c5e09..000000000
--- a/sci-libs/neartree/ChangeLog
+++ /dev/null
@@ -1,24 +0,0 @@
-# ChangeLog for sci-libs/neartree
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  02 Jan 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
-  neartree-2.1.4.ebuild:
-  PREFIX ready
-
-*neartree-2.1.4 (02 Dec 2009)
-
-  02 Dec 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
-  +files/2.1.4-FLAGS.patch, +files/2.1.4-LDFLAGS.patch,
-  +files/2.1.4-gcc4.3.patch, +files/2.1.4-iterator.patch,
-  +files/2.1.4-test.patch, +neartree-2.1.4.ebuild:
-  version bump
-  src_test included
-
-*neartree-2.1.3 (25 Jul 2009)
-
-  25 Jul 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
-  +files/2.1.3-LDFLAGS.patch, +neartree-2.1.3.ebuild,
-  +files/2.1.3-gcc4.3.patch, +metadata.xml:
-  new ebuild written by me
-
diff --git a/sci-libs/neartree/Manifest b/sci-libs/neartree/Manifest
deleted file mode 100644
index 7ba2aa220..000000000
--- a/sci-libs/neartree/Manifest
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 2.1.3-LDFLAGS.patch 1523 RMD160 b4d73bfdb3197ba32c01ee8fd3c809e2aa62ffe3 SHA1 a07ef950f40164ed771862176371b2e60d7c64cb SHA256 66dbd6c32e4fc1e20a6a9738de29fec7bb0f9b4736cfcd5d2771f5d6b6522a4b
-AUX 2.1.3-gcc4.3.patch 616 RMD160 9a3c54f125c8f8d15b026a8799d58aff6c7b9faf SHA1 7dc0d4a04b7a4f7456059da1ebf223ca699773d3 SHA256 a04edc6d830d13707adb4b386ad5f31cc93efae2e4168cfb6e94cd7c1bd8f6b0
-AUX 2.1.4-FLAGS.patch 2506 RMD160 4348d93a6875bd4810eb05e37e06ae7739b215c5 SHA1 ccf6f7580729b05d2dc7527c9bc7a65c124ec7fb SHA256 3a9390047f038a30490545e97b0b4580295efc5d1a0ee6b3a6d13897c843ba98
-AUX 2.1.4-gcc4.3.patch 616 RMD160 9a3c54f125c8f8d15b026a8799d58aff6c7b9faf SHA1 7dc0d4a04b7a4f7456059da1ebf223ca699773d3 SHA256 a04edc6d830d13707adb4b386ad5f31cc93efae2e4168cfb6e94cd7c1bd8f6b0
-AUX 2.1.4-iterator.patch 845 RMD160 33c451d43b0817680818648e91ce146e5c2f71c2 SHA1 b0e7b24400eedd129a1a0bd4fffeada2a79c80bd SHA256 977f9d70688cbd42baeba9262ad113797bcee76e455629ca7fac26d06e2a7de8
-AUX 2.1.4-test.patch 638 RMD160 8d3352b9c48ed13f724d10e6551cca4df478e466 SHA1 86937e57f7e5d0f5e82d91b91bfe42394502d29b SHA256 0771a2a7ac552d56d8642388300ba1b4b51d781aeb89e7594ef9ea0129d5f0ad
-DIST NearTree-2.1.3.tar.gz 88651 RMD160 bba6ff00140b6b34c6c6f380ab766047809f8487 SHA1 156fa565403a45691fb62cdb5151860fe172faa9 SHA256 64456db72994339bef22129edcdb7c52561293bc9735e1b0d0fbe7153d423a07
-DIST neartree-2.1.4.zip 95970 RMD160 cbf90912f9ce8f162c5440bd67d695168c92c6c3 SHA1 aa5ef6174ed81423423145cf7facdc0f6a4decb8 SHA256 54ba8d6e35734586605221342b62b78ee11e88d7855e2ba34130deed5f70ef55
-EBUILD neartree-2.1.3.ebuild 1001 RMD160 e1a08f4adf088f05f2cb6aa4a99cfd9d87e26322 SHA1 624a8051df3f261612bc6bbbbeae55e735d80ade SHA256 f40d744f1eeef18959cad70a5c19851170481039a050c00b255ea931713eb7e9
-EBUILD neartree-2.1.4.ebuild 1236 RMD160 e24fe0531e345336cec764f60dc6c96807432458 SHA1 c2bc81d954e56959980f4ffc663805348775e6b4 SHA256 1f5d5f05649614a737e44d1a1aaaed45813054dee00d60ca3c1845807b498168
-MISC ChangeLog 719 RMD160 c1db0a5aaa395e7237294f11903258ecca4f8e95 SHA1 e9a2129dd3fd0ae41dccf49ce7c86b55f8802231 SHA256 62adf478b01a8d83957a8abb068656067780dd8e7f4fd7fb3343eaac531f60d5
-MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks/0sEACgkQgAnW8HDreRZi6wCglMuaFHuO1pEnQJHEi6h9ABwn
-2x0An2p6HAgkIMHt02R4gB4ywgTs970J
-=vo2e
------END PGP SIGNATURE-----
diff --git a/sci-libs/neartree/files/2.1.3-LDFLAGS.patch b/sci-libs/neartree/files/2.1.3-LDFLAGS.patch
deleted file mode 100644
index 435da5f04..000000000
--- a/sci-libs/neartree/files/2.1.3-LDFLAGS.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile	2009-07-08 03:46:28.000000000 +0200
-+++ Makefile.new	2009-07-25 11:37:02.000000000 +0200
-@@ -112,11 +112,11 @@
- 
- COMPILE_COMMAND        =  $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
- CPPCOMPILE_COMMAND     =  $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
--LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib
--BUILD_COMMAND_LOCAL    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
--CPPBUILD_COMMAND_LOCAL =  $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CFLAGS) $(INCLUDES)
--BUILD_COMMAND_DYNAMIC  =  $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) -shared -I$(INSTALL_PREFIX)/include
--BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static-libtool-libs -I$(INSTALL_PREFIX)/include
-+LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined $(LDFLAGS)
-+BUILD_COMMAND_LOCAL    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES)
-+CPPBUILD_COMMAND_LOCAL =  $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CFLAGS) $(LDFLAGS) $(INCLUDES)
-+BUILD_COMMAND_DYNAMIC  =  $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) $(LDFLAGS) -shared -I/usr/include
-+BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -static-libtool-libs -I/usr/include
- INSTALL_COMMAND        =  $(LIBTOOL) --mode=install cp
- INSTALL_FINISH_COMMAND =  $(LIBTOOL) --mode=finish
- 
diff --git a/sci-libs/neartree/files/2.1.3-gcc4.3.patch b/sci-libs/neartree/files/2.1.3-gcc4.3.patch
deleted file mode 100644
index 527254ce5..000000000
--- a/sci-libs/neartree/files/2.1.3-gcc4.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- CNearTreeTest.cpp	2009-06-08 04:54:29.000000000 +0200
-+++ CNearTreeTest.cpp.new	2009-07-25 12:36:33.000000000 +0200
-@@ -47,6 +47,7 @@
- #include <cmath>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstring>
- 
- #ifndef USE_LOCAL_HEADERS
- #include <TNear.h>
---- TNear.h	2009-06-08 04:54:29.000000000 +0200
-+++ TNear.h.new	2009-07-25 12:39:09.000000000 +0200
-@@ -272,6 +272,7 @@
- #define TRIANG(a,b,c) (  (((b)+(c))-(a) >= 0))
- #endif
- 
-+#include <algorithm>
- 
- //=======================================================================
- // CNearTree is the root class for the neartree. The actual data of the
diff --git a/sci-libs/neartree/files/2.1.4-FLAGS.patch b/sci-libs/neartree/files/2.1.4-FLAGS.patch
deleted file mode 100644
index ef957881d..000000000
--- a/sci-libs/neartree/files/2.1.4-FLAGS.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 10e9ba2..796670e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -48,11 +48,11 @@ RELEASE = 2.1.3
- #
- # Compiler and compilation flags
- #
--CC	= gcc
-+CC	?= gcc
- ifneq ($(MSYSTEM),MINGW32)
--CFLAGS  = -g -O2  -Wall  -ansi -pedantic -DCNEARTREE_SAFE_TRIANG=1
-+CFLAGS  += -ansi -DCNEARTREE_SAFE_TRIANG=1
- else
--CFLAGS  = -g -O2 -Wall  -DCNEARTREE_SAFE_TRIANG=1
-+CFLAGS  = -DCNEARTREE_SAFE_TRIANG=1
- endif
- 
- #
-@@ -72,8 +72,8 @@ endif
- # Uncomment the next two lines if CVector is installed locally in $(HOME)/include
- # and $(HOME)/lib
- #
--#CVECTOR_INCLUDE = -I$(HOME)/include 
--#CVECTOR_LIBLOC = -L$(HOME)/lib
-+CVECTOR_INCLUDE = -I/usr/include 
-+CVECTOR_LIBLOC = -L/usr/GENTOOLIBDIR
- 
- #
- # Directories
-@@ -86,7 +86,7 @@ INC      = $(ROOT)
- EXAMPLES = $(ROOT)
- TESTDATA = $(ROOT)
- ifndef INSTALL_PREFIX
--INSTALL_PREFIX = /usr/local
-+INSTALL_PREFIX = /usr
- #INSTALL_PREFIX  = $(HOME)
- endif
- 
-@@ -111,12 +111,12 @@ CPPLIBRARIES = -lm
- CLIBRARIES = $(CVECTOR_LIBLOC) -lCVector -lm
- 
- COMPILE_COMMAND        =  $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
--CPPCOMPILE_COMMAND     =  $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
--LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib
--BUILD_COMMAND_LOCAL    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
--CPPBUILD_COMMAND_LOCAL =  $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CFLAGS) $(INCLUDES)
--BUILD_COMMAND_DYNAMIC  =  $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) -shared -I$(INSTALL_PREFIX)/include
--BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static-libtool-libs -I$(INSTALL_PREFIX)/include
-+CPPCOMPILE_COMMAND     =  $(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) $(INCLUDES) $(WARNINGS) -c
-+LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined $(LDFLAGS)
-+BUILD_COMMAND_LOCAL    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES)
-+CPPBUILD_COMMAND_LOCAL =  $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CXXFLAGS) $(LDFLAGS) $(INCLUDES)
-+BUILD_COMMAND_DYNAMIC  =  $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) $(LDFLAGS) -shared -I/usr/include
-+BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -static-libtool-libs -I/usr/include
- INSTALL_COMMAND        =  $(LIBTOOL) --mode=install cp
- INSTALL_FINISH_COMMAND =  $(LIBTOOL) --mode=finish
- 
diff --git a/sci-libs/neartree/files/2.1.4-gcc4.3.patch b/sci-libs/neartree/files/2.1.4-gcc4.3.patch
deleted file mode 100644
index 527254ce5..000000000
--- a/sci-libs/neartree/files/2.1.4-gcc4.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- CNearTreeTest.cpp	2009-06-08 04:54:29.000000000 +0200
-+++ CNearTreeTest.cpp.new	2009-07-25 12:36:33.000000000 +0200
-@@ -47,6 +47,7 @@
- #include <cmath>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstring>
- 
- #ifndef USE_LOCAL_HEADERS
- #include <TNear.h>
---- TNear.h	2009-06-08 04:54:29.000000000 +0200
-+++ TNear.h.new	2009-07-25 12:39:09.000000000 +0200
-@@ -272,6 +272,7 @@
- #define TRIANG(a,b,c) (  (((b)+(c))-(a) >= 0))
- #endif
- 
-+#include <algorithm>
- 
- //=======================================================================
- // CNearTree is the root class for the neartree. The actual data of the
diff --git a/sci-libs/neartree/files/2.1.4-iterator.patch b/sci-libs/neartree/files/2.1.4-iterator.patch
deleted file mode 100644
index 4563ecb86..000000000
--- a/sci-libs/neartree/files/2.1.4-iterator.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/TNear.h b/TNear.h
-index d848b61..a5d255e 100644
---- a/TNear.h
-+++ b/TNear.h
-@@ -735,7 +735,7 @@ void BelongsToPoints( const T& t1, const T& t2, ContainerType& group1, Container
- {
-     group1.clear();
-     group2.clear();
--    CNearTree<T>::iterator it;
-+    typename CNearTree<T>::iterator it;
- 
-     for ( it=this->begin( ); it!=this->end( ); ++it )
-     {
-@@ -756,11 +756,11 @@ void SeparateByRadius( const DistanceType radius, const T& tProbe, ContainerType
- {
-     inside.clear();
-     outside.clear();
--    CNearTree<T>::iterator it;
-+    typename CNearTree<T>::iterator it;
- 
-     for ( it=this->begin( ); it!=this->end( ); ++it )
-     {
--        if( DistanceBetween( (*it), probe ) > radius )
-+        if( DistanceBetween( (*it), tProbe ) > radius )
-         {
-             inside.insert( inside.end( ), (*it) );
-         }
diff --git a/sci-libs/neartree/files/2.1.4-test.patch b/sci-libs/neartree/files/2.1.4-test.patch
deleted file mode 100644
index 382cfd17f..000000000
--- a/sci-libs/neartree/files/2.1.4-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 10e9ba2..b9a349b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -303,14 +303,7 @@ tests:		$(LIB) $(BIN) $(BIN)/CPPMain $(BIN)/CPPNearTreeTest \
- 			$(BIN)/CMain 3458923 > $(TESTDATA)/CMain.lst
- 			$(BIN)/CPPNearTreeTest
- 			$(BIN)/CNearTreeTest
--ifneq ($(MSYSTEM),MINGW32)
--			diff -b -c $(TESTDATA)/CPPMain_orig.lst $(TESTDATA)/CPPMain.lst
--			diff -b -c $(TESTDATA)/CMain_orig.lst $(TESTDATA)/CMain.lst
--else
--			diff -b -c $(TESTDATA)/CPPMain_MINGW_orig.lst $(TESTDATA)/CPPMain.lst
--			diff -b -c $(TESTDATA)/CMain_MINGW_orig.lst $(TESTDATA)/CMain.lst
--endif
--			
-+
- #
- # Remove all non-source files
- #
diff --git a/sci-libs/neartree/metadata.xml b/sci-libs/neartree/metadata.xml
deleted file mode 100644
index efb490d78..000000000
--- a/sci-libs/neartree/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>sci@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/sci-libs/neartree/neartree-2.1.3.ebuild b/sci-libs/neartree/neartree-2.1.3.ebuild
deleted file mode 100644
index 50ec30be6..000000000
--- a/sci-libs/neartree/neartree-2.1.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit base flag-o-matic toolchain-funcs
-
-MY_PN=NearTree
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="function library efficiently solving the Nearest Neighbor Problem(known as the post office problem)"
-HOMEPAGE="http://neartree.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/cvector"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-LDFLAGS.patch
-	"${FILESDIR}"/${PV}-gcc4.3.patch
-	)
-
-src_compile() {
-	append-flags -DCNEARTREE_SAFE_TRIANG=1 -ansi
-	emake \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS}" \
-		all || die
-}
-
-src_install() {
-	dobin bin/* || die "failed to install bins"
-	dolib.a lib/.libs/*.a || die "failed to install libs"
-
-	insinto /usr/include
-	doins *.h || die "failed to install includes"
-
-	dodoc README_NearTree.txt
-}
diff --git a/sci-libs/neartree/neartree-2.1.4.ebuild b/sci-libs/neartree/neartree-2.1.4.ebuild
deleted file mode 100644
index 6d6daad5e..000000000
--- a/sci-libs/neartree/neartree-2.1.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit base flag-o-matic toolchain-funcs
-
-MY_PN=NearTree
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="function library efficiently solving the Nearest Neighbor Problem(known as the post office problem)"
-HOMEPAGE="http://neartree.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}/${MY_PN}.zip -> ${P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/cvector"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-FLAGS.patch
-	"${FILESDIR}"/${PV}-gcc4.3.patch
-	"${FILESDIR}"/${PV}-iterator.patch
-	"${FILESDIR}"/${PV}-test.patch
-	)
-
-src_prepare() {
-	base_src_prepare
-	sed \
-		-e "s:GENTOOLIBDIR:$(get_libdir):g" \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-i Makefile
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		all || die
-}
-
-src_test() {
-	emake \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		tests || die
-}
-
-src_install() {
-	dobin bin/* || die "failed to install bins"
-	dolib.a lib/.libs/*.a || die "failed to install libs"
-
-	insinto /usr/include
-	doins *.h || die "failed to install includes"
-
-	dodoc README_NearTree.txt
-	dohtml *.html
-}