Mangling of the sources of sci-chemistry/freeon reduced, both for 2012.05.03, and for 9999.

4 files changed, 40 insertions, 73 deletions

diff --git a/sci-chemistry/freeon/ChangeLog b/sci-chemistry/freeon/ChangeLog
index 4e266dee5..0067c486a 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
index e37622b0e..ccbc8be26 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 000000000..54255ff9f
--- /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 a908aa7d9..000000000
--- 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