[gentoo-commits] repo/gentoo:master commit in: sci-libs/libcmatrix/files/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libcmatrix/files/

[David Seifert]

commit:     12bc6f3be130f759773d55b7d4e07eb30b35cea8
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jan 29 09:08:23 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 20:09:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12bc6f3b

sci-libs/libcmatrix: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3709

 .../libcmatrix/files/libcmatrix-3.2.1-atlas.patch  | 33 ---------
 .../libcmatrix/files/libcmatrix-3.2.1-shared.patch | 80 ----------------------
 2 files changed, 113 deletions(-)

diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-atlas.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-atlas.patch
deleted file mode 100644
index b10b41d..00000000
--- a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-atlas.patch
+++ /dev/null
@@ -1,33 +0,0 @@
- configure-libraries.ac |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/configure-libraries.ac b/configure-libraries.ac
-index a64e79c..afc75b8 100755
---- a/configure-libraries.ac
-+++ b/configure-libraries.ac
-@@ -33,6 +33,7 @@ AC_ARG_WITH(atlas,
- 	AS_HELP_STRING([--with-atlas],[use the ATLAS BLAS library (default-use if found)]),,with_atlas=check)
- if test x$with_atlas != xno; then
- 	FOUNDATLAS=yes
-+	PKG_CHECK_MODULES([ATLAS], [cblas])
- 	AC_CHECK_HEADERS(cblas.h,,FOUNDATLAS=no
- 		AC_MSG_WARN([ATLAS header files (cblas.h) not found 
- Is CPPFLAGS is defined to include relevant directory?]))
-@@ -40,7 +41,7 @@ Is CPPFLAGS is defined to include relevant directory?]))
- 		AC_MSG_WARN([ATLAS library (libatlas.a) not found
- Is LDFLAGS is defined to include relevant directory?]))
- 	if test x$FOUNDATLAS = xyes; then	
--		LIBS="-lcblas $LIBS"
-+		LIBS="$ATLAS_LIBS $LIBS"
- 		CXXFLAGS="$CXXFLAGS -DLCM_USE_EXTERNAL"
- 	else
- 		if test x$with_atlas = xyes; then
-@@ -49,6 +50,8 @@ Is LDFLAGS is defined to include relevant directory?]))
- 	fi	
- fi
- 
-+AC_SUBST(ATLAS_LIBS)
-+
- AC_ARG_WITH(acml,
- 	AS_HELP_STRING([--with-acml],[use the ACML BLAS library (default=no)]),,with_acml=no)
- if test x$with_acml = xyes; then

diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-shared.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-shared.patch
deleted file mode 100644
index 4e84302..00000000
--- a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-shared.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 1361371..1448e76 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -13,8 +13,8 @@ AR=@AR@
- 
- # You shouldn't need to alter anything below here
- 
--COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c
--ALLOPTFLAGS=$(OPTFLAGS) -DNDEBUG
-+COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -c
-+#ALLOPTFLAGS=$(OPTFLAGS) -DNDEBUG
- 
- LOCALOBJS= local/CrystalSystem.o local/CrystalGeneric.o local/MoleculeStructure.o
- COREOBJS= coredefs/complex.o coredefs/common.o coredefs/diagonal.o coredefs/diagonalise.o coredefs/power.o coredefs/invert.o coredefs/transforms.o coredefs/blocking.o coredefs/mixed.o coredefs/realtransforms.o coredefs/Chebyshev.o
-@@ -36,7 +36,7 @@ ALLTHROBJS=$(UNSAFEOBJS:.o=_r.o) $(ALLSAFEOBJS)
- 
- ROOT=..
- 
--first: lib/libcmatrix.a
-+first: lib/libcmatrix.so.3.2.1
- 
- #%.o: %.f
- #	@F77@ @FFLAGS@ -c -o $@ $<
-@@ -68,25 +68,25 @@ tempclean:
- #	-cd optim; @CLEAN@
- #	-cd local; @CLEAN@
- 
--lib/libcmatrix.a: $(ALLNORMOBJS)
--	$(AR) $@ $(ALLNORMOBJS)
--	chmod a+rx $@
--	$(RANLIB) $@
--
--lib/libcmatrix_p.a: $(ALLPROFOBJS)
--	$(AR)  $@ $(ALLPROFOBJS)
--	chmod a+rx $@
--	$(RANLIB) $@
--
--lib/libcmatrix-g.a: $(ALLGOBJS)
--	$(AR)  $@  $(ALLGOBJS)
--	chmod a+rx $@
--	$(RANLIB) $@
--
--lib/libcmatrix_r.a: $(ALLTHROBJS)
--	$(AR) @MTFLAGS@ $@ $(ALLTHROBJS)
--	chmod a+rx $@
--	$(RANLIB) $@
-+lib/libcmatrix.so.3.2.1: $(ALLNORMOBJS)
-+	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLNORMOBJS) @ATLAS_LIBS@
-+	ln -sf libcmatrix.so.3.2.1 lib/libcmatrix.so.3
-+	ln -sf libcmatrix.so.3.2.1 lib/libcmatrix.so
-+
-+lib/libcmatrix_p.so.3.2.1: $(ALLPROFOBJS)
-+	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLPROFOBJS) @ATLAS_LIBS@
-+	ln -sf libcmatrix_p.so.3.2.1 lib/libcmatrix_p.so.3
-+	ln -sf libcmatrix_p.so.3.2.1 lib/libcmatrix_p.so
-+
-+lib/libcmatrix-g.so.3.2.1: $(ALLGOBJS)
-+	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLGOBJS) @ATLAS_LIBS@
-+	ln -sf libcmatrix-g.so.3.2.1 lib/libcmatrix-g.so.3
-+	ln -sf libcmatrix-g.so.3.2.1 lib/libcmatrix-g.so
-+
-+lib/libcmatrix.so_r.3.2.1: $(ALLTHROBJS)
-+	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLTHROBJS) @ATLAS_LIBS@
-+	ln -sf libcmatrix_r.so.3.2.1 lib/libcmatrix_r.so.3
-+	ln -sf libcmatrix_r.so.3.2.1 lib/libcmatrix_r.so
- 
- @CONFIGLEAF@.tar.gz:
- 	cd $(ROOT) ; tar --exclude lib/* --exclude *.o --exclude=*~ --exclude=Makefile --exclude=include/config.h --exclude=config.status -cvf @CONFIGLEAF@.tar @CONFIGLEAF@
-diff --git a/configure.ac b/configure.ac
-index c0ae0e1..50dcd5a 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,5 +1,6 @@
- AC_INIT(configure.ac)
- AC_CONFIG_HEADER(include/config.h)
-+LT_INIT
- 
- DEFAR="ar ru"
- MAKEEXTRA=