sci-chemistry/freeon-1.0.4: Version bump.

I also removed older versions from before the new versioning scheme. This
includes the patches, which are not needed anymore.

Package-Manager: portage-2.2.1

7 files changed, 20 insertions, 155 deletions

diff --git a/sci-chemistry/freeon/ChangeLog b/sci-chemistry/freeon/ChangeLog
index ccc74ddae..1bb454221 100644
--- a/sci-chemistry/freeon/ChangeLog
+++ b/sci-chemistry/freeon/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*freeon-1.0.4 (27 Sep 2013)
+
+  27 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> +freeon-1.0.4.ebuild,
+  -files/freeon-2012.05.03-no_internal_hdf5.patch,
+  -files/freeon-9999-no_internal_hdf5.patch, -freeon-2012.05.03.ebuild,
+  -freeon-2013.09.12.ebuild, -freeon-2013.09.16.ebuild:
+  sci-chemistry/freeon-1.0.4: Version bump.  I also removed older versions from
+  before the new versioning scheme. This includes the patches, which are not
+  needed anymore.
+
   20 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> freeon-1.0.3.ebuild:
   sci-chemistry/freeon-1.0.3: Fixed broken ebuild.
 
diff --git a/sci-chemistry/freeon/Manifest b/sci-chemistry/freeon/Manifest
index c11115d32..9e0aab1de 100644
--- a/sci-chemistry/freeon/Manifest
+++ b/sci-chemistry/freeon/Manifest
@@ -1,7 +1,5 @@
 DIST freeon-1.0.1.tar.bz2 6081683 SHA256 91832ebf84bcaf7f3cfacee0bad45745b1f77839c8ef6d1fa9118abee73c0910 SHA512 4971bece35d32d680f2b2d57f366695d7f46a78e24a55840db71e492ccb7bf8ba0001e3c5fba9a6f8aea2bb5a231c02b9aac0722574e0fddc169089b2d84c43e WHIRLPOOL 3509bd6e8a76b8fb72b701abceda2ab44a7587aa5ddd41b3a7eec294f6989bf37b0045b268e8d1af355ad88e5445598c4c6bc31a5442e8f0b84779cb6782070b
 DIST freeon-1.0.2.tar.bz2 6081976 SHA256 d391f3648f0d795a836eddddf70ed4b43b91e94cb18823f03f8c999fad1491ed SHA512 e3169dd3a2c543d44c7a7e7c8b32af0055832a11239175581c38294904f43a0c2f3a567172841b977497325a9bdd9f1634b57606d4054bda106bdf632b31956f WHIRLPOOL 28bc95853a6cd2d99ac1550112fb2ec44920915ba183eb4f6c5cd3152388ceaad093f72628052a5eb4ceb4838d5ee5e111484ea3b594f7abeed4ef3b05c4160c
 DIST freeon-1.0.3.tar.bz2 6094060 SHA256 d17cf00e8b861a3c8d12d562d436fdf4cbf5e75e2e130af0b0b659c91a6b38a8 SHA512 b86979471b1f8c3d1af59f2562ec6f7b71ffe44d28276483db6ab2b9aef20de4c4edbdf9d4c7f6d0ad25e216e23a6ef0e1e5e4e5487d06c5d7268fc18b4da6b9 WHIRLPOOL 6a44726558ecb85e5bd21e8c201f1c01527ef1c06632b1f042a8f6d9539225914830688b7ac100c9322f0c543aa609881eb91c3a2258ac4d9cc929b6696f575b
+DIST freeon-1.0.4.tar.bz2 6080627 SHA256 26c7194b371a706450fdd9294d7a91308ab323a899b973481019458000e00520 SHA512 bfdfeb15851795432468debd1ab8cd102d167a1ee62c4bc8fa7aa302375422ce91b2515fc3c7fc3d6f1d56f45560d27158f87fd3c51a28107ce0742ef74436b5 WHIRLPOOL ba996b104951bf45705ef5a343c88a596ccdcb244ae064a5ee671922d426c9e79434b830f4e60c2985834cf13e4e2a89bf5559b31df3391a6ef44db18c855260
 DIST freeon-1.0.tar.bz2 6053346 SHA256 4cd7618402cea91eba90377546001e975b81b7e5ff533c36f650f9e2b5c1363c SHA512 4161f020beb5e55ed1d352c8c309c1ae6237d982a858cef61c1343f379d0142890fa45eb5de8cb8a93591cfec74485ed50b51d663038e4496febb9673a6bf646 WHIRLPOOL 6da7320e730359e4599a8312037b2e276e68835d0b05aedd913f1dbcb529dfb22c38cb76f0fd8c5eb96060a6c3bfe0b8bd70d5388a21fbcafab2f09b42b79d1c
