gentoo resync : 22.01.2021

4 files changed, 1 insertions, 232 deletions

diff --git a/sci-mathematics/minisat/Manifest b/sci-mathematics/minisat/Manifest
index f3619879e285..5308ae7fc652 100644
--- a/sci-mathematics/minisat/Manifest
+++ b/sci-mathematics/minisat/Manifest
@@ -1,8 +1,5 @@
-AUX minisat-2.2.0-header_fix.patch 3879 BLAKE2B 69ff3b53fe640a566f95b8171f4d366b8edb5ccc9caee3c0396d42054938870a41c82ffa44d68b489333ade542991a8e8f0067e1876dd656bc2a68eda8a38ecc SHA512 1a8a00e1a049dfab2c7041043ebc47eb09cac38c634c9fc54725fd262d24ef1f49dd445f2330122623d6464effd2755c36e7d16b3d5681a31ca1da0fcf9491b0
 AUX minisat-2.2.0_p20130925-nusmv.patch 17540 BLAKE2B 4dee908cb3b7f466ea2fa908667d37ebd3298069f6b09dafb1e5fd50a1e4f0bba318151efd38385b7e7571f0aa753dd34191fa3b08f64ad626f777c0df8528db SHA512 cfad7fb104f8630396f745144da7c052b1e6d5eb3ac9f3cc86a71c9d1353664ea9ece3cbd977f12a9d3a18efc245e33eb97bb949516c5620d3f6b76aa3c1586c
 DIST MiniSat.pdf 327416 BLAKE2B 77f77d763c9554680b4c5e1688801e8462102e8ddbcc3b53badccee17a98f935ef0e971a636abeb04021a2b3a3e9d6acfe4828b5dd20e6ef8733d71788cc31b0 SHA512 94e70c721740c0b7fd52621c7a5e43dd9207eed92e60a1c64ee63b541b9861d2580d14ba64c49c6c4f273ac028ded43bc944c71131e51693cdd7d1763af582f6
-DIST minisat-2.2.0.tar.gz 43879 BLAKE2B da4fd7694db0fe7b9a0979de8f2f3f005d7f112e2b2fe9e30b0dd6b5a5fb5bf6c7fd4ef8e8f2dd9fec34f8d5bfebb5be622810e07ca45da6989d2f84a011edc6 SHA512 cf79b05d43ebdc8fd8081899a1f853370de051cafe6e5b143eaff9827efc542b58062782a3ce2a3d1a03561a9ffd780c9cdc645bb50036eb61e80fa729136e64
 DIST minisat-2.2.0_p20130925.tar.gz 49544 BLAKE2B 8c6893fb6c604140609c36cc912c02a73c1f2726d7f399595c50d674aff69c57f9c4914da6d95c37a46fefc218dd4b0550645bd7058d46640d08103e2a4ec333 SHA512 37fc35cc4f3104d7f0e8ee9f7123fc34e175df578658266799d809d71d6cf081e811919f304a02f6cb9c3827d308e59408149d63d1d1e7c6d0b495350f93b3d9
-EBUILD minisat-2.2.0-r4.ebuild 1353 BLAKE2B c2f4e62d3ca9d6e6bd7caeeb851703d8b070192b00011cc200a1082f558c453b657387ed7578368f064becebf249d5ce075aa4d7eaacf41dd119c7dfd20ca9da SHA512 d763d57490d349f400f62c5516d99f14df57cf1aa03ec14d0d1035f5e0042ab17a3007637f336bec520295b388e960c0f67d5a6e81a13c90f984d13a43784f9c
 EBUILD minisat-2.2.0_p20130925-r1.ebuild 1612 BLAKE2B 4198df59696fa88b779ab8ea9954a1f53db39b8e9dfaf1c80897f5a772d9436731579ec2adf59d292bb0d9aa6baab446057333188838ed2a6548efd6ef5990fa SHA512 2bcbf4aeadb12e0998bdc97065c527dbeb29b155e352feaf4b871b89028a1784025c71e8e2f9ee27a135056feeb4fd557967c5d0e130b0b88ef7cfdc396aa438
