USE=-emacs was hanging in src_install. Patch by ulm, fixing bug #335898

Package-Manager: portage-2.2_rc81/cvs/Linux x86_64

9 files changed, 31 insertions, 507 deletions

diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 19f720d080b2..baab7b131111 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -17,13 +17,13 @@ DIST maxima-5.21.1.tar.gz 21371967 RMD160 8892d142fd59aa756ba77d124340f075a1785b
 EBUILD maxima-5.18.1.ebuild 4200 RMD160 bb72c55e6752c9df03441e315d02fa6c23507347 SHA1 43ebda024310395ebb10e6da8329610cc964a5e2 SHA256 3d326b70d8951163b70c7129c1ec3dbb8af67f1b0d3718662a8d6f723fe361f1
 EBUILD maxima-5.19.2.ebuild 4349 RMD160 1d5d96b26d80aa86f46a22b41967a3b0faa6d7e0 SHA1 91a37a8c838c74fcea8175de71ee53f393f56546 SHA256 7d636ec1966a99b319c42122781dcc37ddbc3d46735dcf7183a1b940fe621237
 EBUILD maxima-5.20.1-r2.ebuild 4634 RMD160 f67e491c8580d8a76c071b739ae3513aac6a5468 SHA1 bf319fec2ecc2f56e88a1a0790b8267e71c0598a SHA256 bfb9e1f31426f32bfefecbef9a0e2a2777a5afb7031a9e02777c1244e034d178
-EBUILD maxima-5.21.1-r1.ebuild 4627 RMD160 dbc6145a1bdc58102de45a5375211a35ddb960cb SHA1 ed3cd8c73b16009517b6844bd6259c1c87c08e51 SHA256 9b7ca96fe77799fef9423c30a7a56d38475d92f0395b2646c916554b6a9865ee
-MISC ChangeLog 17823 RMD160 650cf7514cc932be3e53f03e5a22cbd303273806 SHA1 e0abd97ec6e7f0cae2f15d2fdf4319be1f90a7de SHA256 dccacb9a2fed0fbb03aee9da6c9345e29110efd007bf0890186976e84b5b4914
+EBUILD maxima-5.21.1-r1.ebuild 4666 RMD160 ced13c6036484ca4f585bf7f8bfd3efef349f940 SHA1 d8cb40a71c16577bc6873ab9fe875142a886d381 SHA256 e2082903828a0160eebc40128565d7e379992f57d3d32b2bd9c93c8c8eab6e2c
+MISC ChangeLog 17984 RMD160 97a67480bbe6d679d9ac558be95bb1d170b19748 SHA1 04e51b729e1d475fa7f490ca615575c878cf5aae SHA256 fceec6814d86f15c6d41ce4cf1ea809af3461c9b00480ef4beb6d2362ad7924d
 MISC metadata.xml 1305 RMD160 f122993d0ee80a6dfdab27259d69301c609aaba0 SHA1 a647a1d994e0f0e54459c13a254d1be27eebffda SHA256 b82b31cf0892ff000778cb002578d135f119a14024ee0b4c5d206381ca3e796a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwXoEMACgkQgAnW8HDreRbAxwCcDjBfEv4rAWbpLcrVrvt10IPH
-VJAAnRiQ5dOLo87fVW4OnCDbOKQtwOh7
-=PfWR
+iEYEARECAAYFAkyPsFEACgkQ1ycZbhPLE2C8rwCeNjs7vshQCsZOboyoFCANDC+v
+J4AAoJJYYhjBhOIO/BgbnDl7jPzkZ63T
+=U6n8
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/pari/ChangeLog b/sci-mathematics/pari/ChangeLog
index 55acc89d63f0..c179d3437849 100644
--- a/sci-mathematics/pari/ChangeLog
+++ b/sci-mathematics/pari/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/pari
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.77 2010/05/09 17:26:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.78 2010/09/14 17:21:51 bicatali Exp $
+
+  14 Sep 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -pari-2.1.7-r1.ebuild, -pari-2.3.2.ebuild, -pari-2.3.2-r1.ebuild,
+  -files/pari-2.3.3-alglin.patch, -pari-2.3.4.ebuild, pari-2.3.5.ebuild:
+  USE=-emacs was hanging in src_install. Patch by ulm, fixing bug #335898
 
   09 May 2010; Raúl Porcel <armin76@gentoo.org> pari-2.3.4-r1.ebuild:
   sparc stable
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index cb8ac19a290b..8a9663c06f74 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,20 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50pari-gentoo.el 271 RMD160 e71ae40ba7bc2179bdb963d4300020d6a5f8bf76 SHA1 6956b8771d0bcf632ab59a6cca0a2282368bd03f SHA256 787e2c797c42645de8429cd449040b81563e07681c557bc9433cc4ef287ffe12
 AUX pari-2.3.2-ppc-powerpc-arch-fix.patch 453 RMD160 2522cab3f5a862d6fcf13d6b30b00a420b62d809 SHA1 2861b205fa4b7d7a0adc5fe9f4ec7dd4c728c331 SHA256 3796b8e994f6dda107dd3733ec0769dbe020debc8f24db89f4f740cd3939f64f
 AUX pari-2.3.2-strip.patch 293 RMD160 49660a3edcfd8f73ce5fe78f832262f98348a804 SHA1 85012664fd4c1f092ca08c4a1e174cc05ff09b72 SHA256 e4a63e53734295dbbdcf9ade59c12d49a36317be3b25a223c684221086fce21b
-AUX pari-2.3.3-alglin.patch 696 RMD160 727ffea2a828adb6dd35bf95e569b7e4f21b9999 SHA1 34c02dce440437ece67d5d47d50b7fb616d8e9e5 SHA256 d2d8f3a959259a6528bab4793b2c4371f4de656b7e91932b0a1644fc00df2445
 DIST elldata.tgz 14185595 RMD160 ddac2454fc65b7f5ddfbf1d39d96a3e51b8eef5c SHA1 f9705a2a11f1622ebcc4e6b8f3780af8a178da9e SHA256 4102c23fdbeadc89b47ba31d05fc58cd3c3e0cca216b11ec5c3be1330d4a5218
 DIST galdata.tgz 53229 RMD160 488afbddf7026dd6d0c9ebbed72cb14c8c37173e SHA1 0fe78ed49e197066708a3fc3753b2651107a1264 SHA256 b7c1650099b24a20bdade47a85a928351c586287f0d4c73933313873e63290dd
 DIST nftables.tgz 8393731 RMD160 48a9c48246f91c1983712682937d666ba1ae6458 SHA1 90df66222346b0dbca68925671a374f5e286daeb SHA256 8dd3393ce6b3cfcf599f094f7b22bdffe17c3ba25deb912513d54676bd7cfe92
-DIST pari-2.1.7.tgz 1542137 RMD160 6d7ca649cdd457d96c12e1f9333143d496a78b7e SHA1 dca15bb3ac6dfdcc7934569fe3a65cb16f812a4e SHA256 9142f2cdaf3083c8962f1a5c2bb0e9fe8915f7d9490c03312ac2361c7ea155fa
-DIST pari-2.3.2.tar.gz 2015734 RMD160 d2394fd31bfa6efcbfce25081d75234ccb1005be SHA1 e7c823d393b513ba84bb66b400cbe3811a75a60f SHA256 514799c0722376ba7d163588f091662731bca0a4b3cd2a93d01eb6bec9d1f47a
 DIST pari-2.3.4.tar.gz 2024690 RMD160 d3bf1f24c0f321ccee309bc2b4c15c8a263fb73f SHA1 0c97456c5fc7e9fe774ceb44aaf77e9ba9574ae6 SHA256 284b241f65ea011942b50655c2e8036cdde66e3a9973d08acd50835debaf545d
 DIST pari-2.3.5.tar.gz 2018097 RMD160 488adf3af5398d0ab5390eb86b65cd79bd1044c5 SHA1 f211ccfe42a4b18dbcde832dfd1ece6f477f4966 SHA256 47ddae1af73b4476660d2a89338483949067a97ffb8758c82e8189dfa4c89d88
 DIST seadata.tgz 8286706 RMD160 7ff7c3cd5dc46157f2cd7b3ffd286b78156435cd SHA1 587685837a736bc6fb25afc5407102d3e856854e SHA256 0df320a259235af031f7a03e2cc50fa8c272f561a7435cda3f75fc252951b297