-DIST freeon-2013-09-12.tar.bz2 6058108 SHA256 5a2b76f590110e960885369f158c828d3b1c4ae28308940b620ce78b59550dd1 SHA512 5946b6add17dc753a0a249ef640ec6eb6df5ce48d25fd3ed086da5a23b16d3c5d63fbaf26543ac27dedf7f2f1376525a10a1c6b41ad66bdddd82364951d4faa0 WHIRLPOOL 1bc739f6d6dbeaef486da282a4bf225553b108e5896674b252ee61a1dd66f44db72531f5c1e632cfe6fc54c655e312856f86b78dbb48a138941d0787b9ea441f
-DIST freeon-2013-09-16.tar.bz2 6057203 SHA256 0d213d419265030cee4eed8b43a35d39467ee1d1d1df9a7efc5ad4df15b9ca59 SHA512 cef0687aa5febbb1270719696c807b8438f18cb7c000b87f51b3562af644ed2604f57ecf9f43a92f16c2e337e8c487d0bcb13d9626ce638c5ccc313d5e681bf4 WHIRLPOOL d9d76712920152803a5aae59de70776e124f3e93d6102b50aa6f51ba06f6175946cbd24494945d60fbfa90c3580e5bb02fadf64a78cbe4c4c49abfa60c41e9d1
-DIST freeon-beta-2012-05-03.tar.bz2 15259173 SHA256 48a4657fd99aed25f90fd68e50e515b691b5c09d2b7c8305ddfb35bd1d2ba17c SHA512 30b5d5406df3eb0bd44166e78e16df2013e40b024f0350caefaf08d5c157308896d6ade66a7184f7c8e93c5db6c39c7f3a73340d48b06c5acb6272de525ce18a WHIRLPOOL 55aa72b03b414be40987fab416bf17c3cc4f9b2783501830ffc8c27b987c73fa471878024f04139266c69d9c76f16476737b2241f294ec9b32f828d831b0b7ac
diff --git a/sci-chemistry/freeon/files/freeon-2012.05.03-no_internal_hdf5.patch b/sci-chemistry/freeon/files/freeon-2012.05.03-no_internal_hdf5.patch
deleted file mode 100644
index ccbc8be26..000000000
--- a/sci-chemistry/freeon/files/freeon-2012.05.03-no_internal_hdf5.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naurp freeon-beta-2012-05-03.orig/Makefile.am freeon-beta-2012-05-03/Makefile.am
---- freeon-beta-2012-05-03.orig/Makefile.am	2012-05-04 03:53:04.000000000 +0000
-+++ freeon-beta-2012-05-03/Makefile.am	2013-05-29 14:42:07.791473885 +0000
-@@ -9,14 +9,9 @@
- INTERNAL_LAPACK_DIRS = lapack
- endif
- 
--if INTERNAL_HDF5
--INTERNAL_HDF5_DIRS = hdf5-1.8.3
--HDF5_INCLUDES = -I$(srcdir)/hdf5-1.8.3/src -I$(builddir)/hdf5-1.8.3/src
--endif
--
--SUBDIRS = $(INTERNAL_LAPACK_DIRS) $(INTERNAL_HDF5_DIRS) Modules FreeON SCFeqs OneE QCTC HiCu TwoE ONX PostProcessing BasisSets tests Validate
-+SUBDIRS = $(INTERNAL_LAPACK_DIRS) Modules FreeON SCFeqs OneE QCTC HiCu TwoE ONX PostProcessing BasisSets tests Validate
- 
--DIST_SUBDIRS = $(SUBDIRS) lapack hdf5-1.8.3
-+DIST_SUBDIRS = $(SUBDIRS) lapack
- 
- EXTRA_DIST = fix_localversion.sh localversion FreeON.bibtex $(top_builddir)/latex/refman.pdf
- 
---- freeon-beta-2012-05-03.orig/configure.ac	2012-05-04 04:38:47.000000000 +0000
-+++ freeon-beta-2012-05-03/configure.ac	2013-05-29 15:04:02.886109082 +0000
-@@ -855,7 +855,6 @@ AC_MSG_RESULT([${use_internal_hdf5}])
- 
- AM_CONDITIONAL(INTERNAL_HDF5, [test "${use_internal_hdf5}" = "yes"])
- 
--AC_CONFIG_SUBDIRS([hdf5-1.8.3])
- 
- if test "${use_internal_hdf5}" = "yes"; then
- 
diff --git a/sci-chemistry/freeon/files/freeon-9999-no_internal_hdf5.patch b/sci-chemistry/freeon/files/freeon-9999-no_internal_hdf5.patch
deleted file mode 100644
index 54255ff9f..000000000
--- a/sci-chemistry/freeon/files/freeon-9999-no_internal_hdf5.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naurp freeon-9999.orig/Modules/Makefile.am freeon-9999/Modules/Makefile.am
---- freeon-9999.orig/Modules/Makefile.am	2013-05-28 08:09:39.000000000 +0000
-+++ freeon-9999/Modules/Makefile.am	2013-05-29 14:32:24.879721200 +0000
-@@ -4,11 +4,6 @@
- INTERNAL_LAPACK_DIRS = lapack
- endif
- 
--if INTERNAL_HDF5
--INTERNAL_HDF5_DIRS = hdf5-1.8.3
--HDF5_INCLUDES = -I$(srcdir)/hdf5-1.8.3/src -I$(builddir)/hdf5-1.8.3/src
--endif
--
- DIST_SUBDIRS = lapack hdf5-1.8.3
- SUBDIRS      = $(INTERNAL_HDF5_DIRS) $(INTERNAL_LAPACK_DIRS)
- 
---- freeon-9999.orig/configure.ac	2013-05-29 15:34:16.000000000 +0000
-+++ freeon-9999/configure.ac	2013-05-29 15:36:22.000063299 +0000
-@@ -870,7 +870,6 @@ AM_CONDITIONAL(INTERNAL_HDF5, [test "${u
- if test "${use_internal_hdf5}" = "yes"; then
- 
-   AC_DEFINE(HAVE_INTERNAL_HDF5, 1, [Use the inernal hdf5 library.])
--  AC_CONFIG_SUBDIRS([Modules/hdf5-1.8.3])
- 
- else
- 
diff --git a/sci-chemistry/freeon/freeon-2013.09.16.ebuild b/sci-chemistry/freeon/freeon-1.0.4.ebuild
index df489b065..91f6cd97d 100644
--- a/sci-chemistry/freeon/freeon-2013.09.16.ebuild
+++ b/sci-chemistry/freeon/freeon-1.0.4.ebuild
@@ -5,21 +5,18 @@
 EAPI=5
 
 AUTOTOOLS_AUTORECONF=1
-
 FORTRAN_STANDARD=90
 
 inherit autotools-utils fortran-2
 
-REAL_PV="${PV//./-}"
-
-DESCRIPTION="an experimental suite of programs for linear scaling quantum chemistry."
+DESCRIPTION="An experimental suite of programs for linear scaling quantum chemistry."
 HOMEPAGE="http://www.freeon.org"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${PN}-${REAL_PV}.tar.bz2"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
+IUSE="standalone-BCSR static-libs"
 
 RDEPEND="
 	sci-libs/hdf5
@@ -28,4 +25,9 @@ RDEPEND="
 DEPEND="${DEPEND}
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${REAL_PV}"
+src_configure() {
+	local myeconfargs=(
+		$(use_enable standalone-BCSR)
+	)
+	autotools-utils_src_configure
+}
diff --git a/sci-chemistry/freeon/freeon-2012.05.03.ebuild b/sci-chemistry/freeon/freeon-2012.05.03.ebuild
deleted file mode 100644
index 5a9cc6a94..000000000
--- a/sci-chemistry/freeon/freeon-2012.05.03.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-FORTRAN_STANDARD=90
-
-inherit autotools-utils fortran-2
-
-REAL_PN="${PN}-beta"
-REAL_PV="${PV//./-}"
-
-DESCRIPTION="an experimental suite of programs for linear scaling quantum chemistry."
-HOMEPAGE="http://www.freeon.org"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${REAL_PN}-${REAL_PV}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	sci-libs/hdf5
-	virtual/blas
-	virtual/lapack"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${REAL_PN}-${REAL_PV}"
-
-src_prepare() {
-	# Prevent the obsolete internal hdf5 breaking autoconf
-	epatch "${FILESDIR}"/"${P}"-no_internal_hdf5.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-internal-hdf5
-		--disable-static-binaries
-		--disable-internal-lapack
-		--with-lapacklibs="$($(tc-getPKG_CONFIG) --libs lapack)"
-	)
-	#TODO mv BasisSets from /usr to /usr/share/freeon/
-	autotools-utils_src_configure
-}
diff --git a/sci-chemistry/freeon/freeon-2013.09.12.ebuild b/sci-chemistry/freeon/freeon-2013.09.12.ebuild
deleted file mode 100644
index d71af80f8..000000000
--- a/sci-chemistry/freeon/freeon-2013.09.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-FORTRAN_STANDARD=90
-
-inherit autotools-utils fortran-2
-
-REAL_PV="${PV//./-}"
-
-DESCRIPTION="an experimental suite of programs for linear scaling quantum chemistry."
-HOMEPAGE="http://www.freeon.org"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${PN}-${REAL_PV}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	sci-libs/hdf5
-	virtual/blas
-	virtual/lapack"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${REAL_PV}"
-
-src_configure() {
-	local myeconfargs=(
-		--with-lapacklibs="$($(tc-getPKG_CONFIG) --libs lapack)"
-	)
-	#TODO mv BasisSets from /usr to /usr/share/freeon/
-	autotools-utils_src_configure
-}