gentoo resync : 17.12.2017

5 files changed, 3 insertions, 163 deletions

diff --git a/sci-physics/reduze/Manifest b/sci-physics/reduze/Manifest
index 0b35667ca0c2..8a7cd9c5f444 100644
--- a/sci-physics/reduze/Manifest
+++ b/sci-physics/reduze/Manifest
@@ -1,7 +1,3 @@
-AUX reduze-2.0.9-gcc6.patch 2077 BLAKE2B 73cdaa428f7e12f6eb3156a9f0a1d95fb3295a6b64a7842f450b0ffba45831c5f9cab9ad5fb10ee97456fd9dc1af997eb00b21102777bbeaec6357d0b190d476 SHA512 3636a1f22e129b7ceea50add15d52e96b96dfa28629b46e6bd1fd5e51f47a8f0d4f232e2b70858fa460cb0c9e842e7325df5a5d6bcabf6b17805a9c8a03d8cc4
-AUX reduze-2.1-gcc6.patch 850 BLAKE2B 37a4972742206099d8c3cce7ee582fc119afb300ac0438e7044898dc542eb548f43feae1057e7bd52dc09ccf9c96cf2f5a6f0c4308c34499cb6006bedca93487 SHA512 2df799698e9aab61c00f36cfa9b8e4806b9856180ba0621e4e4a30b485018a5fc9a1195cfe5579910b4f946119ec1a205b3e7778417bf205c1dd3ab6227f3813
-DIST reduze-2.0.9.tar.gz 568570 BLAKE2B 95eb5b89cb67cb91e6909b245499ac2f1cd944d0ff1c9d714ec37dfcdde0e6a19b1a4014cbb1f45dfc1bc9f502322c624ba2f2cd6b3e972067d4792ce4433cf6 SHA512 69818d7edaf3c69996d3f703401865f67722ec8d33b285642c71030f2852273b4b4028a00f0c639589cb801def739f93a05d504d4fb2edf228674962897d5f01
-DIST reduze-2.1.tar.gz 650423 BLAKE2B e1497ce54067bf82f98a07396becbac8f7e8b9fd53412219e6b4276b502b99367aafc60b2c616913cf5a6a8abf8f2bcc49b42e3163d840b4216923981430edae SHA512 e27f711639fe4b95c2aef4e73a7f6d9dd1574d1a62bc531d0f5177c505ffd353193548f29332f3b5320d4907bebd404ef082d3fea1dd392b83573d085b4a795a
-EBUILD reduze-2.0.9.ebuild 1422 BLAKE2B 9d6b1c2f6d587c279ddaf5bc02694d28ec68b1e3abacd1ec17884dfa34126f327e6bf889894d40aea9fe67fd9dfddfa26ccaf9c02861717ca910094ae822a10d SHA512 48c183662fb22751e0aa55a8be99a0d174fa67a5ac33f16e85075b982a584692e909a36d460c196c36195cce34dd4dc0f3a3e3cce392f03f21f36acbb280160d
-EBUILD reduze-2.1.ebuild 1429 BLAKE2B 260d11c4880858d71645091900100733a034f57656cdf4dd0437ac4fcaf63d0109d8bf6787f9e43e0dfc0d7cea9c20e05c07d489eb240bce98e2c27809ad531f SHA512 db7df515fe96c676a9ee84708c5d61ae1a7092430f15c4f8eb06c8af5ee4dc85c073f19a3997500e73934136d905e3d563bb83c85a307fecfe64483b24df934b
+DIST reduze-2.2.tar.gz 669858 BLAKE2B 52c48f5547055087dc2969fe5a7a42281519cf1d9a454a675ea54741f3d5912cd9b135816994241fa206585038d683ba5a3849308ff0403f1d3507ec9b77fe00 SHA512 ca4ed6f754fc75511b0916e8c2eea26a69e0e30c604a714af76995038a8e11dc3b129157bf1a170e639ea0fc39f9f5102bba4ad503874f044ac91855d9a95dab
+EBUILD reduze-2.2.ebuild 1388 BLAKE2B 951573debfeccf3127ff5b09458ae3dc382c0bcfddbd24b4819f6512f5d27f861f20a3553f7fa0654ae57083b05286af914c5d381412569421a2977e113e73c0 SHA512 1f2671b506d310ca59511886da84a7af5c6986ab0f344910d771435a75c8f7d9bec9febb4e247c5f2ca1c4792abac499aa1ca48477aa83624fafe079b1ebe0e7
 MISC metadata.xml 454 BLAKE2B 556608e358992ff4d66aff76659eac5567df8479000b0a0843d811adc416e2195444e067cff91db1a66bb3c75720bf05c2320680db200d570eccf09d8fd3e245 SHA512 2c4ba8ba43848a07834cb7f31a474f7c236356ef228e87db2870a4d19c3d2edf29189fab25f05efe70c004a3fdb7c2fd065687b104fe33d1fd20626c6aea4372
