gentoo resync : 16.01.2018

6 files changed, 105 insertions, 176 deletions

diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 7256b17c1de5..561ae94ca2dc 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,14 +1,13 @@
+AUX pari-2.9.4-no-automagic.patch 2638 BLAKE2B a0e88763f7f69d6d284286961ad90719cf0a02e533164342dbc34206c44dd447cc1ee5aac27dbd0f61c850082f0d19049886fe9d05676ef506e6154c5395c03f SHA512 1f9ded97ebffa20a248ad86c635e90fc2e38d318a7d47caa27c695b153dbefe2107d6a2e67d87653f4d0c703b047073b025e01a528b7ef4422d50a96aaf8b3fd
+AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
+AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
 DIST elldata.tgz 14185595 BLAKE2B eb90a0e392eeeaad81b6b01ba4e8258aaf2a4b4a01950b18a0e91f176629aecc693453d8fe99b49a28f2dfbbb6fae1a06d7d4137cb13ced298e64e5aa4062f53 SHA512 dc13d1cacb98a6c2774936997452bd34ae198da9206fea69bc7cdd28240d0cdd07bb0ec1f14b8e97bea4321a60a6a6144464ab3b629be2e37dd76a73efaf43ef
 DIST galdata.tgz 53229 BLAKE2B 08f0a1be3c5252fbe534b2ed7e66b9bc8cddab807b7caf12b783aacc2e75de82dc000e762da2ec895d52424281234af121e1edfd84adf9f02c26c4e59d23e2f3 SHA512 bc89c8a42416e8ca25c356b7ad6d80ffcfff127e561fc338df87147a9e370ec71f7ae2eb6bef73d634cc7a8f18c794d7fd5ebfd0a042d3d356526a2eee28125a
 DIST nftables.tgz 8393731 BLAKE2B d33cbf1f52d3e8a040087da28014ab727b59c641d1a53c97d311a9d1613b59f6b317b7632e0fc89943bea0a507a737543890109b888707c4fb7879279549a2e9 SHA512 cccc62fb0f6d8c578a4e165a1f2daf3b87acbbc38377044ddd98e2901a8e0554a46c8714bad0f4f4e09107b0c0c8f43069b4ddf4fba9c7832bad65ce3c901183
 DIST pari-2.3.5-patchset.tar.bz2 1773 BLAKE2B 08358dcb7e353eb41a784a6daa9400b74b8f331a54eea8ef159fbbecdbed5d00955a821db20e3a4f7e254160cd600d0255d6648aa0e1b2b7aca9910d5cd17f1d SHA512 f616eac3049fea684413f8f221a1604a5e62ae2804207513fcfff513d8b162a3a4d1063dad059907682404ee30f840182d75e29a44b44cda4f80266b46f75364
 DIST pari-2.3.5.tar.gz 2018097 BLAKE2B b5f4f8bc83cd77aceab791263e1a2f0294d0663d354fea454bad8cac3cdbac9c4c8381cc83bc947d518522701c36e94ce1d6862125a9bfd3b17b1a31c9baabc8 SHA512 0e49e6310b4c76ef3370786a13aa8cbc5bb0b7dc84ec1665866d623e6284f45db8584eea759e8b5954dc9b5c8a3e866e77a377d18073ed33f11708a7e88a4cca
-DIST pari-2.5.4-patchset.tar.bz2 11050 BLAKE2B 0ea4727bb03045c7cda9b39cd429db8ea1b8d9e2656cf81fb4d401abc57803d8a6b4c538727f6744dd75c6b95530a0cca058cfdb0e85d4b9eaf39e7d43a14929 SHA512 5b70b6e15e651118c5dba339601eee1b8dfe55eb37f30d0b350d73eef33a4119ba366ba48fa171e450e27af2823b96d8006aadf0f994ae76002f98a76adcf6bb
-DIST pari-2.5.4.tar.gz 2721861 BLAKE2B 003113716c4aaea3836ee7f813ff4aacecb40e6c7d9119c0a6d6073f951e6c5fae887ee22d87d5c7d7320e0d873585f145dd14e7014075bf198143dde68325f9 SHA512 de2f0593682d638288908636d848489acf115f4858b91c574168db26c4ab7443465a21d1e6c43be19ecc57dcedcd883e5af72b65467a59a2c8811e4eec64e0b9
-DIST pari-2.7.1-patchset.tar.bz2 4318 BLAKE2B 881354eec4f89f7b7e0a1d53d5fa169b0ea0de3964baff454f2e7aca1b7bd2e7ffa2f404e4df7a8ff7a662aed3920e10df4a3a1d5d86967579c360869abce557 SHA512 1ff40adcf638230e1aca951b4fdb291cd4d2048ef66215de0ec157b9ec0040e28c115c2684056cf582695e66ee8363aa776a4a50f8654c8dde7bad490a47b304
-DIST pari-2.7.1.tar.gz 3140893 BLAKE2B 0f5c69ac2decb0ac26f51de7843c282606f854c257b06d1596eb7f4157e8f64d65b65f887e2d9bb8b77cbdffdac0bb1902e373b1d44e457ac25993bc308d3e09 SHA512 ff32c181e6810af8a38f0dfe45b9f15d930923da5759c3e88595f56bf3c65ec0a79fdb9fb5f0e4ce0adb1ebc56a84e6b1606085057762073a85c0d1946857d5f
+DIST pari-2.9.4.tar.gz 3851772 BLAKE2B 648e7fd14888bed2dfb7bbb9a25d097aa91899780da9734b444e29997916c27773109e735ecb2d3e9d164a596f3bb8da607d83f278e52d84c49a56df5c89b530 SHA512 539534496e9733bd905b6131374eef8019f93398423710d339bd3c01245e1af675a0a3f9489a05c3ceb2cf3b3426e6b1fb11ea4886b76a1b2e793b59f52e8787
 DIST seadata.tgz 19214199 BLAKE2B cafb89905180ff481f578ff2cdb150b04533ecbccfa96d045bdb61e5fe2c230262f3459d31b11f049ad1e16ed9dd6fb734569ee621efa3831800cc3d99583e60 SHA512 393f2fae45964ad0921fcf417113e10b296cb4c3a0e0eec138c896827f43a5464c4b42a07313e0f3a4383e8df97912e2e359a4cd5225d014d7575e80c7dd996a
 EBUILD pari-2.3.5.ebuild 3950 BLAKE2B ae0e6d47d07e75865d4d7352ea336582a605f26a786f353925378b80a6a2049f6b4c085402859f5a4fe48389473ce7f7445e4691bd8b133bb167e2ada8d01207 SHA512 cdd3fe315addc1620c8fafaa211697171f9859d66d7019544a3cfd4b21102b23701eb2c1d159ab47f548caacd3f3513d939e14f4e94ab28a95be3d6a584f8e27
-EBUILD pari-2.5.4.ebuild 4430 BLAKE2B 4c303b5a150752a837ac1f67217e91a606dca3063be97c919c71b39c48a64bdd97b6d6b278fddbe9ffc2fc6a735f508afd48b0714360c1be6dc0ff1d7c27a67a SHA512 141e30e638ab119fb46bb8a1632ff5ae6e9f026ee4806bcecc35ae27c4aa9e47014b229a67718fef92d8397bce7eaed1d0bf37606ce6029dbc0a216df4b29520
-EBUILD pari-2.7.1.ebuild 4166 BLAKE2B a3423c5d16f663125b10640b1394a382e742e4fe5cc754516aab88ea17adcefbc41e7581a8a0e488ed6d715fcbac7dedb3f1e8014e8105280f0e0725fce423e2 SHA512 21b57078628b8654d187cb00258da87e7a78bb420c89691680b711c8b7d4e482ebb3ffa4eb5ca389e1e1f78e0e8642e1741a43942b73e4ab3d0f6df6cece767c
+EBUILD pari-2.9.4.ebuild 3477 BLAKE2B c6c67a3d566a3772086f27e80c7dd6125f4ed33df583a45194cb903b8256007062c1e43330246f442607114a926bea8f925a98641568beb0d72ffccede8a5fc1 SHA512 7c85feed4950b02e8fab5d5cac9ed517a94fccfc800741f6e473db13af65f20a423e019b13aa951fded5611eae2906e119d931a1be4ecfce9e3ec4af7a40107d
 MISC metadata.xml 1223 BLAKE2B 57268bb1e2649602e4a6228924f0ea7b32d8fea2718f83595b971e1d5338a8cdd8b91ecf245401f2eefbf206b80dde0e56784d8e147128733fa45dc7edd2eece SHA512 3bb69fc9e0757e6fd1ed9f9394565a34269cd9ccc8dc2ce88283e2f2da8b4ef586b20fb914be28a4b3617ff074319f5925e0fc7a1e264b655303e943a63d6bfe
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
new file mode 100644
index 000000000000..3612d8f020fc
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch
@@ -0,0 +1,66 @@
+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/files/pari-2.9.4-ppc.patch b/sci-mathematics/pari/files/pari-2.9.4-ppc.patch
new file mode 100644
index 000000000000..558f7eb9eda4
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.9.4-ppc.patch
@@ -0,0 +1,9 @@
+diff -r -U2 pari-2.9.4.orig/config/arch-osname pari-2.9.4/config/arch-osname
+--- pari-2.9.4.orig/config/arch-osname	2011-09-23 03:02:11.000000000 +0700
++++ pari-2.9.4/config/arch-osname	2018-01-13 16:22:39.623382825 +0700
+@@ -40,4 +40,5 @@
+   linux)    arch=`uname -m`
+ 	    case $arch in
++		ppc) arch=powerpc;;
+ 		sparc64) arch=sparcv9;;
+ 		parisc*) arch=hppa;;
diff --git a/sci-mathematics/pari/files/pari-2.9.4-strip.patch b/sci-mathematics/pari/files/pari-2.9.4-strip.patch
new file mode 100644
index 000000000000..f4a8af322c45
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.9.4-strip.patch
@@ -0,0 +1,10 @@
+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 16:18:04.208394407 +0700
+@@ -250,5 +250,5 @@
+ LN = $ln_s
+ CP_F = cp -f
+-STRIP      = strip
++STRIP      = true
+ STRIPFLAGS =
+ 
diff --git a/sci-mathematics/pari/pari-2.5.4.ebuild b/sci-mathematics/pari/pari-2.5.4.ebuild
deleted file mode 100644
index 78f5d5418c9c..000000000000
--- a/sci-mathematics/pari/pari-2.5.4.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="Computer-aided number theory C library and tools"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="data doc fltk gmp qt4 X"
-
-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= )
-	qt4? ( dev-qt/qtgui:4 )
-	X? ( x11-libs/libX11 )"
-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}"
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-strip.patch
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
-	# fix parallel make
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-doc-make.patch
-	# sage error handling patch
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-mp.c.patch
-	# OS X: add -install_name to the linker option
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-macos.patch
-	# Fix Perl 5.26
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-no-dot-inc.patch
-	# fix automagic
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.1-no-automagic.patch
-	# sage-on-gentoo trac 13902: Slowdown for PARI integer determinant
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.4-slow_determinant.patch
-	# sage-on-gentoo trac 13054: polred bug / pari bug 1395
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.4-polred.patch
-
-	# 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"
-
-	sed -i "s:/\(usr\|lib64\):${EPREFIX}/\1:g" \
-		config/get_{Qt,X11,include_path,libpth} \
-		|| die "Failed to fix get_X11"
-
-	# usersch3.tex is generated
-	rm doc/usersch3.tex || die "failed to remove generated file"
-}
-
-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) \
-		$(use_with qt4 qt) \
-		|| die "./Configure failed"
-}
-
-src_compile() {
-	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
-		cd "${S}" || die "failed to change directory"
-		# To prevent sandbox violations by metafont
-		VARTEXFONTS="${T}"/fonts emake docpdf
-	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.
-		local installdir=$(get_compile_dir)
-		cd "${installdir}" || die "failed to change directory"
-		emake EXDIR="${ED}/usr/share/doc/${PF}/examples" install-examples
-	fi
-}
diff --git a/sci-mathematics/pari/pari-2.7.1.ebuild b/sci-mathematics/pari/pari-2.9.4.ebuild
index 8a6913099592..37593bb6748b 100644
--- a/sci-mathematics/pari/pari-2.7.1.ebuild
+++ b/sci-mathematics/pari/pari-2.9.4.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
-
 LICENSE="GPL-2"
