gentoo resync : 03.03.2021

7 files changed, 2 insertions, 342 deletions

diff --git a/sci-libs/cifparse-obj/Manifest b/sci-libs/cifparse-obj/Manifest
index db1326592083..0843364823e6 100644
--- a/sci-libs/cifparse-obj/Manifest
+++ b/sci-libs/cifparse-obj/Manifest
@@ -1,11 +1,5 @@
-AUX cifparse-obj-7.025-gcc4.3.patch 3926 BLAKE2B 707f17d0e497be6ff547485352fb41f17e0a6dc4731e42c1949171059a7738dfe634f3cc7546be4cebb7400ecb6a9316b8b4eb0c0ec9ffa9df48502e9b4df111 SHA512 4ae441c3b576817e0302f69cceb1dd04f17bfff5226c888557732c49f4dac336d12014dc699e2703a248597eb04a118c2037a3defc18e0e3aed1fa73dd5ba892
-AUX cifparse-obj-7.025-gcc4.7.patch 2339 BLAKE2B 048f51e364d20c5f976991e3ed811e8cdbc044d255429bfe46a74d45a2547783d728a2abf0afad0bee2393407a14974a3d5446615eef95acac7dd02e6fa747c7 SHA512 f4ca881116a0bfb5688d441f0a29abd81fc173bb496b6640128054fc2307b88a5a02d4ebcc6c9203af091302a104474b0767f9373c334955a691a865853efd03
 AUX cifparse-obj-7.025-gcc5_6.patch 524 BLAKE2B 5cf4ce9f5c0615636b5701cd64613e01f0ac130ba4166fd12a8b92d7ffffc368fd5666ebdd8ac9cd983359a97ed4294e6f66e0984b3c826c56ecfa8b130cadef SHA512 f2469b15eb74192b61b78c165249e8b953c58d0f7478d38f1bebf8c2c884e95ad42ba18af23b1ea7e4915979b5d4f70c2637e083a14a2c40e20f83a09acf616e
-AUX cifparse-obj-7.025-makefile.patch 4405 BLAKE2B f94195c9256df856ac91df87eb033c2fbef3f5e3f6b558761d1cf09f8bb0db02432a3a2063950f9d7490a1d7894921ae3490379472296b4eabd66b72b8842c46 SHA512 8e74758f8ff8993a6e304a0cf80e59f60d0d162aee8f3a798552534f51055406d35c2bc1c6b91b6d9e41ff2d2666ea1d5580c71a66f1c3485c7e86deee169c69
-AUX cifparse-obj-7.025-strncasecmp-declaration.patch 477 BLAKE2B 51d1da67dfbac2c38b463dbd713d36f7dda93fab6b5bc13f29b62cbbd06de05453053906d95bbad20a9144db6f7fe1340ab306d1a10d32c8d477dcfaf3a0f3a4 SHA512 536e1f22c82cc88a0f3e24e5785b393ac7b602eb60f05da581afe7f79a7921e3f9e60463f9fec0190d3b85bc222ccc9782380f3c12dbd85172da7d2ccef5e5d0
 AUX cifparse-obj-7.105-makefile.patch 3790 BLAKE2B 11372dceab4e570e420bf639020769a1b1fb6f956a4ff75befcbb0016053d616cf271946ae0e6bb5667dffef863baa246f75fc34d36e80ddeb7e7c17a5befae7 SHA512 310f13e88f7dfb19ac2bdc003a2ab2f095583a90694d27232c1ab15a298bc88313e89590e062274da10d5eaba53f6bfcb3341d1d4f7d1c388520c75643364d61
-DIST cifparse-obj-v7.025-prod-src.tar.gz 928484 BLAKE2B 4f510f4826e235ecd87d81d51ceef84b717bb0c174f4a263cae44765bd0ddb35e2bb6edce1c5cadcf18c5e9892630f43cda2ca004f09d84dc44499d457eef5c1 SHA512 bf5d6b55592aca8678396eb9819f5bd7bff4d912410590dfb750c9ad85bdcdbd251425c45b67e2db027a8ce8d028b77c91edcc5333279ed1190f6049c01f5cc9
 DIST cifparse-obj-v7.105-prod-src.tar.gz 931151 BLAKE2B c362fc528e0c88b41ef8433c6d0235ae0bd4055c8c1704d2f1be8ba8aa27a7526b3d19172f2a4ffda79c323140a54dcb2b0a2eb78f30780473c9bcfb2ab6c6f9 SHA512 d626aa055bdd6762eda4b5b04121f37fff3bc09460b12cd6cb80566545d23e5c08a8ad54fa184076932d2cff38aa9d91fa659fbe9a70d4a07b8b1677c28549f4
-EBUILD cifparse-obj-7.025-r1.ebuild 1192 BLAKE2B 00bf1757aa801008cd85c3b736417e25dacf7ebdb5432811b74e49b410ed78bd65b5e566bec925dc6b88c28ca4b2c811a8fdd673213704eaedf64292c73e984c SHA512 f2e308f1a1c9c5943a0be7fe1a835e0ade61f236db1a7ddfe6ec50c18faeb417fd81a07e772d18630dead95b214dfd77f5b374c5bee5536bc05afd8b385c6544
-EBUILD cifparse-obj-7.105.ebuild 1126 BLAKE2B e978f7d66b56875b85e22e56ea01141067006f0c91bdbab7416a72daaeedb5e2730827ef53d07a2362d5a16a26c77e7ef0a25ec8701db72403d09dc3e465f659 SHA512 8bb79d8f7232fb56fd6b7bf920c079c0e47f849f1cb2071fb17f23d912850c1543d34430a301041011fa9fe4f37f543a46e7754014269e510b1c90e52c82127e
+EBUILD cifparse-obj-7.105.ebuild 1123 BLAKE2B f288c503e0d8aca32b17d762c77f121ef1108417e3dde60b17e5833f2348cc953d8f0e16f5dcb04c4d93e6b6245c76d14c6ad4b4999f80fb26c6a52793069f84 SHA512 7216b6dce971619f3cd346ae7ad88ea6f56f1e5b4d241d4bb7b7ab1fa119710ebd664bbe0598d9f6d1dd7f909f33e8f870c2051551c727661f3f2f4e3fcfcef3
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild b/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
deleted file mode 100644
index 44d186a798cc..000000000000
--- a/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-MY_P="${PN}-v${PV}-prod-src"
-
-DESCRIPTION="Provides an object-oriented application interface to information in mmCIF format"
-HOMEPAGE="http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/index.html"
-SRC_URI="http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/source/${MY_P}.tar.gz"
-
-LICENSE="PDB"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-gcc4.3.patch \
-		"${FILESDIR}"/${P}-gcc4.7.patch \
-		"${FILESDIR}"/${P}-gcc5_6.patch \
-		"${FILESDIR}"/${PN}-7.025-strncasecmp-declaration.patch
-
-	sed \
-		-e "s:^\(CC=\).*:\1$(tc-getCC):g" \
-		-e "s:^\(CCC=\).*:\1$(tc-getCXX):g" \
-		-e "s:^\(F77=\).*:\1${FORTRANC}:g" \
-		-e "s:^\(F77_LINKER=\).*:\1${FORTRANC}:g" \
-		-e "s:-static::g" \
-		-i "${S}"/etc/make.* || die "Failed to fix makefile"
-}
-
-src_compile() {
-	# parallel make fails
-	emake -j1
-}
-
-src_install() {
-	dolib.a lib/*
-	insinto /usr/include/${PN}
-	doins include/*
-}
diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
index 45524a9bd5cb..c575c3c692e2 100644
--- a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
+++ b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/source/${MY_P}.tar.gz"
 
 LICENSE="PDB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.3.patch b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.3.patch
deleted file mode 100644
index 1715f493a6e0..000000000000
--- a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.3.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -Naur cifparse-obj-v7.025-prod-src/cif-file-v1.0/src/CifFile.C cifparse-obj-v7.025-prod-src.new/cif-file-v1.0/src/CifFile.C
---- cifparse-obj-v7.025-prod-src/cif-file-v1.0/src/CifFile.C	2008-02-06 07:17:50.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/cif-file-v1.0/src/CifFile.C	2008-09-03 09:36:41.000000000 -0400
-@@ -153,6 +153,7 @@
- // VLAD - Carefully examine all methods that accept with, for cases where
- // with is 0. This may happen if the value is empty !!
- 
-+#include <algorithm>
- #include "GenString.h"
- #include "CifString.h"
- #include "regex.h"
-diff -Naur cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest3.C cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest3.C
---- cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest3.C	2008-02-06 07:17:51.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest3.C	2008-09-03 09:40:12.000000000 -0400
-@@ -1,4 +1,5 @@
- #include <iostream>
-+#include <cstdlib>
- #include "GenString.h"
- #include "CifFile.h"
- 
-diff -Naur cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest7.C cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest7.C
---- cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest7.C	2008-02-06 07:17:51.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest7.C	2008-09-03 09:40:42.000000000 -0400
-@@ -3,6 +3,7 @@
- */
- #include "CifFile.h"
- #include <iostream>
-+#include <cstdlib>
- 
- void FillTestTable(ISTable *s);
- void TwoCifFileObj();
-diff -Naur cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest8.C cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest8.C
---- cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest8.C	2008-02-06 07:17:51.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest8.C	2008-09-03 09:41:06.000000000 -0400
-@@ -1,6 +1,7 @@
- /* Test for reading binary files of two different versions*/
- #include "CifFile.h"
- #include <iostream>
-+#include <cstdlib>
- 
- 
- #define FALSE 0
-diff -Naur cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/SdbReader.C cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/SdbReader.C
---- cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/SdbReader.C	2008-02-06 07:17:51.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/SdbReader.C	2008-09-03 09:41:50.000000000 -0400
-@@ -1,4 +1,5 @@
- #include <iostream>
-+#include <cstdlib>
- #include "CifFile.h"
- 
- 
-diff -Naur cifparse-obj-v7.025-prod-src/common-v4.5/src/GenString.C cifparse-obj-v7.025-prod-src.new/common-v4.5/src/GenString.C
---- cifparse-obj-v7.025-prod-src/common-v4.5/src/GenString.C	2008-02-06 07:17:49.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/common-v4.5/src/GenString.C	2008-09-03 09:32:17.000000000 -0400
-@@ -138,7 +138,7 @@
- POSSIBILITY THEREOF. 
- */
- 
--
-+#include <cstring>
- // Needed, since some platforms do not define std:: elsewhere
- #include <ctype.h>
- 
-diff -Naur cifparse-obj-v7.025-prod-src/tables-v8.0/src/ISTable.C cifparse-obj-v7.025-prod-src.new/tables-v8.0/src/ISTable.C
---- cifparse-obj-v7.025-prod-src/tables-v8.0/src/ISTable.C	2008-02-06 07:17:50.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/tables-v8.0/src/ISTable.C	2008-09-03 09:35:57.000000000 -0400
-@@ -150,6 +150,8 @@
- #include <sstream>
- #include <iostream>
- #include <iomanip>
-+#include <algorithm>
-+#include <climits>
- 
- #include "Exceptions.h"
- #include "GenString.h"
-diff -Naur cifparse-obj-v7.025-prod-src/tables-v8.0/src/ITTable.C cifparse-obj-v7.025-prod-src.new/tables-v8.0/src/ITTable.C
---- cifparse-obj-v7.025-prod-src/tables-v8.0/src/ITTable.C	2008-02-06 07:17:50.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/tables-v8.0/src/ITTable.C	2008-09-03 09:35:29.000000000 -0400
-@@ -150,6 +150,8 @@
- #include <sstream>
- #include <iostream>
- #include <iomanip>
-+#include <algorithm>
-+#include <climits>
- 
- #include "Exceptions.h"
- #include "GenString.h"
diff --git a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.7.patch b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.7.patch
deleted file mode 100644
index b828ae618caa..000000000000
--- a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.7.patch
+++ /dev/null
@@ -1,64 +0,0 @@
- common-v4.5/src/mapped_ptr_vector.C |   14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/common-v4.5/src/mapped_ptr_vector.C b/common-v4.5/src/mapped_ptr_vector.C
-index 0ffff35..993d0b9 100644
---- a/common-v4.5/src/mapped_ptr_vector.C
-+++ b/common-v4.5/src/mapped_ptr_vector.C
-@@ -256,12 +256,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(T* inP,
-     _vector.push_back(inP);
- 
-     typename tIndex::value_type valuePair(inP->GetName(),
--      make_pair(_vector.size() - 1, fileIndex));
-+      std::make_pair(_vector.size() - 1, fileIndex));
- 
-     _index.insert(valuePair);
- 
-     _currentName = inP->GetName();
--    _currentIndices = make_pair(_vector.size() - 1, fileIndex);
-+    _currentIndices = std::make_pair(_vector.size() - 1, fileIndex);
- 
- }
- 
-@@ -274,12 +274,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(const string& name,
-     _vector.push_back(NULL);
- 
-     typename tIndex::value_type valuePair(name,
--      make_pair(_vector.size() - 1, fileIndex));
-+      std::make_pair(_vector.size() - 1, fileIndex));
- 
-     _index.insert(valuePair);
- 
-     _currentName = name;
--    _currentIndices = make_pair(_vector.size() - 1, fileIndex);
-+    _currentIndices = std::make_pair(_vector.size() - 1, fileIndex);
- }
- 
- 
-@@ -447,7 +447,7 @@ void mapped_ptr_vector<T, StringCompareT>::erase(const string& name)
-     if (is_equal(_currentName, name, keyComp))
-     {
-         _currentName.clear();
--        _currentIndices = make_pair(_vector.size(), (unsigned int)0);
-+        _currentIndices = std::make_pair(_vector.size(), (unsigned int)0);
-     }
- 
- }
-@@ -532,7 +532,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic
-     if (_vector.empty())
-     {
-         // Empty container. Return invalid index.
--        return(make_pair(_vector.size(), (unsigned int)0));
-+        return(std::make_pair(_vector.size(), (unsigned int)0));
-     }
- 
-     typename tIndex::key_compare keyComp = _index.key_comp();
-@@ -556,7 +556,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic
-         else
-         {
-             // Not found. Return invalid index.
--            return(make_pair(_vector.size(), (unsigned int)0));
-+            return(std::make_pair(_vector.size(), (unsigned int)0));
-         } 
-     }
-     
diff --git a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-makefile.patch b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-makefile.patch
deleted file mode 100644
index 9e9a61788ddf..000000000000
--- a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-makefile.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -Naur cifparse-obj-v7.025-prod-src/etc/make.platform.gnu3 cifparse-obj-v7.025-prod-src.new/etc/make.platform.gnu3
---- cifparse-obj-v7.025-prod-src/etc/make.platform.gnu3	2008-02-06 07:17:49.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/etc/make.platform.gnu3	2008-09-03 09:18:55.000000000 -0400
-@@ -107,8 +107,8 @@
- C_WARNINGS=$(WARNINGS)
- 
- # C compiler flags
--CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
--CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-+CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
-+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-                $(INCLUDES) 
- 
- ## C++ compiler
-@@ -128,13 +128,13 @@
- EXT=C
- 
- # C++ compiler flags
--C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-+C++FLAGS=$(CXX_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-         $(INCLUDES)
--C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-+C++FLAGS_NONANSI=$(CXX_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-                  $(DEFINES) $(INCLUDES)
- # C++FLAGS_RELAXED should be set to avoid warnings reported by third party
- # source code that is not maintained by PDB
--C++FLAGS_RELAXED=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) $(DEFINES) \
-+C++FLAGS_RELAXED=$(CXX_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) $(DEFINES) \
-         $(INCLUDES)
- 
- ## Fortran compiler
-@@ -144,7 +144,7 @@
- F77=f77
- 
- # Fortran compiler flags
--FFLAGS=-O -u
-+FFLAGS=$(F_OPT)
- 
- # Additional Fortran libraries
- F77LIBS=
-@@ -157,7 +157,7 @@
- STATIC_LINKING=-static
- 
- # Linker flags
--LDFLAGS=$(ABI) -w $(STATIC_LINKING)
-+LDFLAGS=$(ABI) -w $(STATIC_LINKING) $(LD_OPT)
- LDFLAGS_NO_STATIC=$(ABI) -w
- 
- # Fortran linker
-diff -Naur cifparse-obj-v7.025-prod-src/etc/make.platform.gnu4 cifparse-obj-v7.025-prod-src.new/etc/make.platform.gnu4
---- cifparse-obj-v7.025-prod-src/etc/make.platform.gnu4	2008-02-06 07:17:49.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/etc/make.platform.gnu4	2008-09-03 09:20:16.000000000 -0400
-@@ -107,12 +107,12 @@
- C_WARNINGS=$(WARNINGS)
- 
- # C compiler flags
--CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
--CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-+CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
-+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-                $(INCLUDES) 
- 
- ## C++ compiler
--## This part defines C++ compiler information
-+
- 
- # C++ compiler executable
- CCC=g++
-@@ -128,13 +128,13 @@
- EXT=C
- 
- # C++ compiler flags
--C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-+C++FLAGS=$(CXX_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-         $(INCLUDES)
--C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-+C++FLAGS_NONANSI=$(CXX_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-                  $(DEFINES) $(INCLUDES)
- # C++FLAGS_RELAXED should be set to avoid warnings reported by third party
- # source code that is not maintained by PDB
--C++FLAGS_RELAXED=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) $(DEFINES) \
-+C++FLAGS_RELAXED=$(CXX_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) $(DEFINES) \
-         $(INCLUDES)
- 
- ## Fortran compiler
-@@ -144,7 +144,7 @@
- F77=f77
- 
- # Fortran compiler flags
--FFLAGS=-O -u
-+FFLAGS=$(F_OPT)
- 
- # Additional Fortran libraries
- F77LIBS=
-@@ -157,7 +157,7 @@
- STATIC_LINKING=-static
- 
- # Linker flags
--LDFLAGS=$(ABI) -w $(STATIC_LINKING)
-+LDFLAGS=$(ABI) -w $(STATIC_LINKING) $(LD_OPT)
- LDFLAGS_NO_STATIC=$(ABI) -w
- 
- # Fortran linker
-diff -Naur cifparse-obj-v7.025-prod-src/Makefile cifparse-obj-v7.025-prod-src.new/Makefile
---- cifparse-obj-v7.025-prod-src/Makefile	2008-02-06 07:17:48.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/Makefile	2008-09-03 09:19:12.000000000 -0400
-@@ -62,7 +62,7 @@
- 		echo "------------------------------------------------------------"; \
- 		echo "**** Making $$libdir ****"; \
- 		echo "------------------------------------------------------------"; \
--		(cd $$libdir && $(MAKE) -f $(MAKEFILE) "OPT=-O" install) || exit 1; \
-+		(cd $$libdir && $(MAKE) -f $(MAKEFILE) C_OPT="${CFLAGS}" CXX_OPT="${CXXFLAGS}" F_OPT="${FFLAGS}" LD_OPT="${LDFLAGS}" install) || exit 1; \
- 	done
- 
- debug:
diff --git a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-strncasecmp-declaration.patch b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-strncasecmp-declaration.patch
deleted file mode 100644
index 9222ff27699e..000000000000
--- a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-strncasecmp-declaration.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Remove incorrect prototypes of the 'strcasecmp' and 'strncasecmp' functions.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=594054
-
---- a/misclib-v2.2/include/ndb_misclib.h
-+++ b/misclib-v2.2/include/ndb_misclib.h
-@@ -167,10 +167,6 @@
- #define NDB_MSG_BUFFER_LEN    200000
- 
- 
--#if !defined(HAVE_STRCASECMP)
--int strcasecmp (const char *s1, const char *s2);
--int strncasecmp (const char *s1, const char *s2, unsigned int n);
--#endif 
- /*
-  *   ndb_misclib.c prototypes
-  */