-EBUILD pari-2.1.7-r1.ebuild 2753 RMD160 ea1372915253ee3128abd3281f5b94983afeffbd SHA1 3b6010fd6fd74932409b344a9d2d908eb3487ea4 SHA256 abaaa0d3df1610cebf1a3a1ba4dae2d15e65dea85915df87421390e23c856407
-EBUILD pari-2.3.2-r1.ebuild 3040 RMD160 338300e379760838c689afe0c19b4e96d2133168 SHA1 0c71ef662feaed18526721c1a2ddeede7c2a8aac SHA256 0cfdfab38bc4236cca05b08e11e10cb8114dea458f43fb78fa7e0dd5f35c5c8d
-EBUILD pari-2.3.2.ebuild 3001 RMD160 17edc52e93161257af32e564c0e600d24a86ddc0 SHA1 649e35dea512aceb1df65462c9ce124bd24a1230 SHA256 32daa33c1e5c70965a5cb11434badf084b34ed821f3df08fbcb89f53d1bc952e
 EBUILD pari-2.3.4-r1.ebuild 4224 RMD160 c3d63e70cba8b1ae2acebe86d0d6506aca831f92 SHA1 92cde2260703cb07d2b6f9ec2f11e623f0420f71 SHA256 87d69eb2f1d475e2c08c0dcc7899e75bc362ca78468fc2d7dcc1c8f1b0e44dbb
