gentoo resync : 28.04.2021

1 files changed, 24 insertions, 22 deletions

diff --git a/sci-mathematics/msieve/msieve-1.53-r1.ebuild b/sci-mathematics/msieve/msieve-1.53-r1.ebuild
index 5df9a95f4e7e..4cf9b2d6dce3 100644
--- a/sci-mathematics/msieve/msieve-1.53-r1.ebuild
+++ b/sci-mathematics/msieve/msieve-1.53-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -14,30 +14,31 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="zlib +ecm mpi"
 
-DEPEND="
+RDEPEND="
 	ecm? ( sci-mathematics/gmp-ecm )
 	mpi? ( virtual/mpi )
-	zlib? ( sys-libs/zlib:= )"
-RDEPEND="${DEPEND}"
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# TODO: Integrate ggnfs properly
+	"${FILESDIR}"/${PN}-1.51-reduce-printf.patch
+	"${FILESDIR}"/${PN}-1.53-fix-version.patch
+)
 
 src_prepare() {
 	default
 
-	# TODO: Integrate ggnfs properly
-	eapply \
-		"${FILESDIR}"/${PN}-1.51-reduce-printf.patch \
-		"${FILESDIR}"/${PN}-1.53-fix-version.patch
-
-	sed -i -e 's/-march=k8//' Makefile 		|| die
-	sed -i -e 's/CC =/#CC =/' Makefile 		|| die
-	sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile 	|| die
+	sed -i -e 's/-march=k8//' Makefile || die
+	sed -i -e 's/CC =/#CC =/' Makefile || die
+	sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile || die
 	sed -i -e 's/LIBS += -lecm/LIBS += -lecm -lgomp/' Makefile || die
 }
 
 src_compile() {
-	use ecm && export "ECM=1"
-	use mpi && export "MPI=1"
-	use zlib && export "ZLIB=1"
+	use ecm && export ECM=1
+	use mpi && export MPI=1
+	use zlib && export ZLIB=1
 	emake \
 		CC=$(tc-getCC) \
 		AR=$(tc-getAR) \
@@ -46,11 +47,12 @@ src_compile() {
 }
 
 src_install() {
-	mkdir -p "${ED}/usr/include/msieve"
-	mkdir -p "${ED}/usr/lib/"
-	mkdir -p "${ED}/usr/share/doc/${P}/"
-	cp include/* "${ED}/usr/include/msieve" || die "Failed to install"
-	cp libmsieve.a "${ED}/usr/lib/" || die "Failed to install"
 	dobin msieve
-	cp Readme* "${ED}/usr/share/doc/${P}/" || die "Failed to install"
+
+	insinto /usr/include/msieve
+	doins -r include/.
+
+	dolib.a libmsieve.a
+
+	dodoc Readme*
 }