* [gentoo-commits] proj/sci:master commit in: sci-chemistry/freeon/, sci-chemistry/freeon/files/
@ 2013-06-17 12:34 Honza Macháček
0 siblings, 0 replies; 2+ messages in thread
From: Honza Macháček @ 2013-06-17 12:34 UTC (permalink / raw
To: gentoo-commits
commit: 0f38840ff131e36d68f55f652a5c3f829258288a
Author: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
AuthorDate: Mon Jun 17 12:33:56 2013 +0000
Commit: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
CommitDate: Mon Jun 17 12:33:56 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0f38840f
Mangling of the sources of sci-chemistry/freeon reduced, both for 2012.05.03, and for 9999.
---
sci-chemistry/freeon/ChangeLog | 9 +++++
...ch => freeon-2012.05.03-no_internal_hdf5.patch} | 32 +++------------
.../files/freeon-9999-no_internal_hdf5.patch | 25 ++++++++++++
.../files/freeon-9999-no_internal_libs.patch | 47 ----------------------
4 files changed, 40 insertions(+), 73 deletions(-)
diff --git a/sci-chemistry/freeon/ChangeLog b/sci-chemistry/freeon/ChangeLog
index 4e266de..0067c48 100644
--- a/sci-chemistry/freeon/ChangeLog
+++ b/sci-chemistry/freeon/ChangeLog
@@ -2,6 +2,15 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 17 Jun 2013; Honza Macháček <Hloupy.Honza@centrum.cz>
+ freeon-2012.05.03.ebuild, freeon-9999.ebuild,
+ +files/freeon-2012.05.03-no_internal_hdf5.patch,
+ -files/freeon-2012.05.03-no_internal_libs.patch,
+ +files/freeon-9999-no_internal_hdf5.patch,
+ -files/freeon-9999-no_internal_libs.patch:
+ Intrusion reduced. Only the descent to obsolete autoconf files in the
+ directory of the internal old hdf5 copy patched off.
+
*freeon-2012.05.03 (30 May 2013)
30 May 2013; Honza Macháček <Hloupy.Honza@centrum.cz>
diff --git a/sci-chemistry/freeon/files/freeon-2012.05.03-no_internal_libs.patch b/sci-chemistry/freeon/files/freeon-2012.05.03-no_internal_hdf5.patch
similarity index 60%
rename from sci-chemistry/freeon/files/freeon-2012.05.03-no_internal_libs.patch
rename to sci-chemistry/freeon/files/freeon-2012.05.03-no_internal_hdf5.patch
index e37622b..ccbc8be 100644
--- a/sci-chemistry/freeon/files/freeon-2012.05.03-no_internal_libs.patch
+++ b/sci-chemistry/freeon/files/freeon-2012.05.03-no_internal_hdf5.patch
@@ -1,14 +1,9 @@
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
-@@ -5,18 +5,9 @@ ACLOCAL_AMFLAGS = -I m4
- CPP = @CPP@
- AM_CPPFLAGS = @AM_CPPFLAGS@
-
--if INTERNAL_LAPACK
--INTERNAL_LAPACK_DIRS = lapack
--endif
-+SUBDIRS = Modules FreeON SCFeqs OneE QCTC HiCu TwoE ONX PostProcessing BasisSets tests Validate
+@@ -9,14 +9,9 @@
+ INTERNAL_LAPACK_DIRS = lapack
+ endif
-if INTERNAL_HDF5
-INTERNAL_HDF5_DIRS = hdf5-1.8.3
@@ -16,9 +11,10 @@ diff -Naurp freeon-beta-2012-05-03.orig/Makefile.am freeon-beta-2012-05-03/Makef
-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)
++DIST_SUBDIRS = $(SUBDIRS) lapack
EXTRA_DIST = fix_localversion.sh localversion FreeON.bibtex $(top_builddir)/latex/refman.pdf
@@ -32,19 +28,3 @@ diff -Naurp freeon-beta-2012-05-03.orig/Makefile.am freeon-beta-2012-05-03/Makef
if test "${use_internal_hdf5}" = "yes"; then
-@@ -1027,15 +1026,6 @@ Makefile
- documentation/main_page.h
- FreeON/Makefile
- Modules/Makefile
--lapack/Makefile
--lapack/install/Makefile
--lapack/blas/Makefile
--lapack/lapack/Makefile
--lapack/blas_testing/Makefile
--lapack/lapack_testing/Makefile
--lapack/lapack_testing/lin/Makefile
--lapack/lapack_testing/eig/Makefile
--lapack/lapack_testing/matgen/Makefile
- SCFeqs/Makefile
- OneE/Makefile
- QCTC/Makefile
diff --git a/sci-chemistry/freeon/files/freeon-9999-no_internal_hdf5.patch b/sci-chemistry/freeon/files/freeon-9999-no_internal_hdf5.patch
new file mode 100644
index 0000000..54255ff
--- /dev/null
+++ b/sci-chemistry/freeon/files/freeon-9999-no_internal_hdf5.patch
@@ -0,0 +1,25 @@
+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/files/freeon-9999-no_internal_libs.patch b/sci-chemistry/freeon/files/freeon-9999-no_internal_libs.patch
deleted file mode 100644
index a908aa7..0000000
--- a/sci-chemistry/freeon/files/freeon-9999-no_internal_libs.patch
+++ /dev/null
@@ -1,47 +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
-@@ -1,17 +1,5 @@
- include $(top_srcdir)/make.inc
-
--if INTERNAL_LAPACK
--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)
--
- if USE_DYNAMIC_LINKING
- lib_LTLIBRARIES = libfreeonmodules.la
- else
---- 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
-
-@@ -1069,15 +1068,6 @@ config_localversion.h
- Makefile
- FreeON/Makefile
- Modules/Makefile
--Modules/lapack/Makefile
--Modules/lapack/install/Makefile
--Modules/lapack/blas/Makefile
--Modules/lapack/lapack/Makefile
--Modules/lapack/blas_testing/Makefile
--Modules/lapack/lapack_testing/Makefile
--Modules/lapack/lapack_testing/lin/Makefile
--Modules/lapack/lapack_testing/eig/Makefile
--Modules/lapack/lapack_testing/matgen/Makefile
- SCFeqs/Makefile
- OneE/Makefile
- QCTC/Makefile
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/freeon/, sci-chemistry/freeon/files/
@ 2013-09-27 15:05 Nicolas Bock
0 siblings, 0 replies; 2+ messages in thread
From: Nicolas Bock @ 2013-09-27 15:05 UTC (permalink / raw
To: gentoo-commits
commit: 55ef96bedc334845482aa1c5da6ec8d2f132c7c8
Author: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Fri Sep 27 15:04:47 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Fri Sep 27 15:04:47 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=55ef96be
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
---
sci-chemistry/freeon/ChangeLog | 10 +++++
.../files/freeon-2012.05.03-no_internal_hdf5.patch | 30 -------------
.../files/freeon-9999-no_internal_hdf5.patch | 25 -----------
...reeon-2013.09.16.ebuild => freeon-1.0.4.ebuild} | 16 ++++---
sci-chemistry/freeon/freeon-2012.05.03.ebuild | 50 ----------------------
sci-chemistry/freeon/freeon-2013.09.12.ebuild | 40 -----------------
6 files changed, 19 insertions(+), 152 deletions(-)
diff --git a/sci-chemistry/freeon/ChangeLog b/sci-chemistry/freeon/ChangeLog
index ccc74dd..1bb4542 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/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 ccbc8be..0000000
--- 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 54255ff..0000000
--- 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
similarity index 68%
rename from sci-chemistry/freeon/freeon-2013.09.16.ebuild
rename to sci-chemistry/freeon/freeon-1.0.4.ebuild
index df489b0..91f6cd9 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 5a9cc6a..0000000
--- 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 d71af80..0000000
--- 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-27 15:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-27 15:05 [gentoo-commits] proj/sci:master commit in: sci-chemistry/freeon/, sci-chemistry/freeon/files/ Nicolas Bock
-- strict thread matches above, loose matches on Subject: below --
2013-06-17 12:34 Honza Macháček
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox