commit: 0c33939dfcebcd2e10b00ac832a70128d2407dc5 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Fri Apr 12 17:02:05 2024 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Fri Apr 12 17:03:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c33939d
sci-libs/mpir: treeclean Closes: https://bugs.gentoo.org/925308 Bug: https://bugs.gentoo.org/815685 Bug: https://bugs.gentoo.org/812950 Bug: https://bugs.gentoo.org/874537 Bug: https://bugs.gentoo.org/903157 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> profiles/package.mask | 8 -- sci-libs/mpir/Manifest | 1 - sci-libs/mpir/files/mpir-2.7.2-ABI-multilib.patch | 145 ---------------------- sci-libs/mpir/metadata.xml | 24 ---- sci-libs/mpir/mpir-3.0.0-r1.ebuild | 77 ------------ 5 files changed, 255 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 95aa63a0e4d0..ecb3733163f1 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -356,14 +356,6 @@ app-portage/gs-elpa # Removal on 2024-04-03. kde-misc/gmail-feed -# Eli Schwartz <eschwart...@gmail.com> (2024-02-29) -# Ancient fork of gmp from 2017. Various build issues, fails tests. All -# reverse dependencies turned out to be incorrect or preferred gmp -# anyways. No path forward to keeping it buildable, no use case for -# keeping it around. Bug #812950, #874537, #925308 -# Removal on 2024-03-31. -sci-libs/mpir - # Andreas Sturmlechner <ast...@gentoo.org> (2024-02-28) # KDE Plasma 6.0.3, Gear 24.02.1 and Frameworks 6.0.0 mask # diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest deleted file mode 100644 index 1688d2b7877d..000000000000 --- a/sci-libs/mpir/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e 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 deleted file mode 100644 index 100a6ae7088d..000000000000 --- a/sci-libs/mpir/files/mpir-2.7.2-ABI-multilib.patch +++ /dev/null @@ -1,145 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -361,7 +361,7 @@ - # hugely bloat the output. - - --AC_ARG_VAR(ABI, [desired ABI (for processors supporting more than one ABI)]) -+AC_ARG_VAR(MPIRABI, [desired ABI (for processors supporting more than one ABI)]) - - # abilist needs to be non-empty, "standard" is just a generic name here - abilist="standard" -@@ -1590,7 +1590,7 @@ - - cat >&AC_FD_CC <<EOF - User: --ABI=$ABI -+MPIRABI=$MPIRABI - CC=$CC - CFLAGS=$CFLAGS_or_unset - CPPFLAGS=$CPPFLAGS_or_unset -@@ -1611,22 +1611,22 @@ - # If the user specifies an ABI then it must be in $abilist, after that - # $abilist is restricted to just that choice. - # --if test -n "$ABI"; then -+if test -n "$MPIRABI"; then - found=no - for abi in $abilist; do -- if test $abi = "$ABI"; then found=yes; break; fi -+ if test $abi = "$MPIRABI"; then found=yes; break; fi - done - if test $found = no; then -- AC_MSG_ERROR([ABI=$ABI is not among the following valid choices: $abilist]) -+ AC_MSG_ERROR([MPIRABI=$MPIRABI is not among the following valid choices: $abilist]) - fi -- abilist="$ABI" -+ abilist="$MPIRABI" - fi - - found_compiler=no - - for abi in $abilist; do - -- echo "checking ABI=$abi" -+ echo "checking MPIRABI=$abi" - - # Suppose abilist="64 32", then for abi=64, will have abi1="_64" and - # abi2="_64". For abi=32, will have abi1="_32" and abi2="". This is how -@@ -1879,7 +1879,7 @@ - done - fi - -- ABI="$abi" -+ MPIRABI="$abi" - CC="$cc" - CFLAGS="$cflags" - CPPFLAGS="$cppflags" -@@ -1895,8 +1895,8 @@ - AC_SUBST(GMP_CFLAGS) - - # Could easily have this in config.h too, if desired. -- ABI_nodots=`echo $ABI | sed 's/\./_/'` -- GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_ABI_$ABI_nodots')", POST) -+ ABI_nodots=`echo $MPIRABI | sed 's/\./_/'` -+ GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_ABI_$MPIRABI_nodots')", POST) - - - # GMP_LDFLAGS substitution, selected according to ABI. -@@ -2094,7 +2094,7 @@ - # - case $host in - X86_PATTERN | X86_64_PATTERN) -- if test "$ABI" = 32; then -+ if test "$MPIRABI" = 32; then - case "$path $fat_path" in - *mmx*) GMP_ASM_X86_MMX( , [GMP_STRIP_PATH(*mmx*)]) ;; - esac -@@ -2108,7 +2108,7 @@ - - cat >&AC_FD_CC <<EOF - Decided: --ABI=$ABI -+MPIRABI=$MPIRABI - CC=$CC - CFLAGS=$CFLAGS - CPPFLAGS=$CPPFLAGS -@@ -2117,7 +2117,7 @@ - CXXFLAGS=$CXXFLAGS - path=$path - EOF --echo "using ABI=\"$ABI\"" -+echo "using MPIRABI=\"$MPIRABI\"" - echo " CC=\"$CC\"" - echo " CFLAGS=\"$CFLAGS\"" - echo " CPPFLAGS=\"$CPPFLAGS\"" -@@ -2593,7 +2593,7 @@ - - - if test -n "$fat_path"; then -- if test "$ABI" = 64; then -+ if test "$MPIRABI" = 64; then - fat_path="$fat_path_64" - fi - -@@ -3099,19 +3099,19 @@ - GMP_INCLUDE_MPN(powerpc32/powerpc-defs.m4) - case $host in - *-*-aix*) -- case $ABI in -+ case $MPIRABI in - 64 | aix64) GMP_INCLUDE_MPN(powerpc64/aix.m4) ;; - *) GMP_INCLUDE_MPN(powerpc32/aix.m4) ;; - esac - ;; - *-*-linux* | *-*-*bsd*) -- case $ABI in -+ case $MPIRABI in - mode64) GMP_INCLUDE_MPN(powerpc64/elf.m4) ;; - mode32 | 32) GMP_INCLUDE_MPN(powerpc32/elf.m4) ;; - esac - ;; - *-*-darwin*) -- case $ABI in -+ case $MPIRABI in - mode64) GMP_INCLUDE_MPN(powerpc64/darwin.m4) ;; - mode32 | 32) GMP_INCLUDE_MPN(powerpc32/darwin.m4) ;; - esac -@@ -3126,7 +3126,7 @@ - GMP_INCLUDE_MPN(powerpc32/aix.m4) - ;; - sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*) -- case $ABI in -+ case $MPIRABI in - 64) - GMP_ASM_SPARC_REGISTER - ;; -@@ -3134,7 +3134,7 @@ - ;; - X86_PATTERN | X86_64_PATTERN) - GMP_ASM_ALIGN_FILL_0x90 -- case $ABI in -+ case $MPIRABI in - 32) - GMP_INCLUDE_MPN(x86/x86-defs.m4) - AC_DEFINE(HAVE_HOST_CPU_FAMILY_x86) diff --git a/sci-libs/mpir/metadata.xml b/sci-libs/mpir/metadata.xml deleted file mode 100644 index 926ae4d3740e..000000000000 --- a/sci-libs/mpir/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>s...@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription> -MPIR is an open source multiprecision integer (bignum) library forked -from the GMP (GNU Multi Precision) project. It consists of much code -from past GMP releases, in combination with much original contributed -code. - -MPIR is constructed by a developer and vendor friendly community of -professional and amateur mathematicians, computer scientists and -hobbyists. - </longdescription> - <use> - <flag name="cpudetection">Enables runtime cpudetection (useful for bindist, compatibility on other CPUs)</flag> - </use> - <upstream> - <remote-id type="github">wbhart/mpir</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/mpir/mpir-3.0.0-r1.ebuild b/sci-libs/mpir/mpir-3.0.0-r1.ebuild deleted file mode 100644 index 1c8e843d6950..000000000000 --- a/sci-libs/mpir/mpir-3.0.0-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs - -DESCRIPTION="Library for arbitrary precision integer arithmetic (fork of gmp)" -HOMEPAGE="https://www.mpir.org/"; -SRC_URI="https://www.mpir.org/${P}.tar.bz2"; - -LICENSE="LGPL-3" -SLOT="0/23" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+cxx cpudetection" - -BDEPEND=" - x86? ( dev-lang/yasm ) - amd64? ( dev-lang/yasm ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.7.2-ABI-multilib.patch -) - -src_prepare() { - tc-export CC - - default - - # In the same way there was QA regarding executable stacks - # with GMP we have some here as well. We cannot apply the - # GMP solution as yasm is used, at least on x86/amd64. - # Furthermore we are able to patch config.ac. - einfo "Patching assembler files to remove executable sections" - local i - for i in $(find . -type f -name '*.asm') ; do - cat >> $i <<-EOF || die - - #if defined(__linux__) && defined(__ELF__) - .section .note.GNU-stack,"",%progbits - #endif - EOF - done - - for i in $(find . -type f -name '*.as') ; do - cat >> $i <<-EOF || die - - %ifidn __OUTPUT_FORMAT__,elf - section .note.GNU-stack noalloc noexec nowrite progbits - %endif - EOF - done - - eautoreconf -} - -src_configure() { - # beware that cpudetection aka fat binaries is x86/amd64 only. - # Place mpir in profiles/arch/$arch/package.use.mask - # when making it available on $arch. - local myeconfargs=( - $(use_enable cxx) - $(use_enable cpudetection fat) - --disable-static - ) - # https://bugs.gentoo.org/661430 - if ! use amd64 && ! use x86; then - myeconfargs+=( --with-yasm="${BROOT}"/bin/false ) - fi - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -}
