From 494768fd4f91286c04abcac0cb06c6042720cd1f Mon Sep 17 00:00:00 2001
From: Jeffrey Lin <jeffrey@icurse.nl>
Date: Thu, 3 Jan 2019 22:37:59 -0500
Subject: 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@icurse.nl>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
---
 .../minisat/minisat-2.2.0_p20130925-r1.ebuild      | 57 ++++++++++++++++++++++
 .../minisat/minisat-2.2.0_p20130925.ebuild         | 57 ----------------------
 2 files changed, 57 insertions(+), 57 deletions(-)
 create mode 100644 sci-mathematics/minisat/minisat-2.2.0_p20130925-r1.ebuild
 delete mode 100644 sci-mathematics/minisat/minisat-2.2.0_p20130925.ebuild

(limited to 'sci-mathematics/minisat')

diff --git a/sci-mathematics/minisat/minisat-2.2.0_p20130925-r1.ebuild b/sci-mathematics/minisat/minisat-2.2.0_p20130925-r1.ebuild
new file mode 100644
index 000000000000..39e62e229e7d
--- /dev/null
+++ b/sci-mathematics/minisat/minisat-2.2.0_p20130925-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs vcs-snapshot
+
+DESCRIPTION="Small yet efficient SAT solver with reference paper"
+HOMEPAGE="http://minisat.se/Main.html"
+COMMIT=37dc6c67e2af26379d88ce349eb9c4c6160e8543
+SRC_URI="https://github.com/niklasso/minisat/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
+	doc? ( http://minisat.se/downloads/MiniSat.pdf )"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="MIT"
+
+IUSE="debug doc"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+DOCS=( README doc/ReleaseNotes-${PV%_*}.txt )
+PATCHES=( "${FILESDIR}"/${P}-nusmv.patch )
+
+src_prepare() {
+	default
+	# Remove makefile silencing and
+	# Remove static linking by default
+	sed -i -e "s/VERB=@/VERB=/" \
+		-e "s/--static //g" \
+		Makefile || die
+
+	sed -i -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \
+		Makefile || die
+
+	# Fix headers ( #include "minisat/..." -> #include <...> )
+	while IFS="" read -d $'\0' -r file; do
+		einfo Correcting header "$file"
+		sed -i -e 's:#include "minisat/\([^"]*\)":#include <minisat/\1>:g' "${file}" || die
+	done < <(find minisat -name "*.h" -print0)
+}
+
+src_configure() {
+	local minisat_cflags="${CFLAGS} -D NDEBUG -I${S}/minisat"
+	emake config prefix="${EPREFIX}"/usr MINISAT_RELSYM="" MINISAT_REL="${minisat_cflags}" MINISAT_PRF="${minisat_cflags}" MINISAT_DEB="${CFLAGS} -D DEBUG -I${S}/minisat"
+}
+
+src_compile() {
+	emake all $(usex debug d "")
+}
+
+src_install() {
+	use doc && DOCS+=( "${DISTDIR}"/MiniSat.pdf )
+	default
+
+	dosym libminisat.a /usr/$(get_libdir)/libMiniSat.a
+}
diff --git a/sci-mathematics/minisat/minisat-2.2.0_p20130925.ebuild b/sci-mathematics/minisat/minisat-2.2.0_p20130925.ebuild
deleted file mode 100644
index 308bc18e8afd..000000000000
--- a/sci-mathematics/minisat/minisat-2.2.0_p20130925.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs vcs-snapshot
-
-DESCRIPTION="Small yet efficient SAT solver with reference paper"
-HOMEPAGE="http://minisat.se/Main.html"
-COMMIT=37dc6c67e2af26379d88ce349eb9c4c6160e8543
-SRC_URI="https://github.com/niklasso/minisat/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
-	doc? ( http://minisat.se/downloads/MiniSat.pdf )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="MIT"
-
-IUSE="debug doc"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-DOCS=( README doc/ReleaseNotes-${PV%_*}.txt )
-PATCHES=( "${FILESDIR}"/${P}-nusmv.patch )
-
-src_prepare() {
-	default
-	# Remove makefile silencing and
-	# Remove static linking by default
-	sed -i -e "s/VERB=@/VERB=/" \
-		-e "s/--static //g" \
-		Makefile || die
-
-	sed -i -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \
-		Makefile || die
-
-	# 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
-	done < <(find minisat -name "*.h" -print0)
-}
-
-src_configure() {
-	local minisat_cflags="${CFLAGS} -D NDEBUG -I${S}/minisat"
-	emake config prefix="${EPREFIX}"/usr MINISAT_RELSYM="" MINISAT_REL="${minisat_cflags}" MINISAT_PRF="${minisat_cflags}" MINISAT_DEB="${CFLAGS} -D DEBUG -I${S}/minisat"
-}
-
-src_compile() {
-	emake all $(usex debug d "")
-}
-
-src_install() {
-	use doc && DOCS+=( "${DISTDIR}"/MiniSat.pdf )
-	default
-
-	dosym libminisat.a /usr/$(get_libdir)/libMiniSat.a
-}
-- 
cgit v1.2.3-65-gdbad