-SLOT="0/4"
+SLOT="0/5"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="data doc fltk gmp qt4 X"
+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=
@@ -21,7 +19,6 @@ RDEPEND="
 	doc? ( X? ( x11-misc/xdg-utils ) )
 	fltk? ( x11-libs/fltk:1= )
 	gmp? ( dev-libs/gmp:0= )
-	qt4? ( dev-qt/qtgui:4= )
 	X? ( x11-libs/libX11:0= )"
 DEPEND="${RDEPEND}
 	doc? ( virtual/latex-base )"
@@ -34,19 +31,13 @@ get_compile_dir() {
 	echo "O${osname}-${arch}"
 }
 
+PATCHES=( "${FILESDIR}"/${P}-strip.patch
+		  "${FILESDIR}"/${P}-ppc.patch
+		  "${FILESDIR}"/${P}-no-automagic.patch
+		)
+
 src_prepare() {
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-strip.patch
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
-	# fix parallel make
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-doc-make.patch
-	# fix automagic
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-no-automagic.patch
-	# sage-on-gentoo trac 15654: PARI discriminant speed depends on stack size
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-slow-discriminant.patch
-	# Fix Perl 5.26
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-no-dot-inc.patch
-	# fix building docs with perl-5.22
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.1-perl-5.22-doc.patch
+	default
 
 	# disable default building of docs during install
 	sed -i \
@@ -62,9 +53,6 @@ src_prepare() {
 		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
 		-e 's:"acroread":"xdg-open":' \
 		doc/gphelp.in || die "Failed to fix doc dir"
-
-	# usersch3.tex is generated
-	rm doc/usersch3.tex || die "failed to remove generated file"
 }
 
 src_configure() {
@@ -89,7 +77,7 @@ src_configure() {
 		--with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
 		$(use_with fltk) \
 		$(use_with gmp) \
-		$(use_with qt4 qt) \
+		--without-qt \
 		|| die "./Configure failed"
 }
 
@@ -109,9 +97,9 @@ src_compile() {
 		CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
 
 	if use doc; then
-		cd "${S}" || die "failed to change directory"
-		# To prevent sandbox violations by metafont
-		VARTEXFONTS="${T}"/fonts emake docpdf
+		pushd "${S}" > /dev/null || die "failed to change directory"
+		VARTEXFONTS="${T}"/fonts emake -j1 docpdf
+		popd > /dev/null || die
 	fi
 }