diff --git a/sci-physics/reduze/files/reduze-2.0.9-gcc6.patch b/sci-physics/reduze/files/reduze-2.0.9-gcc6.patch
deleted file mode 100644
index 9864163cdec9..000000000000
--- a/sci-physics/reduze/files/reduze-2.0.9-gcc6.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/reduze/amplitude.cpp
-+++ b/reduze/amplitude.cpp
-@@ -782,7 +782,7 @@
- 
- 	ex resultLeadingNc = result;
- 	for (exset::const_iterator it = found.begin(); it != found.end(); ++it) {
--		VERIFY(is_a<function>(*it) && ex_to<function>(*it).get_name() == "Color");
-+		VERIFY(is_a<GiNaC::function>(*it) && ex_to<GiNaC::function>(*it).get_name() == "Color");
- 		VERIFY(is_a<lst>(it->op(0)));
- 		ex res(1);
- 		for (size_t i = 0; i < it->op(0).nops(); ++i)
-@@ -823,7 +823,7 @@
- 	timer.restart();
- 	exmap m;
- 	for (exset::const_iterator it = found.begin(); it != found.end(); ++it) {
--		VERIFY(is_a<function>(*it) && ex_to<function>(*it).get_name() == "Lorentz");
-+		VERIFY(is_a<GiNaC::function>(*it) && ex_to<GiNaC::function>(*it).get_name() == "Lorentz");
- 		VERIFY(is_a<lst>(it->op(0)));
- 
- 		ex res(1);
---- a/reduze/files.cpp
-+++ b/reduze/files.cpp
-@@ -420,7 +420,7 @@
- 			get_filename_sectormappings(m.integralfamily()->name());
- 	ofstream file(file_name.c_str());
- 	if (!file)
--		ABORT("Can't write to " << file);
-+		ABORT("Can't write to " << file_name);
- 	os << YAML::BeginMap << YAML::Key << "sectormappings" << YAML::Value;
- 	os << m << YAML::EndMap;
- 	file << os.c_str();
-@@ -617,7 +617,7 @@
- 
- bool is_readable_file(const string& filename) {
- 	ifstream is(filename.c_str());
--	bool ok = is;
-+	bool ok = !is.fail();
- 	is.close();
- 	return ok;
- }
---- a/reduze/sectormappings.cpp
-+++ b/reduze/sectormappings.cpp
-@@ -757,13 +757,13 @@
- 	const Node& z_node = node["zero_sectors"];
- 	for (Iterator n = z_node.begin(); n != z_node.end(); ++n)
- 		for (Iterator s = n.second().begin(); s != n.second().end(); ++s)
--			m.zero_sectors_.insert(*s);
-+			m.zero_sectors_.insert((const int) *s);
- 
- 	if (node.FindValue("sectors_without_graph")) {
- 		const Node& ng_node = node["sectors_without_graph"];
- 		for (Iterator n = ng_node.begin(); n != ng_node.end(); ++n)
- 			for (Iterator s = n.second().begin(); s != n.second().end(); ++s)
--				m.sectors_without_graph_.insert(*s);
-+				m.sectors_without_graph_.insert((const int) *s);
- 	}
- 
- 	const Node& rel_node = node["sector_relations"];
diff --git a/sci-physics/reduze/files/reduze-2.1-gcc6.patch b/sci-physics/reduze/files/reduze-2.1-gcc6.patch
deleted file mode 100644
index 3b347ef413c3..000000000000
--- a/sci-physics/reduze/files/reduze-2.1-gcc6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/reduze/files.cpp
-+++ b/reduze/files.cpp
-@@ -723,7 +723,7 @@
- 	string file_name_tmp = file_name + ".tmp";
- 	ofstream file(file_name_tmp.c_str());
- 	if (!file)
--		ABORT("Can't write to " << file);
-+		ABORT("Can't write to " << file_name_tmp);
- 	Emitter os;
- 	os << BeginMap;
- 	os << Key << "crossings" << Value;
-@@ -752,7 +752,7 @@
- 	string file_name_tmp = file_name + ".tmp";
- 	ofstream file(file_name_tmp.c_str());
- 	if (!file)
--		ABORT("Can't write to " << file);
-+		ABORT("Can't write to " << file_name_tmp);
- 	os << YAML::BeginMap << YAML::Key << "sectormappings" << YAML::Value;
- 	os << m << YAML::EndMap;
- 	file << os.c_str();
-@@ -1036,7 +1036,7 @@
- 
- bool is_readable_file(const string& filename) {
- 	ifstream is(filename.c_str());
--	bool ok = is;
-+	bool ok = !is.fail();
- 	is.close();
- 	return ok && !is_readable_directory(filename);
- }
diff --git a/sci-physics/reduze/reduze-2.0.9.ebuild b/sci-physics/reduze/reduze-2.0.9.ebuild
deleted file mode 100644
index 3c0713e8e163..000000000000
--- a/sci-physics/reduze/reduze-2.0.9.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Program for reducing Feynman integrals"
-HOMEPAGE="http://reduze.hepforge.org/"
-SRC_URI="http://reduze.hepforge.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="berkdb doc mpi"
-
-RDEPEND=">=sci-mathematics/ginac-1.4.1
-	berkdb? ( sys-libs/db[cxx] )
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-
-	# gentoo doc directory
-	sed -i \
-		-e "s:share/reduze:share/doc/${PF}:g" \
-		CMakeLists.txt || die
-	use doc || sed -i -e '/share/d' CMakeLists.txt
-	# prefix fix
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		reduze/CMakeLists.txt  || die
-
-	# remove bundled yaml-cpp
-	# no: it does not build. is it patched?
-	# sed -i -e '/add_subdirectory ("yaml")/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_HASH_TABLE=ON
-		$(cmake-utils_use berkdb USE_DATABASE)
-		$(cmake-utils_use mpi USE_MPI)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all $(use doc && echo doc)
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}"
-	emake check
-	use mpi && emake check_mpi
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dohtml -r "${CMAKE_BUILD_DIR}"/doc/code/html/*
-}
diff --git a/sci-physics/reduze/reduze-2.1.ebuild b/sci-physics/reduze/reduze-2.2.ebuild
index ad6f52292b44..37b323c903b1 100644
--- a/sci-physics/reduze/reduze-2.1.ebuild
+++ b/sci-physics/reduze/reduze-2.2.ebuild
@@ -16,14 +16,12 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb doc mpi"
 
 RDEPEND=">=sci-mathematics/ginac-1.4.1
-	berkdb? ( sys-libs/db:=[cxx] )
+	berkdb? ( sys-libs/db:6.0[cxx] )
 	mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-
 src_prepare() {
 	cmake-utils_src_prepare
 	# gentoo doc directory