commit: 266f4febeddcf7bd2ae04f3e2cc8b53ea1ca64e2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Thu Feb 27 21:03:34 2020 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Thu Feb 27 21:03:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=266f4feb
sci-mathematics/pari: drop old unstable v2.9.4. We lost the ~arm keyword somewhere in the upgrade. I filed a keyword request to see if pari still works on arm. Bug: https://bugs.gentoo.org/710994 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> sci-mathematics/pari/Manifest | 1 - .../pari/files/pari-2.9.4-no-automagic.patch | 66 ----------- sci-mathematics/pari/pari-2.9.4-r1.ebuild | 126 --------------------- 3 files changed, 193 deletions(-) diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest index 66779145ec1..c679cd11326 100644 --- a/sci-mathematics/pari/Manifest +++ b/sci-mathematics/pari/Manifest @@ -1,2 +1 @@ DIST pari-2.11.2.tar.gz 4433038 BLAKE2B 89fd8c14d6ee8c8640432bec75e10b79897f0180212dcb1b04b654478a3258fc13a7f982bcb400e28997934a21667c0c3cb08fdb2e843a80a24c6499feafb639 SHA512 22f5a6ecad6d9b8b337c2655f538a196a0460f6fe98256d0f49557ce7b843f6b27ad364f45a9472aaafee9506386c886f1f0d62697078e501ec465151d4d10a1 -DIST pari-2.9.4.tar.gz 3851772 BLAKE2B 648e7fd14888bed2dfb7bbb9a25d097aa91899780da9734b444e29997916c27773109e735ecb2d3e9d164a596f3bb8da607d83f278e52d84c49a56df5c89b530 SHA512 539534496e9733bd905b6131374eef8019f93398423710d339bd3c01245e1af675a0a3f9489a05c3ceb2cf3b3426e6b1fb11ea4886b76a1b2e793b59f52e8787 diff --git a/sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch b/sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch deleted file mode 100644 index 3612d8f020f..00000000000 --- a/sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -r -U2 pari-2.9.4.orig/config/Makefile.SH pari-2.9.4/config/Makefile.SH ---- pari-2.9.4.orig/config/Makefile.SH 2017-11-09 16:26:14.000000000 +0700 -+++ pari-2.9.4/config/Makefile.SH 2018-01-13 17:31:02.404210285 +0700 -@@ -80,10 +80,10 @@ - graph=plotQt;; - Qt4) -- PLOTCFLAGS='-D__FANCY_WIN__ -I$(QTDIR)/include' -- PLOTLIBS="-L\$(QTDIR)/lib $QTLIB" -+ PLOTCFLAGS='-D__FANCY_WIN__ `pkg-config --cflags QtGui`' -+ PLOTLIBS="`pkg-config --libs QtGui`" - graph=plotQt4;; - fltk) -- PLOTCFLAGS= -- PLOTLIBS="$FLTK_LIBS" -+ PLOTCFLAGS="`fltk-config --cxxflags` $X11_INC" -+ PLOTLIBS="`fltk-config --ldflags`" - postconfig='fltk-config --post ' - graph=plotfltk;; -@@ -277,5 +277,5 @@ - # Graphic library. - QTDIR = "$QTDIR" --MOC = \$(QTDIR)/bin/moc -+MOC = "`which moc`" - PLOTCFLAGS = $PLOTCFLAGS - PLOTLIBS = $PLOTLIBS -diff -r -U2 pari-2.9.4.orig/config/get_Qt pari-2.9.4/config/get_Qt ---- pari-2.9.4.orig/config/get_Qt 2017-05-12 16:45:12.000000000 +0700 -+++ pari-2.9.4/config/get_Qt 2018-01-13 17:35:49.481198212 +0700 -@@ -6,5 +6,5 @@ - yes) - pth="/usr/local/lib /usr/local/share /usr/lib /usr/share" -- QTDIR=`locatedir qt4/bin $pth` -+ QTDIR=`locatedir qt4 $pth` - if test -n "$QTDIR"; then - QTLIB="-lQtCore -lQtGui" -diff -r -U2 pari-2.9.4.orig/config/get_config_options pari-2.9.4/config/get_config_options ---- pari-2.9.4.orig/config/get_config_options 2017-11-09 16:26:14.000000000 +0700 -+++ pari-2.9.4/config/get_config_options 2018-01-13 17:38:39.264191072 +0700 -@@ -87,8 +87,10 @@ - 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]*=//'` ;; - -+ --without-fltk|--with-fltk=no) without_fltk=yes ;; - --with-fltk) with_fltk=yes ;; - --with-fltk=*) -@@ -168,5 +170,7 @@ - - --with-qt[=DIR] use the Qt graphical library [prefix for Qt dir.] -+ --without-qt do not try to use the Qt lib - --with-fltk use the FLTK graphical library [need fltk-config] -+ --without-fltk do not try to use the FLTK lib - - Miscellaneous -diff -r -U2 pari-2.9.4.orig/config/get_graphic_lib pari-2.9.4/config/get_graphic_lib ---- pari-2.9.4.orig/config/get_graphic_lib 2017-11-09 16:26:14.000000000 +0700 -+++ pari-2.9.4/config/get_graphic_lib 2018-01-13 17:42:45.760180706 +0700 -@@ -8,4 +8,5 @@ - 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/pari-2.9.4-r1.ebuild b/sci-mathematics/pari/pari-2.9.4-r1.ebuild deleted file mode 100644 index 84317023bfd..00000000000 --- a/sci-mathematics/pari/pari-2.9.4-r1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic toolchain-funcs multilib - -DESCRIPTION="Computer-aided number theory C library and tools" -HOMEPAGE="http://pari.math.u-bordeaux.fr/"; -LICENSE="GPL-2" -SLOT="0/5" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" -IUSE="data doc fltk gmp X" -SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"; - -RDEPEND=" - 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= )" -DEPEND="${RDEPEND} - doc? ( virtual/latex-base )" - -get_compile_dir() { - pushd "${S}/config" > /dev/null - local fastread=yes - source ./get_archos - popd > /dev/null - echo "O${osname}-${arch}" -} - -PATCHES=( "${FILESDIR}"/${P}-strip.patch - "${FILESDIR}"/${P}-ppc.patch - "${FILESDIR}"/${P}-no-automagic.patch - "${FILESDIR}"/${P}-fltk-detection.patch - ) - -src_prepare() { - default - - # disable default building of docs during install - sed -i \ - -e "s:install-doc install-examples:install-examples:" \ - config/Makefile.SH || die "Failed to fix makefile" - - # propagate ldflags - sed -i \ - -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \ - config/get_dlld || die "failed to fix LDFLAGS" - # 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" -} - -src_configure() { - tc-export CC - export CPLUSPLUS=$(tc-getCXX) - - # need to force optimization here, as it breaks without - if is-flag -O0; then - replace-flags -O0 -O2 - elif ! is-flag -O?; then - append-flags -O2 - fi - - # sysdatadir installs a pari.cfg stuff which is informative only - ./Configure \ - --prefix="${EPREFIX}"/usr \ - --datadir="${EPREFIX}"/usr/share/${PN} \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \ - --mandir="${EPREFIX}"/usr/share/man/man1 \ - --with-readline="${EPREFIX}"/usr \ - --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \ - $(use_with fltk) \ - $(use_with gmp) \ - --without-qt \ - || die "./Configure failed" -} - -src_compile() { - use hppa && \ - mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm - - mycxxmake=LD\=$(tc-getCXX) - - local installdir=$(get_compile_dir) - cd "${installdir}" || die "failed to change directory" - # upstream set -fno-strict-aliasing. - # aliasing is a known issue on amd64, work on x86 by sheer luck - emake ${mymake} \ - CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn - emake ${mymake} ${mycxxmake} \ - CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp - - if use doc; then - pushd "${S}" > /dev/null || die "failed to change directory" - VARTEXFONTS="${T}"/fonts emake -j1 docpdf - popd > /dev/null || die - fi -} - -src_test() { - emake dobench -} - -src_install() { - emake ${mymake} ${mycxxmake} DESTDIR="${D}" install - dodoc MACHINES COMPAT - if use doc; then - # install gphelp and the pdf documentations manually. - # the install-doc target is overkill. - dodoc doc/*.pdf - dobin doc/gphelp - insinto /usr/share/doc/${PF} - # gphelp looks for some of the tex sources... - doins doc/*.tex doc/translations - # Install the examples - for real. - emake EXDIR="${ED}/usr/share/doc/${PF}/examples" \ - -C $(get_compile_dir) install-examples - fi -}
