5 files changed, 2 insertions, 241 deletions
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index b5400bc4cfeb..f126aa8f816b 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,7 +1,3 @@
-AUX pari-2.11.2-no-automagic.patch 2349 BLAKE2B 6c2cdda84342109bad0cbfb3d5188eedbbfc08e5b40bce3f045309cef936f88356324b6d721c5cdb458a2343fb4ee6473238571dd779b74506e7e2b7d835e0c7 SHA512 549acaeaa393b0b42818e3648c21fdba3162abfefef147a1429d0e39f58ece0a46e94a6ee953435549c23d62b115b2dab0ee261eda2eb7fd0a2b430223f5f59c
-AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83fa92623903dd1e056bda29c6735eb01013e7937f66d6ffff42d0de83f7ed104c7f933d232ee37be7c4351788e76f8daa SHA512 2ec0d8035a87b693ee6a4dfa913f0b24eed20bb4db7f8cd1a47db444310d33d19e6651d475c635be747e79a02df2705e42f6f7032b60dc763583cf9fa8633b29
-DIST pari-2.15.4.tar.gz 5183685 BLAKE2B 2e20b6dc073ce69bc098dd849e6ab43cb38b05d30ff5f72a31272cd24ef01aa515d4e2a4948264ca89169a6980cd9d76f86c7fbb9aad5be604680569950d9c25 SHA512 2b9f0c1fe7198406df8e6ceb3fcdc8bfb75f5c7ebfb963f023a1eebfff0bcc26e3b690941e188d6b9f8dfb6cddf4ce4c00f2cc320ebe47d42ae7596c774ed6cc
 DIST pari-2.15.5.tar.gz 5186798 BLAKE2B b253c6d8ad38462e81852d7bb364d06a7cbaae7b085672653da8d9f91f0173cfdef8f537ebc7313b6484f610d43e10fb0547f5d920789b95c8d0027dd52e8312 SHA512 59b2ebed43176f1ee750146053644bffbf673b4b4810134bc39132665941152772afb7a9332b842fc64e5ab8d5747a872c1b8ff327d3bd5eedaa1591691fff13
-EBUILD pari-2.15.4-r1.ebuild 4724 BLAKE2B cdd4bd4805b870700e7f190bf220f21c5f55ab7627c141122aa97dc92f12ea605abfab9d417e873fafc6a6d38cd8e57f734c9626de48d10e1d78a4d4a7dcebbb SHA512 d8a740394bca755e34445fcf4ead7841e5d3a47edd67dcb86f2cb134c705e847fdd7c89105c66029a3ccf254c669c1e150995267a976bc2d9f920197fb5b0f4b
-EBUILD pari-2.15.5.ebuild 4446 BLAKE2B 6884828e06727b54f811c8c226324018ecbfbe4846d8d0c1a2229ecac946d1dcd2fcd2e28f808578c90e4dc9b1336957c750c5a22c66c6a51ca2ab58b34a75b0 SHA512 f17c6c2ddd4b01b0575615d2a636d39de860e74f54b18b266a604819a71186f5b8ec2445c5054824bf6f41c36a656bd60f494aa208a5eaa2edef890a1acda36a
+EBUILD pari-2.15.5.ebuild 4444 BLAKE2B f9058dbbaca0293176e475b74a35015903365b6581a5a12fe959d05263949f2267c91621f9fc553458a89ec578017422a6ebdd50174d692476f01782157dcddc SHA512 22939bb6b6db6275df572cfe65b2e182b4addad9bd718d5b89b7ffd17f6374949cd3b24f31c5c3db17b8799b081986a2b6513a40167e4c1d8e0f70daebee6b42
 MISC metadata.xml 1770 BLAKE2B d730330ac80159a9e46a7c892049d00e28bfe9e4d4c61616c033ccaf526cfef6f95a03bac803bf70c59760e1833e35fce5bc535038aadc8db68dca878c7bde78 SHA512 387a8eb845634e8568a3e98f44f9b92bd7819870ebb6cb57b28e96c0df022b4436074fa526771f5e6793ce59c010c0c0437abb63f03ec9890bca3c301afcf9ee