-MISC metadata.xml 450 BLAKE2B 4e9b1174e1504d8af2b3c28c0bf809ec3e50624ca0e233962580a20470e59ae9592c055d3a99ed373d46a1553bcc3854198996be3ab621bb7285d236c7c677a4 SHA512 28a4189b3bf880bc6b799edc00b31762dfdff1b9a94a55d3939c3105661744a5aa4e89bf34c3faa4942d817d360b1fce318ca1a57e445dc287cfe53d1cb89a25
+MISC metadata.xml 334 BLAKE2B 6c8e245cf94929f31acefff32066440d934671086ef08654895633847c2a9fd9621b0a3d50e1bf8e492e56759c52a6f562436ccfde4f9eb5b5080670411b2355 SHA512 37b0bae5480c1fa58f5ceaa1cc7576899514923efa9fd7838faa9c4160a10cd19b640530313bc8d96936581c7842e27432e87ace63f4ae64d86d067f9a9e7dcc
diff --git a/sci-mathematics/minisat/files/minisat-2.2.0-header_fix.patch b/sci-mathematics/minisat/files/minisat-2.2.0-header_fix.patch
deleted file mode 100644
index 486c012fe2a4..000000000000
--- a/sci-mathematics/minisat/files/minisat-2.2.0-header_fix.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- ./utils/System.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./utils/System.h	2011-04-12 18:33:41.000000000 -0700
-@@ -25,7 +25,7 @@
- #include <fpu_control.h>
- #endif
- 
--#include "mtl/IntTypes.h"
-+#include <mtl/IntTypes.h>
- 
- //-------------------------------------------------------------------------------------------------
- 
---- ./utils/Options.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./utils/Options.h	2011-04-12 18:34:38.000000000 -0700
-@@ -25,9 +25,9 @@
- #include <math.h>
- #include <string.h>
- 
--#include "mtl/IntTypes.h"
--#include "mtl/Vec.h"
--#include "utils/ParseUtils.h"
-+#include <mtl/IntTypes.h>
-+#include <mtl/Vec.h>
-+#include "ParseUtils.h"
- 
- namespace Minisat {
- 
---- ./core/SolverTypes.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./core/SolverTypes.h	2011-04-12 18:27:58.000000000 -0700
-@@ -24,11 +24,11 @@
- 
- #include <assert.h>
- 
--#include "mtl/IntTypes.h"
--#include "mtl/Alg.h"
--#include "mtl/Vec.h"
--#include "mtl/Map.h"
--#include "mtl/Alloc.h"
-+#include <mtl/IntTypes.h>
-+#include <mtl/Alg.h>
-+#include <mtl/Vec.h>
-+#include <mtl/Map.h>
-+#include <mtl/Alloc.h>
- 
- namespace Minisat {
- 
---- ./core/Solver.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./core/Solver.h	2011-04-12 18:26:56.000000000 -0700
-@@ -21,11 +21,11 @@
- #ifndef Minisat_Solver_h
- #define Minisat_Solver_h
- 
--#include "mtl/Vec.h"
--#include "mtl/Heap.h"
--#include "mtl/Alg.h"
--#include "utils/Options.h"
--#include "core/SolverTypes.h"
-+#include <mtl/Vec.h>
-+#include <mtl/Heap.h>
-+#include <mtl/Alg.h>
-+#include <utils/Options.h>
-+#include "SolverTypes.h"
- 
- 
- namespace Minisat {
---- ./mtl/Vec.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./mtl/Vec.h	2011-04-12 18:30:50.000000000 -0700
-@@ -24,8 +24,8 @@
- #include <assert.h>
- #include <new>
- 
--#include "mtl/IntTypes.h"
--#include "mtl/XAlloc.h"
-+#include "IntTypes.h"
-+#include "XAlloc.h"
- 
- namespace Minisat {
- 
---- ./mtl/Sort.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./mtl/Sort.h	2011-04-12 18:31:05.000000000 -0700
-@@ -21,7 +21,7 @@
- #ifndef Minisat_Sort_h
- #define Minisat_Sort_h
- 
--#include "mtl/Vec.h"
-+#include "Vec.h"
- 
- //=================================================================================================
- // Some sorting algorithms for vec's
---- ./mtl/Alg.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./mtl/Alg.h	2011-04-12 18:32:26.000000000 -0700
-@@ -21,7 +21,7 @@
- #ifndef Minisat_Alg_h
- #define Minisat_Alg_h
- 
--#include "mtl/Vec.h"
-+#include "Vec.h"
- 
- namespace Minisat {
- 
---- ./mtl/Alloc.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./mtl/Alloc.h	2011-04-12 18:32:18.000000000 -0700
-@@ -21,8 +21,8 @@
- #ifndef Minisat_Alloc_h
- #define Minisat_Alloc_h
- 
--#include "mtl/XAlloc.h"
--#include "mtl/Vec.h"
-+#include "XAlloc.h"
-+#include "Vec.h"
- 
- namespace Minisat {
- 
---- ./mtl/Heap.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./mtl/Heap.h	2011-04-12 18:32:05.000000000 -0700
-@@ -21,7 +21,7 @@
- #ifndef Minisat_Heap_h
- #define Minisat_Heap_h
- 
--#include "mtl/Vec.h"
-+#include "Vec.h"
- 
- namespace Minisat {
- 
---- ./mtl/Map.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./mtl/Map.h	2011-04-12 18:31:36.000000000 -0700
-@@ -20,8 +20,8 @@
- #ifndef Minisat_Map_h
- #define Minisat_Map_h
- 
--#include "mtl/IntTypes.h"
--#include "mtl/Vec.h"
-+#include "IntTypes.h"
-+#include "Vec.h"
- 
- namespace Minisat {
- 
---- ./mtl/Queue.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./mtl/Queue.h	2011-04-12 18:31:18.000000000 -0700
-@@ -21,7 +21,7 @@
- #ifndef Minisat_Queue_h
- #define Minisat_Queue_h
- 
--#include "mtl/Vec.h"
-+#include "Vec.h"
- 
- namespace Minisat {
- 
---- ./simp/SimpSolver.h.orig	2010-07-10 09:07:36.000000000 -0700
-+++ ./simp/SimpSolver.h	2011-04-12 18:35:20.000000000 -0700
-@@ -21,8 +21,8 @@
- #ifndef Minisat_SimpSolver_h
- #define Minisat_SimpSolver_h
- 
--#include "mtl/Queue.h"
--#include "core/Solver.h"
-+#include <mtl/Queue.h>
-+#include <core/Solver.h>
- 
- 
- namespace Minisat {
diff --git a/sci-mathematics/minisat/metadata.xml b/sci-mathematics/minisat/metadata.xml
index 7c2c5eb3b390..42c0e14a3f43 100644
--- a/sci-mathematics/minisat/metadata.xml
+++ b/sci-mathematics/minisat/metadata.xml
@@ -5,9 +5,6 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
-	<use>
-		<flag name="extended-solver">Build extended version of SAT solver with additional features.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">niklasso/minisat</remote-id>
 	</upstream>
diff --git a/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild b/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild
deleted file mode 100644
index 2bbc706d240a..000000000000
--- a/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Small yet efficient SAT solver with reference paper"
-HOMEPAGE="http://minisat.se/Main.html"
-SRC_URI="http://minisat.se/downloads/${P}.tar.gz
-	doc? ( http://minisat.se/downloads/MiniSat.pdf )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="MIT"
-
-IUSE="debug doc extended-solver"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-DOCS=( README doc/ReleaseNotes-2.2.0.txt )
-PATCHES=( "${FILESDIR}"/${P}-header_fix.patch )
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	default
-	# Remove makefile silencing
-	sed -i -e 's:@\(\$\|ln\|rm\|for\):\1:g'	mtl/template.mk || die
-}
-
-src_configure() {
-	myconf=$(usex debug d r)
-	myext=$(usex debug debug release)
-	mydir=$(usex extended-solver simp core)
-
-	tc-export CXX
-}
-
-src_compile() {
-	export MROOT="$S"
-	emake -C $mydir $myconf
-	LIB="${PN}" emake -C $mydir lib$myconf
-}
-
-src_install() {
-	insinto /usr/include/${PN}2/mtl
-	doins mtl/*.h
-
-	insinto /usr/include/${PN}2/core
-	doins core/Solver*.h
-
-	insinto /usr/include/${PN}2/simp
-	doins simp/Simp*.h
-
-	insinto /usr/include/${PN}2/utils
-	doins utils/*.h
-
-	newbin ${mydir}/${PN}_${myext} ${PN}
-	newlib.a ${mydir}/lib${PN}_${myext}.a lib${PN}.a
-
-	use doc && DOCS+=( "${DISTDIR}"/MiniSat.pdf )
-	einstalldocs
-}