-EBUILD pari-2.3.4.ebuild 4051 RMD160 ba0b44e35c2eb5fd9951a7273bcfd9fe3ead3f0c SHA1 785f8bdf24f326826b2417e94aaacf48bbcb924b SHA256 eaf39a40cd534b9f5bb069512bcab84c7ec4047adc57e8f827978fb5db42850b
-EBUILD pari-2.3.5.ebuild 4218 RMD160 94e47016b98fc0e1e8f682294878494a33a38680 SHA1 aa117a851857920542d0d8e6103ee5ff83bade8a SHA256 13cfbbc069ec982612afe53457c5a93463a4fdc26a3e879377c893603a42b24a
-MISC ChangeLog 14209 RMD160 ac286df418ec7db8505cd1382c7fe6cb908c1b02 SHA1 293cf1253d5819eac9d36c6a3c1fd0601bef682f SHA256 b8ee09ce3292f2bdb637a94a439b8dde7c87a92a7933cd23d078f28205ac481a
+EBUILD pari-2.3.5.ebuild 4352 RMD160 983662b59c9d1a8fd9f1c5f878e3b218f990b9e8 SHA1 ef0af6ab4b481f2138a442b69f67d974ffcc5ab0 SHA256 19ec62fb75a8c03f068869daf72fa1e33a58e46132e7bfff52ba19bdba958415
+MISC ChangeLog 14481 RMD160 bd04919bafddd1a6642e28a913b233871f472ada SHA1 872c83fb29a28e8bd043512185608cc479a241f5 SHA256 8603c98abc5b3dbbfd02644c567c3f2666d949a953251fff87b55fedebe5d178
 MISC metadata.xml 1272 RMD160 156e974a85658b4a0b184e4d96efdd9d1f0b226f SHA1 3a5de036ef9c131eda2c76df1754fc61dbd676da SHA256 5ee3f72154d8ecd3469d82ccc687f82dd640f91b124bb81192b8600eee3c7252
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyPrzgACgkQ1ycZbhPLE2CYsACeImefKGiWc3nIpzJTgLfRHO9y
+o0gAn05VUipVqIDZHQjOLZ6Jw0DX8+mG
+=6Fx5
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/pari/files/pari-2.3.3-alglin.patch b/sci-mathematics/pari/files/pari-2.3.3-alglin.patch
deleted file mode 100644
index f0a9acc0fcb9..000000000000
--- a/sci-mathematics/pari/files/pari-2.3.3-alglin.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur pari-2.3.3/src/basemath/alglin2.c pari-2.3.3.new/src/basemath/alglin2.c
---- pari-2.3.3/src/basemath/alglin2.c	2006-10-03 19:15:33.000000000 -0400
-+++ pari-2.3.3.new/src/basemath/alglin2.c	2008-05-06 21:05:06.000000000 -0400
-@@ -3082,11 +3082,9 @@
-     for (i=h[j]; i; i--)
-     {
-       a = gcoeff(A,i,j);
--      if (!signe(a)) continue;
--
-       k = c[i];
--      ZV_elem(a,gcoeff(A,i,k), A,B, j,k);
--      ZM_reduce(A,B, i,k);
-+      if (signe(a)) ZV_elem(a,gcoeff(A,i,k), A,B, j,k);
-+      ZM_reduce(A,B, i,k); /* ensure non-negative entries, even if a = 0 */
-       if (low_stack(lim, stack_lim(av1,1)))
-       {
-         if (DEBUGMEM>1) pari_warn(warnmem,"hnfall[3], j = %ld", j);
diff --git a/sci-mathematics/pari/pari-2.1.7-r1.ebuild b/sci-mathematics/pari/pari-2.1.7-r1.ebuild
deleted file mode 100644
index e7e9efec6975..000000000000
--- a/sci-mathematics/pari/pari-2.1.7-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.1.7-r1.ebuild,v 1.13 2010/05/05 16:07:24 bicatali Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="pari (or pari-gp) : a software package for computer-aided number theory"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/pari/unix/OLD/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="doc emacs"
-
-DEPEND="doc? ( virtual/latex-base )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/docs.patch
-
-	# remove exec stacks for x86; see bug #117434
-	epatch "${FILESDIR}"/pari-non-exec-stack-x86-gentoo.patch
-}
-
-src_compile() {
-	# Fix usage of toolchain
-	tc-getAS; tc-getLD; tc-getCC; tc-getCXX
-
-	# Special handling for sparc
-	local myhost
-	[ "${PROFILE_ARCH}" == "sparc64" ] && myhost="sparc64-linux" \
-		|| myhost="$(echo ${CHOST} | cut -f "1 3" -d '-')"
-	einfo "Building for ${myhost}"
-
-	# 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
-
-	# fix up build scripts to get rid of insecure RUNPATHS
-	# see bug #117434
-	sed -e "s|\$runpathprefix \$TOP/\$objdir:\$tmp||" \
-		-e "s|\$runpathprefix \$tmp||" -i config/Makefile.SH || \
-		die "Failed to fix Makefile.SH"
-	sed -e "s|-L\$libdir|-L./|" -i Configure || \
-		die "Failed to fix Configure"
-
-	./Configure \
-		--host=${myhost} \
-		--prefix=/usr \
-		--miscdir=/usr/share/doc/${PF} \
-		--datadir=/usr/share/${P} \
-		--libdir=/usr/$(get_libdir) \
-		--mandir=/usr/share/man/man1 || die "./configure failed"
-	addwrite "/var/lib/texmf"
-	addwrite "/usr/share/texmf"
-	addwrite "/var/cache/fonts"
-
-	if use hppa
-	then
-		mymake=DLLD\=/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
-	fi
-
-	# Shared libraries should be PIC on ALL architectures.
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/31
-	# Fixes BUG #49583
-	einfo "Building shared library..."
-	cd Olinux-* || die "Bad directory. File a BUG!"
-	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE -fPIC" lib-dyn || die "Building shared library failed!"
-
-	einfo "Building executables..."
-	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp || die "Building executables failed!"
-
-	use doc || rm -rf doc/*.tex
-	use doc && emake doc
-}
-
-src_test() {
-	ebegin "Testing pari kernel"
-	make CFLAGS="-Wl,-lpari" test-kernel > /dev/null
-	eend $?
-}
-
-src_install() {
-	make DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install || die
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp
-		doins emacs/pari.el
-		fi
-	dodoc AUTHORS Announce.2.1 CHANGES README TODO
-}
diff --git a/sci-mathematics/pari/pari-2.3.2-r1.ebuild b/sci-mathematics/pari/pari-2.3.2-r1.ebuild
deleted file mode 100644
index 791c539f7aab..000000000000
--- a/sci-mathematics/pari/pari-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.2-r1.ebuild,v 1.13 2008/08/27 20:04:42 markusle Exp $
-
-inherit elisp-common eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A software package for computer-aided number theory"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/pari/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~mips ppc ppc64 ~sparc ~x86"
-IUSE="doc emacs X"
-
-DEPEND="doc? ( virtual/latex-base )
-		sys-libs/readline
-		X? ( x11-libs/libX11 )
-		emacs? ( virtual/emacs )"
-SITEFILE=50${PN}-gentoo.el
-
-get_compile_dir() {
-	pushd "${S}/config" >& /dev/null
-	local fastread=yes
-	source ./get_archos
-	popd >& /dev/null
-	echo "O${osname}-${arch}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/"${P}-strip.patch
-	epatch "${FILESDIR}/"${P}-ppc-powerpc-arch-fix.patch
-
-	# disable default building of docs during install
-	sed -e "s:install-doc install-examples:install-examples:" \
-		-i config/Makefile.SH || die "Failed to fix makefile"
-}
-
-src_compile() {
-	#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
-
-	./Configure \
-		--prefix=/usr \
-		--datadir=/usr/share/${P} \
-		--libdir=/usr/$(get_libdir) \
-		--mandir=/usr/share/man/man1 || die "./Configure failed"
-
-	if use hppa; then
-		mymake=DLLD\=/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
-	fi
-
-	# Shared libraries should be PIC on ALL architectures.
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/31
-	# Fixes BUG #49583
-	local installdir=$(get_compile_dir)
-	einfo "Building shared library..."
-	cd "${installdir}" || die "Bad directory. File a BUG!"
-	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE -fPIC" lib-dyn || die "Building shared library failed!"
-
-	einfo "Building executables..."
-	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp || die "Building executables failed!"
-
-	if use doc; then
-		cd "${S}"
-		emake docpdf || die "Failed to generate docs"
-	fi
-
-	if use emacs; then
-		cd "${S}/emacs"
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_test() {
-	make test-kernel
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install || \
-		die "Install failed"
-
-	if use emacs; then
-		elisp-install ${PN} emacs/*.el emacs/*.elc || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	dodoc AUTHORS Announce.2.1 CHANGES README TODO NEW
-	if use doc; then
-		emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install-doc \
-			|| die "Failed to install docs"
-		insinto /usr/share/doc/${PF}
-		doins doc/*.pdf || die "Failed to install pdf docs"
-	fi
-
-	#remove superfluous doc directory
-	rm -fr "${D}/usr/share/${P}/doc" || \
-		die "Failed to clean up doc directory"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/pari/pari-2.3.2.ebuild b/sci-mathematics/pari/pari-2.3.2.ebuild
deleted file mode 100644
index 8e53abc75c77..000000000000
--- a/sci-mathematics/pari/pari-2.3.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.2.ebuild,v 1.12 2008/08/27 20:04:42 markusle Exp $
-
-inherit elisp-common eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A software package for computer-aided number theory"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/pari/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips ~ppc sparc x86"
-IUSE="doc emacs X"
-
-DEPEND="doc? ( virtual/latex-base )
-		sys-libs/readline
-		X? ( x11-libs/libX11 )
-		emacs? ( virtual/emacs )"
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# disable default building of docs during install
-	sed -e "s:install-doc install-examples:install-examples:" \
-		-i config/Makefile.SH || die "Failed to fix makefile"
-}
-
-src_compile() {
-	# Special handling for sparc
-	local myhost
-	[ "${PROFILE_ARCH}" == "sparc64" ] && myhost="sparcv9-linux" \
-		|| myhost="$(echo ${CHOST} | cut -f "1 3" -d '-')"
-	einfo "Building for ${myhost}"
-
-	#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
-
-	./Configure \
-		--host=${myhost} \
-		--prefix=/usr \
-		--datadir=/usr/share/${P} \
-		--libdir=/usr/$(get_libdir) \
-		--mandir=/usr/share/man/man1 || die "./configure failed"
-
-	if use hppa
-	then
-		mymake=DLLD\=/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
-	fi
-
-	# Shared libraries should be PIC on ALL architectures.
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/31
-	# Fixes BUG #49583
-	einfo "Building shared library..."
-	cd Olinux-* || die "Bad directory. File a BUG!"
-	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE -fPIC" lib-dyn || die "Building shared library failed!"
-
-	einfo "Building executables..."
-	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp || die "Building executables failed!"
-
-	if use doc; then
-		cd "${S}"
-		emake docpdf || die "Failed to generate docs"
-	fi
-
-	if use emacs; then
-		cd "${S}/emacs"
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_test() {
-	ebegin "Testing pari kernel"
-	make test-kernel
-	eend $?
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install || \
-		die "Install failed"
-
-	if use emacs; then
-		elisp-install ${PN} emacs/*.el emacs/*.elc || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	dodoc AUTHORS Announce.2.1 CHANGES README TODO NEW
-	if use doc; then
-		emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install-doc \
-			|| die "Failed to install docs"
-		insinto /usr/share/doc/${PF}
-		doins doc/*.pdf || die "Failed to install pdf docs"
-	fi
-
-	#remove superfluous doc directory
-	rm -fr "${D}/usr/share/${P}/doc" || \
-		die "Failed to clean up doc directory"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/pari/pari-2.3.4.ebuild b/sci-mathematics/pari/pari-2.3.4.ebuild
deleted file mode 100644
index e86aa0397d0a..000000000000
--- a/sci-mathematics/pari/pari-2.3.4.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.4.ebuild,v 1.1 2009/01/15 17:19:08 bicatali Exp $
-
-EAPI=2
-inherit elisp-common eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A software package for computer-aided number theory"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz
-	elliptic? ( http://pari.math.u-bordeaux.fr/pub/${PN}/packages/elldata.tgz )
-	galois? ( http://pari.math.u-bordeaux.fr/pub/${PN}/packages/galdata.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc emacs X elliptic galois gmp static"
-
-RDEPEND="sys-libs/readline
-	X? ( x11-libs/libX11 )
-	emacs? ( virtual/emacs )
-	gmp? ( dev-libs/gmp )"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-SITEFILE=50${PN}-gentoo.el
-
-get_compile_dir() {
-	pushd "${S}/config" >& /dev/null
-	local fastread=yes
-	source ./get_archos
-	popd >& /dev/null
-	echo "O${osname}-${arch}"
-}
-
-src_prepare() {
-	# move data into place
-	if ( use galois || use elliptic ); then
-		mv "${WORKDIR}"/data "${S}" \
-			|| die "failed to move data"
-	fi
-
-	epatch "${FILESDIR}/"${PN}-2.3.2-strip.patch
-	epatch "${FILESDIR}/"${PN}-2.3.2-ppc-powerpc-arch-fix.patch
-
-	# disable default building of docs during install
-	sed -e "s:install-doc install-examples:install-examples:" \
-		-i config/Makefile.SH || die "Failed to fix makefile"
-	# propagate ldflags
-	sed -i \
-		-e 's/-shared $extra/-shared $extra \\$(LDFLAGS)/' \
-		config/get_dlld || die
-}
-
-src_configure() {
-	#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
-
-	local myconf="--with-readline"
-	use gmp && myconf="${myconf} --kernel=gmp"
-
-	./Configure \
-		--prefix=/usr \
-		--datadir=/usr/share/${P} \
-		--libdir=/usr/$(get_libdir) \
-		--mandir=/usr/share/man/man1 \
-		${myconf} \
-			|| die "./Configure failed"
-}
-
-src_compile() {
-	if use hppa; then
-		mymake=DLLD\=/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
-	fi
-	local installdir=$(get_compile_dir)
-	cd "${installdir}" || die "Bad directory. File a BUG!"
-
-	einfo "Building shared library..."
-	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE -fPIC" lib-dyn \
-		|| die "Building shared library failed!"
-
-	if use static; then
-		einfo "Building static library..."
-		emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE" lib-sta \
-			|| die "Building static library failed!"
-	fi
-
-	einfo "Building executables..."
-	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp \
-		|| die "Building executables failed!"
-
-	if use doc; then
-		cd "${S}"
-		# To prevent sandbox violations by metafont
-		VARTEXFONTS="${T}"/fonts emake docpdf \
-			|| die "Failed to generate docs"
-	fi
-
-	if use emacs; then
-		cd "${S}/emacs"
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_test() {
-	emake test-kernel || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install \
-		|| die "Install failed"
-
-	if use emacs; then
-		elisp-install ${PN} emacs/*.el emacs/*.elc \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	dodoc AUTHORS Announce.2.1 CHANGES README NEW
-	if use doc; then
-		emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install-doc \
-			|| die "Failed to install docs"
-		insinto /usr/share/doc/${PF}
-		doins doc/*.pdf || die "Failed to install pdf docs"
-	fi
-
-	if (use galois || use elliptic); then
-		emake DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install-data \
-			|| die "Failed to install data files"
-	fi
-
-	if use static; then
-		emake DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install-lib-sta || \
-			die "Install of static library failed"
-	fi
-
-	#remove superfluous doc directory
-	rm -fr "${D}/usr/share/${P}/doc" || \
-		die "Failed to clean up doc directory"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/pari/pari-2.3.5.ebuild b/sci-mathematics/pari/pari-2.3.5.ebuild
index 8d7099d72361..ec5cc77d2e0b 100644
--- a/sci-mathematics/pari/pari-2.3.5.ebuild
+++ b/sci-mathematics/pari/pari-2.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.5.ebuild,v 1.1 2010/05/04 21:56:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.5.ebuild,v 1.2 2010/09/14 17:21:51 bicatali Exp $
 
 EAPI=2
 inherit elisp-common eutils flag-o-matic toolchain-funcs
@@ -61,6 +61,12 @@ src_prepare() {
 		-e 's:"xdvi":"xdg-open":' \
 		-e 's:xdvi -paper 29.7x21cm:xdg-open:' \
 		doc/gphelp.in || die "Failed to fix doc dir"
+
+	if ! use emacs; then
+		# disable emacs support
+		sed -i -e '/^list=/s/emacs//' Configure \
+			|| die "Failed to edit Configure"
+	fi
 }
 
 src_configure() {