commit: 0fc1fba23467093037c65fcfb78ce4a567dda2ba
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Wed Apr 26 14:29:33 2023 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Wed Apr 26 14:29:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0fc1fba2
sci-mathematics/mccs: treeclean duplicate
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
profiles/updates/2Q-2023 | 1 +
sci-mathematics/mccs/Manifest | 2 -
sci-mathematics/mccs/files/mccs-1.1-fix-Wl.patch | 12 ----
sci-mathematics/mccs/files/mccs-1.1-glpk.patch | 20 ------
.../mccs/files/mccs-1.1-respect-AR.patch | 11 ----
.../mccs/files/mccs-1.1-respect-flags.patch | 12 ----
sci-mathematics/mccs/files/mccs-cbc | 3 -
sci-mathematics/mccs/files/mccs-lpsolve | 3 -
sci-mathematics/mccs/mccs-1.1.ebuild | 77 ----------------------
sci-mathematics/mccs/metadata.xml | 15 -----
10 files changed, 1 insertion(+), 155 deletions(-)
diff --git a/profiles/updates/2Q-2023 b/profiles/updates/2Q-2023
index e4a4a7eba..355f6209e 100644
--- a/profiles/updates/2Q-2023
+++ b/profiles/updates/2Q-2023
@@ -1,2 +1,3 @@
move gui-libs/power-profiles-daemon sys-power/power-profiles-daemon
move kde-apps/tokodon net-im/tokodon
+move sci-mathematics/mccs dev-ml/mccs
diff --git a/sci-mathematics/mccs/Manifest b/sci-mathematics/mccs/Manifest
deleted file mode 100644
index da9bbea2a..000000000
--- a/sci-mathematics/mccs/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mccs-1.1-srcs.tgz 65553 BLAKE2B
be7a1852bb6adaba6e8e02b1efbed44a1b60ef856facb55ca9a572a6ade77b8f24616feba9ac73a587f81a09c4ea19d1ec25281b49962bfbc2c35dc469cdeb29
SHA512
95cd0af58115202dc1bb8deaae28b25662e06cbbcb195c608a01083d4c602bcc1ede213dbc4e8ece7b9ab4afc9ef419fa57c284602dc0c908595e77710281de4
-DIST mccs_1.1-9.debian.tar.xz 7360 BLAKE2B
cbd52e4b30db898648348c0b6486c4338bb417b38ff7c982df246c985a017d4064b7816f44fc71df11a11bcc0260c20feb075384e9b8a0d0aa1d16dae7a65b99
SHA512
dcdb6296647748d0a484c48b5ef9fe1e663bf0a54e170e0418b9a7a791d2f7f5d6de20543e2c593721fc6dca2f43f7dc4f0c61b87295b8db96dd58b6bf75d700
diff --git a/sci-mathematics/mccs/files/mccs-1.1-fix-Wl.patch
b/sci-mathematics/mccs/files/mccs-1.1-fix-Wl.patch
deleted file mode 100644
index 05231563c..000000000
--- a/sci-mathematics/mccs/files/mccs-1.1-fix-Wl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff '--color=auto' -ru
/var/tmp/portage/sci-mathematics/mccs-1.1/work/mccs-1.1/makefile
mccs-1.1/makefile
---- /var/tmp/portage/sci-mathematics/mccs-1.1/work/mccs-1.1/makefile
2022-04-28 09:30:48.441298635 +0200
-+++ mccs-1.1/makefile 2022-04-28 09:36:58.810650226 +0200
-@@ -163,7 +163,7 @@
- ar rcs libccudf.a $(OBJDIR)/cudf.tab.o $(OBJDIR)/cudf.l.o
$(OBJDIR)/cudf_hash_table.o $(OBJDIR)/cudf_tools.o
-
- libccudf.so: $(OBJDIR)/cudf.tab.o $(OBJDIR)/cudf.l.o
$(OBJDIR)/cudf_hash_table.o $(OBJDIR)/cudf_tools.o
-- $(CCC) -shared -W1,-soname,libccudf.so -o libccudf.so \
-+ $(CCC) -shared -Wl,-soname,libccudf.so -o libccudf.so \
- $(OBJDIR)/cudf.tab.o $(OBJDIR)/cudf.l.o
$(OBJDIR)/cudf_hash_table.o $(OBJDIR)/cudf_tools.o
-
- $(OBJDIR)/cudf_hash_table.o: $(SRCLIB)/cudf_hash_table.c
$(SRCLIB)/cudf_hash_table.h
diff --git a/sci-mathematics/mccs/files/mccs-1.1-glpk.patch
b/sci-mathematics/mccs/files/mccs-1.1-glpk.patch
deleted file mode 100644
index 55fb1d2c9..000000000
--- a/sci-mathematics/mccs/files/mccs-1.1-glpk.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff '--color=auto' -ru
/var/tmp/portage/sci-mathematics/mccs-1.1/work/mccs-1.1/make.local
mccs-1.1/make.local
---- /var/tmp/portage/sci-mathematics/mccs-1.1/work/mccs-1.1/make.local
2022-04-28 09:26:16.480900398 +0200
-+++ mccs-1.1/make.local 2022-04-28 09:29:29.136724492 +0200
-@@ -11,13 +11,13 @@
- ifeq ($(USEGLPK),1)
-
- # Path to GLPK main dir
--GLPKDIR=$(PWD)/../glpk
-+GLPKDIR=/usr/lib
-
- # Path to the GPLK include files
--GLPKINC=$(GLPKDIR)/include/
-+GLPKINC=/usr/include
-
- # GPLK library path and options
--GLPKLD=-L${GLPKDIR}/lib -lglpk -Wl,-rpath,${GLPKDIR}/lib
-+GLPKLD=-L${GLPKDIR} -lglpk
-
- endif
-
diff --git a/sci-mathematics/mccs/files/mccs-1.1-respect-AR.patch
b/sci-mathematics/mccs/files/mccs-1.1-respect-AR.patch
deleted file mode 100644
index 5bd7f124c..000000000
--- a/sci-mathematics/mccs/files/mccs-1.1-respect-AR.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/makefile
-+++ b/makefile
-@@ -160,7 +160,7 @@
-
#----------------------------------------------------------------------------------
-
- libccudf.a: $(OBJDIR)/cudf.tab.o $(OBJDIR)/cudf.l.o
$(OBJDIR)/cudf_hash_table.o $(OBJDIR)/cudf_tools.o
-- ar rcs libccudf.a $(OBJDIR)/cudf.tab.o $(OBJDIR)/cudf.l.o
$(OBJDIR)/cudf_hash_table.o $(OBJDIR)/cudf_tools.o
-+ $(AR) rcs libccudf.a $(OBJDIR)/cudf.tab.o $(OBJDIR)/cudf.l.o
$(OBJDIR)/cudf_hash_table.o $(OBJDIR)/cudf_tools.o
-
- libccudf.so: $(OBJDIR)/cudf.tab.o $(OBJDIR)/cudf.l.o
$(OBJDIR)/cudf_hash_table.o $(OBJDIR)/cudf_tools.o
- $(CCC) -shared -Wl,-soname,libccudf.so -o libccudf.so \
diff --git a/sci-mathematics/mccs/files/mccs-1.1-respect-flags.patch
b/sci-mathematics/mccs/files/mccs-1.1-respect-flags.patch
deleted file mode 100644
index 11b5454ce..000000000
--- a/sci-mathematics/mccs/files/mccs-1.1-respect-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff '--color=auto' -ru
/var/tmp/portage/sci-mathematics/mccs-1.1/work/mccs-1.1/make.local
mccs-1.1/make.local
---- a/make.local 2022-04-28 08:46:08.604422769 +0200
-+++ b/make.local 2022-04-28 08:47:58.444566394 +0200
-@@ -107,7 +107,7 @@
-
- INC=-I$(OBJDIR) -I$(SRCDIR) -I$(SRCLIB)
- #CCCOPT=-g -Wall
--CCCOPT=-Wall -O6
-+CCCOPT=-Wall $(CXXFLAGS)
- CCC=$(CXX) $(CCCOPT) $(LDFLAGS)
-
-
diff --git a/sci-mathematics/mccs/files/mccs-cbc
b/sci-mathematics/mccs/files/mccs-cbc
deleted file mode 100644
index 86a919499..000000000
--- a/sci-mathematics/mccs/files/mccs-cbc
+++ /dev/null
@@ -1,3 +0,0 @@
-description: CUDF solver based on the Mixed Integer Linear Programming solver
Cbc
-exec: /usr/bin/mccs -i $in -o $out $pref
-cudf-version: 2.0
diff --git a/sci-mathematics/mccs/files/mccs-lpsolve
b/sci-mathematics/mccs/files/mccs-lpsolve
deleted file mode 100644
index ee3f2b0a2..000000000
--- a/sci-mathematics/mccs/files/mccs-lpsolve
+++ /dev/null
@@ -1,3 +0,0 @@
-description: CUDF solver based on the Mixed Integer Linear Programming solver
lp_solve
-exec: /usr/bin/mccs -i $in -o $out -lpsolve $pref
-cudf-version: 2.0
diff --git a/sci-mathematics/mccs/mccs-1.1.ebuild
b/sci-mathematics/mccs/mccs-1.1.ebuild
deleted file mode 100644
index 5cd59202b..000000000
--- a/sci-mathematics/mccs/mccs-1.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Multi Criteria CUDF Solver"
-HOMEPAGE="https://www.i3s.unice.fr/~cpjm/misc/mccs.html";
-SRC_URI="
- https://www.i3s.unice.fr/~cpjm/misc/${P}-srcs.tgz
-
http://deb.debian.org/debian/pool/main/m/mccs/${PN}_${PV}-9.debian.tar.xz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="glpk lpsolve"
-
-DEPEND="
- glpk? ( sci-mathematics/glpk )
- lpsolve? ( sci-mathematics/lpsolve )
-"
-RDEPEND="
- ${DEPEND}
- sci-libs/coinor-cbc
-"
-
-BDEPEND="
- dev-util/quilt
- sys-devel/bison
- app-alternatives/yacc
-"
-
-src_prepare() {
- export QUILT_PATCHES="${WORKDIR}/debian/patches"
- export QUILT_SERIES="${QUILT_PATCHES}/series"
- quilt push -a || die
- eapply "${FILESDIR}/${P}-respect-flags.patch"
- eapply "${FILESDIR}/${P}-glpk.patch"
- eapply "${FILESDIR}/${P}-fix-Wl.patch"
- eapply "${FILESDIR}/${P}-respect-AR.patch"
- eapply_user
-
- if use glpk; then
- sed \
- -e "s|#USEGLPK=1|USEGLPK=1|g" \
- -e "s|GLPKDIR=/usr/lib|GLPKDIR=/usr/$(get_libdir)|g" \
- -i make.local || die
- fi
- if use lpsolve; then
- sed -e "s|LPSOLVEDIR=/usr/lib|LPSOLVEDIR=/usr/$(get_libdir)|g"
-i make.local || die
- else
- sed -e "s|USELPSOLVE=1|#USELPSOLVE=1|g" -i make.local || die
- fi
-}
-
-src_compile() {
- tc-export AR CXX
- append-cxxflags "-std=c++14"
- MAKEOPTS="-j1" emake libccudf.so
- MAKEOPTS="-j1" emake mccs
-}
-
-src_install() {
- dodoc README CHANGES
- dodoc -r examples
-
- insinto /usr/share/cudf/solvers
- doins "${FILESDIR}/mccs-cbc"
- use lpsolve && doins "${FILESDIR}/mccs-lpsolve"
-
- dobin sciplp cbclp wbopb mccs
- exeinto "/usr/libexec/${PN}"
- doexe solve{paranoid,trendy}
- dolib.so libccudf.so
-}
diff --git a/sci-mathematics/mccs/metadata.xml
b/sci-mathematics/mccs/metadata.xml
deleted file mode 100644
index f4033fa95..000000000
--- a/sci-mathematics/mccs/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="person">
- <email>[email protected]</email>
- <name>Alessandro Barbieri</name>
- </maintainer>
- <use>
- <flag name="glpk">enable GLPK as solver</flag>
- <flag name="lpsolve">enable lpsolve as solver </flag>
- </use>
- <longdescription lang="en">
-mccs (which stands for Multi Criteria CUDF Solver) is a CUDF problem solver
developed at UNS during the European MANCOOSI project. mccs take as input a
CUDF problem and computes the best solution according to a set of criteria. It
relies on a Integer Programming solver or a Pseudo Boolean solver to achieve
its task. mccs can use a wide set of underlying solvers like Cplex, Gurobi,
Lpsolver, Glpk, CbC, SCIP or WBO.
- </longdescription>
-</pkgmetadata>