diff --git a/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch b/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch
deleted file mode 100644
index 80f000c5f43e..000000000000
--- a/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/config/Makefile.SH
-+++ b/config/Makefile.SH
-@@ -74,12 +74,12 @@ case "$which_graphic_lib" in
- ps|svg|none)
-   graph=plot$which_graphic_lib;;
- Qt4)
--  PLOTCFLAGS="\$(QTINC)"
--  PLOTLIBS="\$(QTLIB) $QTLIBS"
-+  PLOTCFLAGS="`${PKG_CONFIG} --cflags QtGui`"
-+  PLOTLIBS="`${PKG_CONFIG} --libs QtGui`"
-   graph=plotQt4;;
- fltk)
--  PLOTCFLAGS=
-+  PLOTCFLAGS="`fltk-config --cxxflags` $X11_INC"
-   PLOTLIBS="$FLTK_LIBS"
-   postconfig='fltk-config --post '
-   graph=plotfltk;;
- win32)
-@@ -267,7 +267,7 @@ RLLIBS    = $RLLIBS
- # GMP
- GMPINCLUDE = $GMPINCLUDE
- # Graphic library.
--QTMOC      = $QTMOC
-+QTMOC      = "`which moc`"
- QTINC      = $QTINC
- QTLIB      = $QTLIB
- PLOTCFLAGS = $PLOTCFLAGS
---- a/config/get_config_options
-+++ b/config/get_config_options
-@@ -86,6 +86,7 @@ while test $# -gt 0; do
-   --with-ncurses-lib=*|--with-ncurses=*)
-       with_ncurses_lib=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
- 
-+  --without-qt|--with-qt=no) without_qt=yes ;;
-   --with-qt) with_qt=yes ;;
-   --with-qt=*)
-       with_qt=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-@@ -94,6 +95,7 @@ while test $# -gt 0; do
-   --with-qt-include=*)
-       with_qt_include=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
- 
-+  --without-fltk|--with-fltk=no) without_fltk=yes ;;
-   --with-fltk) with_fltk=yes ;;
-   --with-fltk=*)
-       with_fltk=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-@@ -172,10 +174,12 @@ Optional libraries:
-   --with-gmp-lib=DIR          specify location of gmp libs
- 
-   --with-qt[=DIR]            use the Qt graphical library [prefix for Qt dir.]
-+  --without-qt               do not try to use the Qt lib
-   --with-qt-include=DIR      specify location of Qt headers
-   --with-qt-lib=DIR          specify location of Qt libs
- 
-   --with-fltk                use the FLTK graphical library [need fltk-config]
-+  --without-fltk             do not try to use the FLTK lib
- 
- Miscellaneous
-   --with-runtime-perl[=path-to-perl-binary] for gphelp / tex2mail
---- a/config/get_graphic_lib
-+++ b/config/get_graphic_lib
-@@ -7,6 +7,7 @@ FLTK_LIBS QTDIR QTLIB"
- 
- if test -n "$with_fltk"; then which_graphic_lib=fltk; fi
- if test -n "$with_qt";   then which_graphic_lib=Qt; fi
-+if test -n "$without_fltk" -a -n "$without_qt"; then which_graphic_lib=none; fi
- if test "$fastread" != yes; then
-   cat << EOT
- ==========================================================================
diff --git a/sci-mathematics/pari/files/pari-2.9.4-fltk-detection.patch b/sci-mathematics/pari/files/pari-2.9.4-fltk-detection.patch
deleted file mode 100644
index 26e146e032a6..000000000000
--- a/sci-mathematics/pari/files/pari-2.9.4-fltk-detection.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/config/get_fltk b/config/get_fltk
-index 87d0c1d..22f5bd8 100644
---- a/config/get_fltk
-+++ b/config/get_fltk
-@@ -2,13 +2,16 @@ if test -z "$with_fltk"; then
-   with_fltk=yes
- fi
- 
-+cmd="FLTK_CXXFLAGS=\`fltk-config --cxxflags\`"
-+. log_cmd
-+
- cmd="FLTK_LIBS=\`fltk-config --ldflags\`"
- . log_cmd
- 
- exe=$osname-$arch-fltk$$$exe_suff
- cxx=$CXX
- if test -z "$cxx"; then cxx=g++; fi;
--cmd="$cxx $CFLAGS $FLTK_LIBS -o $exe has_fltk.c"
-+cmd="$cxx $CFLAGS $FLTK_CXXFLAGS $FLTK_LIBS -o $exe has_fltk.c"
- . log_cmd
- if test -r "$exe"; then
-   echo "Using FLTK library"
diff --git a/sci-mathematics/pari/pari-2.15.4-r1.ebuild b/sci-mathematics/pari/pari-2.15.4-r1.ebuild
deleted file mode 100644
index 07ec717b7ad5..000000000000
--- a/sci-mathematics/pari/pari-2.15.4-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Computer-aided number theory C library and tools"
-HOMEPAGE="https://pari.math.u-bordeaux.fr/"
-SRC_URI="https://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-# Their LICENSE file says "or (at your option) any later version"
-LICENSE="GPL-2+"
-
-# The subslot is the value of $soname_num obtained from
-# upstream's config/version script.
-SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="data doc examples fltk gmp test threads X"
-REQUIRED_USE="fltk? ( !X )" # mutually exclusive plot implementations
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )
-"
-DEPEND="
-	sys-libs/readline:0=
-	data? ( sci-mathematics/pari-data )
-	doc? ( X? ( x11-misc/xdg-utils ) )
-	fltk? ( x11-libs/fltk:1= )
-	gmp? ( dev-libs/gmp:0= )
-	X? ( x11-libs/libX11:0= )"
-RDEPEND="${DEPEND}"
-
-# Both of these should be obsolete in the next version. I've sent the
-# fltk CXXFLAGS bit upstream, and using --graphic=<foo> hopefully works
-# around the automagic parts.
-PATCHES=(
-	"${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch
-	"${FILESDIR}/${PN}"-2.11.2-no-automagic.patch
-)
-
-src_prepare() {
-	default
-
-	# move doc dir to a gentoo doc dir and replace acroread by xdg-open
-	sed -i \
-		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
-		-e 's:"acroread":"xdg-open":' \
-		doc/gphelp.in || die "Failed to fix doc dir"
-
-	# These tests fail when LaTeX is not installed (which we don't
-	# require without USE=doc), most likely due to output formatting
-	# issues but I haven't deleted my LaTeX installation to check.
-	# There's no real upstream support for enabling/disabling the LaTeX
-	# docs, so this is probably the correctest way to skip these tests.
-	if ! use doc; then
-		rm src/test/{in,32}/help || die
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX PKG_CONFIG
-
-	# Workaraound to "asm operand has impossible constraints" as
-	# suggested in bug #499996.
-	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
-
-	# sysdatadir installs a pari.cfg stuff which is informative only.
-	# It is supposed to be for "architecture-dependent" data.  It needs
-	# to be easily discoverable for downstream packages such as gp2c.
-	# We set LD="" and DLLD="$CC" so that the "shared library linker"
-	# always gets set to the value of the compiler used. Pari's build
-	# system does not cope very well with a naked linker, it is
-	# expecting a compiler driver. See bugs 722090 and 871117.
-	# DLLDFLAGS, on the other hand, is used exactly like LDFLAGS would
-	# be in a less-weird build system.
-	#
-	# There's a lot of automagic involved in the graphics detection.  We
-	# first pass --graphic=none, which disables some of it. We then pass
-	# --graphic=fltk (or --graphic=X11) only if USE=fltk (or USE=X) is
-	# set. This is a stronger hint to the build system than --with-fltk
-	# would be, and importantly does not rely on the corresponding but
-	# nonexistent(!) option option for X11.
-	LD="" DLLD="$(tc-getCC)" DLLDFLAGS="${LDFLAGS}" ./Configure \
-		--prefix="${EPREFIX}"/usr \
-		--datadir="${EPREFIX}/usr/share/${PN}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--sysdatadir="${EPREFIX}"/usr/share/pari \
-		--mandir="${EPREFIX}"/usr/share/man/man1 \
-		--with-readline="${EPREFIX}"/usr \
-		--with-readline-lib="${EPREFIX}/usr/$(get_libdir)" \
-		--with-ncurses-lib="${EPREFIX}/usr/$(get_libdir)" \
-		--graphic=none \
-		$(usex X --graphic=X11 "" "" "") \
-		$(usex fltk --graphic=fltk "" "" "") \
-		$(use_with gmp) \
-		$(usex threads "--mt=pthread" "" "" "") \
-		|| die "./Configure failed"
-}
-
-src_compile() {
-	emake gp
-
-	if use doc; then
-		# To prevent sandbox violations by metafont
-		VARTEXFONTS="${T}/fonts" emake docpdf
-	fi
-}
-
-src_test() {
-	# Welcome to the jungle, where the tests fail if you make your
-	# terminal bigger.
-	emake COLUMNS=80 test-all
-}
-
-src_install() {
-	DOCS=( AUTHORS CHANGES* COMPAT NEW README* )
-
-	# Install examples to a junk location by default because "make
-	# install-nodata" includes the examples with it. Only if the user
-	# has USE=examples set do we provide the correct directory.
-	local exdir="${T}"
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		exdir="${ED}/usr/share/doc/${PF}/examples"
-	fi
-
-	# Use "true" in place of "strip" to sabotage the unconditional
-	# binary stripping.
-	emake DESTDIR="${D}" \
-		  EXDIR="${exdir}" \
-		  STRIP="true" \
-		  install-nodata install-data
-	einstalldocs
-
-	if use doc; then
-		docompress -x "/usr/share/doc/${PF}"
-		emake \
-			DESTDIR="${D}" \
-			DOCDIR="${ED}/usr/share/doc/${PF}" \
-			install-docpdf install-doctex
-	fi
-}
diff --git a/sci-mathematics/pari/pari-2.15.5.ebuild b/sci-mathematics/pari/pari-2.15.5.ebuild
index 6c8fe6f9b29e..73e003b95f44 100644
--- a/sci-mathematics/pari/pari-2.15.5.ebuild
+++ b/sci-mathematics/pari/pari-2.15.5.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 # The subslot is the value of $soname_num obtained from
 # upstream's config/version script.
 SLOT="0/8"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="data doc examples fltk gmp test threads X"
 REQUIRED_USE="fltk? ( !X )" # mutually exclusive plot implementations
 RESTRICT="!test? ( test )"