public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/minisat/
@ 2022-01-24  9:32 David Seifert
  0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2022-01-24  9:32 UTC (permalink / raw
  To: gentoo-commits

commit:     0302bfc9017653c5e69e067e0d54507f6a46c5ab
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 09:32:16 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 09:32:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0302bfc9

sci-mathematics/minisat: reformat metadata.xml

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-mathematics/minisat/metadata.xml | 47 ++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/sci-mathematics/minisat/metadata.xml b/sci-mathematics/minisat/metadata.xml
index 812aa0c09202..68f253bc3c2d 100644
--- a/sci-mathematics/minisat/metadata.xml
+++ b/sci-mathematics/minisat/metadata.xml
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription>
-    MiniSat is a minimalistic, open-source SAT solver, developed to help
-    researchers and developers alike to get started on SAT. It is released
-    under the MIT licence, and is currently used in a number of projects.
-    MiniSat is small and well-documented, and possibly also well-designed,
-    making it an ideal starting point for adapting SAT based techniques to
-    domain specific problems.
-    Winning all the industrial categories of the SAT 2005 competition, MiniSat
-    is a good starting point both for future research in SAT, and for
-    applications using SAT.
-    MiniSat supports incremental SAT and has mechanisms for adding non-clausal
-    constraints. By virtue of being easy to modify, it is a good choice for
-    integrating as a backend to another tool, such as a model checker or a more
-    generic constraint solver.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">niklasso/minisat</remote-id>
-    <remote-id type="github">stp/minisat</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>
+		MiniSat is a minimalistic, open-source SAT solver, developed to help
+		researchers and developers alike to get started on SAT. It is released
+		under the MIT licence, and is currently used in a number of projects.
+		MiniSat is small and well-documented, and possibly also well-designed,
+		making it an ideal starting point for adapting SAT based techniques to
+		domain specific problems.
+		Winning all the industrial categories of the SAT 2005 competition, MiniSat
+		is a good starting point both for future research in SAT, and for
+		applications using SAT.
+		MiniSat supports incremental SAT and has mechanisms for adding non-clausal
+		constraints. By virtue of being easy to modify, it is a good choice for
+		integrating as a backend to another tool, such as a model checker or a more
+		generic constraint solver.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">niklasso/minisat</remote-id>
+		<remote-id type="github">stp/minisat</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/minisat/
@ 2021-12-26 15:41 Maciej Barć
  0 siblings, 0 replies; 6+ messages in thread
From: Maciej Barć @ 2021-12-26 15:41 UTC (permalink / raw
  To: gentoo-commits

commit:     c544a910fcb78324a9001fbe6c1bc4931e47c21f
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 15:19:38 2021 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 15:41:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c544a910

sci-mathematics/minisat: bump to 2.2.1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 sci-mathematics/minisat/Manifest             |  1 +
 sci-mathematics/minisat/metadata.xml         | 31 +++++++++++++++++++++-------
 sci-mathematics/minisat/minisat-2.2.1.ebuild | 29 ++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/sci-mathematics/minisat/Manifest b/sci-mathematics/minisat/Manifest
index 4f851e3ea3c4..672e6b24bfa1 100644
--- a/sci-mathematics/minisat/Manifest
+++ b/sci-mathematics/minisat/Manifest
@@ -1,2 +1,3 @@
 DIST MiniSat.pdf 327416 BLAKE2B 77f77d763c9554680b4c5e1688801e8462102e8ddbcc3b53badccee17a98f935ef0e971a636abeb04021a2b3a3e9d6acfe4828b5dd20e6ef8733d71788cc31b0 SHA512 94e70c721740c0b7fd52621c7a5e43dd9207eed92e60a1c64ee63b541b9861d2580d14ba64c49c6c4f273ac028ded43bc944c71131e51693cdd7d1763af582f6
 DIST minisat-2.2.0_p20130925.tar.gz 49544 BLAKE2B 8c6893fb6c604140609c36cc912c02a73c1f2726d7f399595c50d674aff69c57f9c4914da6d95c37a46fefc218dd4b0550645bd7058d46640d08103e2a4ec333 SHA512 37fc35cc4f3104d7f0e8ee9f7123fc34e175df578658266799d809d71d6cf081e811919f304a02f6cb9c3827d308e59408149d63d1d1e7c6d0b495350f93b3d9
+DIST minisat-2.2.1.tar.gz 50485 BLAKE2B 58c292f0b90dd459fa29fadbf9e2b20106406c08df9ce98f40138b12a8f001b4ab72f661815d1254c6c90158c3d6e3df339c784552605a935ebc5e703b2d8768 SHA512 a69734e1a70fe056f9dfd479fe4e6e25bc418d3631c1c2d0dea1190ffe9f86b1fc5e9aabaf3772a752fe654551f1e84e47fcb8655f6fe25176efc8d8bc96c663

diff --git a/sci-mathematics/minisat/metadata.xml b/sci-mathematics/minisat/metadata.xml
index 970536799081..812aa0c09202 100644
--- a/sci-mathematics/minisat/metadata.xml
+++ b/sci-mathematics/minisat/metadata.xml
@@ -1,11 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">niklasso/minisat</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    MiniSat is a minimalistic, open-source SAT solver, developed to help
+    researchers and developers alike to get started on SAT. It is released
+    under the MIT licence, and is currently used in a number of projects.
+    MiniSat is small and well-documented, and possibly also well-designed,
+    making it an ideal starting point for adapting SAT based techniques to
+    domain specific problems.
+    Winning all the industrial categories of the SAT 2005 competition, MiniSat
+    is a good starting point both for future research in SAT, and for
+    applications using SAT.
+    MiniSat supports incremental SAT and has mechanisms for adding non-clausal
+    constraints. By virtue of being easy to modify, it is a good choice for
+    integrating as a backend to another tool, such as a model checker or a more
+    generic constraint solver.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">niklasso/minisat</remote-id>
+    <remote-id type="github">stp/minisat</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/sci-mathematics/minisat/minisat-2.2.1.ebuild b/sci-mathematics/minisat/minisat-2.2.1.ebuild
new file mode 100644
index 000000000000..360c5a33082b
--- /dev/null
+++ b/sci-mathematics/minisat/minisat-2.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Small yet efficient SAT solver with reference paper"
+HOMEPAGE="http://minisat.se/Main.html"
+SRC_URI="https://github.com/stp/${PN}/archive/releases/${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( http://minisat.se/downloads/MiniSat.pdf )"
+S="${WORKDIR}/${PN}-releases-${PV}"
+
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+IUSE="doc"
+
+RDEPEND="sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+src_install() {
+	cmake_src_install
+
+	mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) || die
+	dosym libminisat.a /usr/$(get_libdir)/libMiniSat.a
+
+	use doc && dodoc "${DISTDIR}"/MiniSat.pdf
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/minisat/
@ 2019-10-21 14:32 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2019-10-21 14:32 UTC (permalink / raw
  To: gentoo-commits

commit:     494768fd4f91286c04abcac0cb06c6042720cd1f
Author:     Jeffrey Lin <jeffrey <AT> icurse <DOT> nl>
AuthorDate: Fri Jan  4 03:37:59 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 14:32:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494768fd

sci-mathematics/minisat: fix sed in header files

Bug: https://bugs.gentoo.org/697562
Closes: https://bugs.gentoo.org/694982
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Jeffrey Lin <jeffrey <AT> icurse.nl>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...minisat-2.2.0_p20130925.ebuild => minisat-2.2.0_p20130925-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/minisat/minisat-2.2.0_p20130925.ebuild b/sci-mathematics/minisat/minisat-2.2.0_p20130925-r1.ebuild
similarity index 94%
rename from sci-mathematics/minisat/minisat-2.2.0_p20130925.ebuild
rename to sci-mathematics/minisat/minisat-2.2.0_p20130925-r1.ebuild
index 308bc18e8af..39e62e229e7 100644
--- a/sci-mathematics/minisat/minisat-2.2.0_p20130925.ebuild
+++ b/sci-mathematics/minisat/minisat-2.2.0_p20130925-r1.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 	# Fix headers ( #include "minisat/..." -> #include <...> )
 	while IFS="" read -d $'\0' -r file; do
 		einfo Correcting header "$file"
-		sed -i -e 's:#include "minisat/\([^"]*\)":#include <\1>:g' "${file}" || die
+		sed -i -e 's:#include "minisat/\([^"]*\)":#include <minisat/\1>:g' "${file}" || die
 	done < <(find minisat -name "*.h" -print0)
 }
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/minisat/
@ 2016-09-13  8:04 David Seifert
  0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2016-09-13  8:04 UTC (permalink / raw
  To: gentoo-commits

commit:     5a24247d97a26cc91591658f68f3ded71664c723
Author:     Gerhard Bräunlich <wippbox <AT> gmx <DOT> net>
AuthorDate: Fri Sep  9 13:36:41 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 07:49:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a24247d

sci-mathematics/minisat: Unsiliencing makefile

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2282

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-mathematics/minisat/minisat-2.2.0-r4.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild b/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild
index 20c5ee3..2674076 100644
--- a/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild
+++ b/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild
@@ -27,8 +27,8 @@ S=${WORKDIR}/${PN}
 
 src_prepare() {
 	default
-	sed -e "s/\$(CXX) \$^/\$(CXX) \$(LDFLAGS) \$^/" \
-		-i -e "s|-O3|${CFLAGS}|" mtl/template.mk || die
+	# Remove makefile silencing
+	sed -i -e 's:@\(\$\|ln\|rm\|for\):\1:g'	mtl/template.mk || die
 }
 
 src_configure() {
@@ -40,9 +40,9 @@ src_configure() {
 }
 
 src_compile() {
-	export MROOT="${S}"
-	emake -C ${mydir} ${myconf}
-	LIB="${PN}" emake -C ${mydir} lib${myconf}
+	export MROOT="$S"
+	emake -C $mydir $myconf
+	LIB="${PN}" emake -C $mydir lib$myconf
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/minisat/
@ 2016-09-08 22:09 David Seifert
  0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2016-09-08 22:09 UTC (permalink / raw
  To: gentoo-commits

commit:     5eda6c0e3cd443dfa5cae9320910d4c65547affa
Author:     Gerhard Bräunlich <wippbox <AT> gmx <DOT> net>
AuthorDate: Thu Sep  8 15:10:10 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 22:07:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eda6c0e

sci-mathematics/minisat: revbump (EAPI 2 -> 6)

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2279

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-mathematics/minisat/minisat-2.2.0-r4.ebuild | 66 +++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild b/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild
new file mode 100644
index 00000000..20c5ee3
--- /dev/null
+++ b/sci-mathematics/minisat/minisat-2.2.0-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	sed -e "s/\$(CXX) \$^/\$(CXX) \$(LDFLAGS) \$^/" \
+		-i -e "s|-O3|${CFLAGS}|" 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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/minisat/
@ 2016-09-08 22:09 David Seifert
  0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2016-09-08 22:09 UTC (permalink / raw
  To: gentoo-commits

commit:     c13bca2bd6185c512eda1183e5befe1e27e421ad
Author:     Gerhard Bräunlich <wippbox <AT> gmx <DOT> net>
AuthorDate: Thu Sep  8 20:07:28 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 22:07:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13bca2b

sci-mathematics/minisat: Removing EAPI 2 ebuilds

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2279

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-mathematics/minisat/Manifest                |  1 -
 sci-mathematics/minisat/minisat-2.1.0.ebuild    | 96 -------------------------
 sci-mathematics/minisat/minisat-2.2.0-r3.ebuild | 93 ------------------------
 3 files changed, 190 deletions(-)

diff --git a/sci-mathematics/minisat/Manifest b/sci-mathematics/minisat/Manifest
index f76d652..12aa841 100644
--- a/sci-mathematics/minisat/Manifest
+++ b/sci-mathematics/minisat/Manifest
@@ -1,3 +1,2 @@
 DIST MiniSat.pdf 327416 SHA256 53197dbd783c924a2627d75e305706297988494265bd5e5ec873840e5d797ac4 SHA512 94e70c721740c0b7fd52621c7a5e43dd9207eed92e60a1c64ee63b541b9861d2580d14ba64c49c6c4f273ac028ded43bc944c71131e51693cdd7d1763af582f6 WHIRLPOOL a087d8929476fc33464d19432fc05a01797761f695b81c0aa6d35270731b00dabe2402ea2cfd705b49d5d6664a3cbd46bc60147d60934acdfc94a33066316185
 DIST minisat-2.2.0.tar.gz 43879 SHA256 92957d851cdc3baddfe07b5fc80ed5a0237c489d0c52ae72f62844b3b46d7808 SHA512 cf79b05d43ebdc8fd8081899a1f853370de051cafe6e5b143eaff9827efc542b58062782a3ce2a3d1a03561a9ffd780c9cdc645bb50036eb61e80fa729136e64 WHIRLPOOL a5117e7bc81aeecb6fa34d8e2dea70b379d9e3463957e7029c80957ff3bcdd3107a99fb0dabfe59b57bfdb16ed51a0a4781c8dbf8e3f6f225ebd5035c1a9ff79
-DIST minisat2-070721.zip 48776 SHA256 ddc2ed421a538a349ddab58d3958076d73813925ff08361e6292583d3b87248e SHA512 2d3d1597cf0631e8f24ef1aa9be020971e9d0732197614f8cfaa47abe63354ba6e68ef31e554539006ba0dc501eadfca42de603c0e1c2dc1824f05197b6e63a1 WHIRLPOOL 05771824a138b136bd967287cf8d67848c42061c3b5a87a0f7348140aedc449bf79a118cd40647c241635cecfec65a868ed30b0b183f23d39bcf351fe1c520b1

diff --git a/sci-mathematics/minisat/minisat-2.1.0.ebuild b/sci-mathematics/minisat/minisat-2.1.0.ebuild
deleted file mode 100644
index 46b0736..00000000
--- a/sci-mathematics/minisat/minisat-2.1.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-MY_P="${PN}2-070721"
-
-DESCRIPTION="Small yet efficient SAT solver with reference paper"
-HOMEPAGE="http://minisat.se/Main.html"
-SRC_URI="http://minisat.se/downloads/${MY_P}.zip
-	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}"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	if use debug; then
-		myconf="d"
-		myext="debug"
-	else
-		myconf="r"
-		myext="release"
-	fi
-
-	if use extended-solver; then
-		mydir="simp"
-	else
-		mydir="core"
-	fi
-
-	tc-export CXX
-
-	if has_version ">=sci-mathematics/minisat-2.2.0" ; then
-		elog ""
-		elog "The minisat2 2.1 and 2.2 ABIs are not compatible and there"
-		elog "is currently no slotting.  Please mask it yourself (eg, in"
-		elog "packages.mask) if you need to use the 2.1x version."
-		elog ""
-		epause 5
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "s|-O3|${CFLAGS} ${LDFLAGS}|" \
-		-e "s|@\$(CXX)|\$(CXX)|" \
-		mtl/template.mk || die
-}
-
-src_compile() {
-	export MROOT="${S}"
-	emake -C ${mydir} "$myconf" || die
-
-	if ! use debug; then
-		LIB="${PN}" emake -C ${mydir} lib || die
-	else
-		LIB="${PN}" emake -C ${mydir} libd || die
-	fi
-}
-
-src_install() {
-	# somewhat brute-force, but so is the build setup...
-
-	insinto /usr/include/${PN}2/mtl
-	doins mtl/*.h || die
-
-	insinto /usr/include/${PN}2/core
-	doins core/Solver*.h || die
-
-	insinto /usr/include/${PN}2/simp
-	doins simp/Simp*.h || die
-
-	if ! use debug; then
-		newbin ${mydir}/${PN}_${myext} ${PN} || die
-		dolib.a ${mydir}/lib${PN}.a || die
-	else
-		newbin ${mydir}/${PN}_${myext} ${PN} || die
-		newlib.a ${mydir}/lib${PN}_${myext}.a lib${PN}.a || die
-	fi
-
-	dodoc README || die
-	if use doc; then
-		dodoc "${DISTDIR}"/MiniSat.pdf || die
-	fi
-}

diff --git a/sci-mathematics/minisat/minisat-2.2.0-r3.ebuild b/sci-mathematics/minisat/minisat-2.2.0-r3.ebuild
deleted file mode 100644
index 029a36f..00000000
--- a/sci-mathematics/minisat/minisat-2.2.0-r3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils 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}"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	if use debug; then
-		myconf="d"
-		myext="debug"
-	else
-		myconf="r"
-		myext="release"
-	fi
-
-	if use extended-solver; then
-		mydir="simp"
-	else
-		mydir="core"
-	fi
-	tc-export CXX
-
-	if has_version "=sci-mathematics/minisat-2.1*" ; then
-		elog ""
-		elog "The minisat2 2.1 and 2.2 ABIs are not compatible and there"
-		elog "is currently no slotting.  Please mask it yourself (eg, in"
-		elog "packages.mask) if you still need the older version."
-		elog ""
-		epause 5
-	fi
-}
-
-src_prepare() {
-	sed -e "s/\$(CXX) \$^/\$(CXX) \$(LDFLAGS) \$^/" \
-		-i -e "s|-O3|${CFLAGS}|" mtl/template.mk || die
-}
-
-src_compile() {
-	export MROOT="${S}"
-	emake -C ${mydir} "$myconf" || die
-	LIB="${PN}" emake -C ${mydir} lib"$myconf" || die
-}
-
-src_install() {
-	# somewhat brute-force, but so is the build setup...
-	fix_headers
-
-	insinto /usr/include/${PN}2/mtl
-	doins mtl/*.h || die
-
-	insinto /usr/include/${PN}2/core
-	doins core/Solver*.h || die
-
-	insinto /usr/include/${PN}2/simp
-	doins simp/Simp*.h || die
-
-	insinto /usr/include/${PN}2/utils
-	doins utils/*.h || die
-
-	newbin ${mydir}/${PN}_${myext} ${PN} || die
-	newlib.a ${mydir}/lib${PN}_${myext}.a lib${PN}.a || die
-
-	dodoc README doc/ReleaseNotes-2.2.0.txt || die
-	if use doc; then
-		dodoc "${DISTDIR}"/MiniSat.pdf || die
-	fi
-}
-
-fix_headers() {
-	# need to fix the circular internal includes a bit for standard usage
-	elog "Fixing header files..."
-
-	patch -p0 < "${FILESDIR}"/${P}-header_fix.patch \
-		|| die "header patch failed..."
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-01-24  9:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-24  9:32 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/minisat/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2021-12-26 15:41 Maciej Barć
2019-10-21 14:32 Joonas Niilola
2016-09-13  8:04 David Seifert
2016-09-08 22:09 David Seifert
2016-09-08 22:09 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox