[gentoo-commits] repo/gentoo:master commit in: sci-libs/mpir/, sci-libs/mpir/files/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/mpir/, sci-libs/mpir/files/

[Justin Lecher]

commit:     5f34df490cc12bdb24e89fac3424d4e2ebb5596c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 22:52:41 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 22:52:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f34df49

sci-libs/mpir: Backport patch for newer sed

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=604764

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/mpir/files/mpir-2.7.2-sed-backport.patch | 16 ++++++++++++++++
 sci-libs/mpir/mpir-2.7.2.ebuild                   |  9 ++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/sci-libs/mpir/files/mpir-2.7.2-sed-backport.patch b/sci-libs/mpir/files/mpir-2.7.2-sed-backport.patch
new file mode 100644
index 00000000..8976429
--- /dev/null
+++ b/sci-libs/mpir/files/mpir-2.7.2-sed-backport.patch
@@ -0,0 +1,16 @@
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a3821c5..15fa93d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2595,7 +2595,7 @@ for tmp_fn in $gmp_mpn_functions; do
+             sed -n 's/^[ 	]*MULFUNC_PROLOGUE(\(.*\))/\1/p' $tmp_file ;
+             sed -n 's/^[ 	]*PROLOGUE(\([^,]*\).*)/\1/p' $tmp_file ;
+             sed -n 's/^;[ 	]*PROLOGUE(\([^,]*\).*)/\1/p' $tmp_file ;
+-            sed -n 's/[^G]*GLOBAL_FUNC[:space:]*\(.*\)/\1/p' $tmp_file ;
++            sed -n 's/[^G]*GLOBAL_FUNC[[:space:]]*\(.*\)/\1/p' $tmp_file ;
+           `]
+           for gmp_tmp in $gmp_ep; do
+             AC_DEFINE_UNQUOTED(HAVE_NATIVE_$gmp_tmp)

diff --git a/sci-libs/mpir/mpir-2.7.2.ebuild b/sci-libs/mpir/mpir-2.7.2.ebuild
index 20408ff..e49488b 100644
--- a/sci-libs/mpir/mpir-2.7.2.ebuild
+++ b/sci-libs/mpir/mpir-2.7.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit autotools eutils toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Library for arbitrary precision integer arithmetic (fork of gmp)"
 HOMEPAGE="http://www.mpir.org/"
@@ -23,6 +23,7 @@ RDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}"/${P}-ABI-multilib.patch
+	"${FILESDIR}"/${P}-sed-backport.patch
 )
 
 src_prepare() {
@@ -63,6 +64,12 @@ src_configure() {
 		--with-system-yasm
 		$(use_enable cxx)
 		$(use_enable cpudetection fat)
+		$(use_enable static-libs static)
 	)
 	econf ${myeconfargs[@]}
 }
+
+src_install() {
+	default
+	rm "${ED}"/usr/$(get_libdir)/*la || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/mpir/, sci-libs/mpir/files/

[David Seifert]

commit:     766ccf333003215d0b0d0fc3b86a84eb52a7feb4
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu May 27 21:05:41 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu May 27 21:05:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=766ccf33

sci-libs/mpir: Port to EAPI 7, drop static-libs

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/mpir/files/mpir-2.7.2-ABI-multilib.patch      |  4 ++--
 .../mpir/{mpir-3.0.0.ebuild => mpir-3.0.0-r1.ebuild}   | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/sci-libs/mpir/files/mpir-2.7.2-ABI-multilib.patch b/sci-libs/mpir/files/mpir-2.7.2-ABI-multilib.patch
index f02df55ccf9..100a6ae7088 100644
--- a/sci-libs/mpir/files/mpir-2.7.2-ABI-multilib.patch
+++ b/sci-libs/mpir/files/mpir-2.7.2-ABI-multilib.patch
@@ -1,5 +1,5 @@
---- a/configure.ac	2009-11-28 10:48:59.196977657 +0000
-+++ b/configure.ac	2009-11-28 10:54:50.717976971 +0000
+--- a/configure.ac
++++ b/configure.ac
 @@ -361,7 +361,7 @@
  # hugely bloat the output.
  

diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0-r1.ebuild
similarity index 85%
rename from sci-libs/mpir/mpir-3.0.0.ebuild
rename to sci-libs/mpir/mpir-3.0.0-r1.ebuild
index ccd38ea08c0..eab814932b3 100644
--- a/sci-libs/mpir/mpir-3.0.0.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools toolchain-funcs
 
@@ -12,14 +12,12 @@ SRC_URI="http://www.mpir.org/${P}.tar.bz2"
 LICENSE="LGPL-3"
 SLOT="0/23"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx cpudetection static-libs"
+IUSE="+cxx cpudetection"
 
-DEPEND="
+BDEPEND="
 	x86? ( dev-lang/yasm )
 	amd64? ( dev-lang/yasm )
-	amd64-fbsd? ( dev-lang/yasm )
 "
-RDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.7.2-ABI-multilib.patch
@@ -35,7 +33,7 @@ src_prepare() {
 	ebegin "Patching assembler files to remove executable sections"
 	local i
 	for i in $(find . -type f -name '*.asm') ; do
-		cat >> $i <<-EOF
+		cat >> $i <<-EOF || die
 
 			#if defined(__linux__) && defined(__ELF__)
 			.section .note.GNU-stack,"",%progbits
@@ -44,7 +42,7 @@ src_prepare() {
 	done
 
 	for i in $(find . -type f -name '*.as') ; do
-		cat >> $i <<-EOF
+		cat >> $i <<-EOF || die
 
 			%ifidn __OUTPUT_FORMAT__,elf
 			section .note.GNU-stack noalloc noexec nowrite progbits
@@ -62,16 +60,16 @@ src_configure() {
 	local myeconfargs=(
 		$(use_enable cxx)
 		$(use_enable cpudetection fat)
-		$(use_enable static-libs static)
+		--disable-static
 	)
 	# https://bugs.gentoo.org/661430
 	if ! use amd64 && ! use x86; then
-		myeconfargs+=( --with-yasm=/bin/false )
+		myeconfargs+=( --with-yasm="${BROOT}"/bin/false )
 	fi
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*la
+	find "${ED}" -name '*.la' -delete || die
 }