[gentoo-commits] repo/gentoo:master commit in: app-emacs/pariemacs/

[gentoo-commits] repo/gentoo:master commit in: app-emacs/pariemacs/

[Andrey Grozin]

commit:     7af52086f69985ea8ccc85e11a0cdd1bfd705191
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 00:22:10 2018 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 00:22:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af52086

app-emacs/pariemacs: accept pari.cfg or pari.cfg.bz2

pari-2.3.5 installs pari.cfg, other versions - pari.cfg.bz2
Closes: https://bugs.gentoo.org/644472
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-emacs/pariemacs/pariemacs-3.14.ebuild | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app-emacs/pariemacs/pariemacs-3.14.ebuild b/app-emacs/pariemacs/pariemacs-3.14.ebuild
index 308e790bebe..aa608c9b7ea 100644
--- a/app-emacs/pariemacs/pariemacs-3.14.ebuild
+++ b/app-emacs/pariemacs/pariemacs-3.14.ebuild
@@ -23,8 +23,13 @@ DOCS="README CHANGES"
 src_prepare() {
 	eapply "${FILESDIR}"/${P}-makefile.patch
 	eapply_user
-	cp /usr/share/doc/pari-*/pari.cfg.bz2 . || die "pari.cfg.bz2 not found"
-	bunzip2 pari.cfg.bz2
+	if [ -f /usr/share/doc/pari-*/pari.cfg ]; then
+		cp /usr/share/doc/pari-*/pari.cfg .
+	elif [ -f /usr/share/doc/pari-*/pari.cfg.bz2 ]; then
+		cp /usr/share/doc/pari-*/pari.cfg.bz2 .
+		bunzip2 pari.cfg.bz2
+	else die "pari.cfg not found"
+	fi
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: app-emacs/pariemacs/

[Andrew Ammerlaan]

commit:     d109462977ea81362681fb176ad26091095858ed
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue Nov  2 18:14:52 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Nov  8 12:26:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1094629

app-emacs/pariemacs: EAPI 8

Closes: https://bugs.gentoo.org/704752
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22798
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 ...iemacs-3.14.ebuild => pariemacs-3.14-r1.ebuild} | 31 +++++++++++-----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/app-emacs/pariemacs/pariemacs-3.14.ebuild b/app-emacs/pariemacs/pariemacs-3.14-r1.ebuild
similarity index 56%
rename from app-emacs/pariemacs/pariemacs-3.14.ebuild
rename to app-emacs/pariemacs/pariemacs-3.14-r1.ebuild
index aa608c9b7ea..e94c56789e5 100644
--- a/app-emacs/pariemacs/pariemacs-3.14.ebuild
+++ b/app-emacs/pariemacs/pariemacs-3.14-r1.ebuild
@@ -1,38 +1,39 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit elisp
 
 DESCRIPTION="sci-mathematics/pari emacs mode"
 HOMEPAGE="http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/"
+SRC_URI="http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/latest-pari-distrib/${P}.tar.gz"
+S="${WORKDIR}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-SRC_URI="http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/latest-pari-distrib/${P}.tar.gz"
 
 RDEPEND="sci-mathematics/pari"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}"
 SITEFILE="64${PN}-gentoo.el"
 DOCS="README CHANGES"
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
 
 src_prepare() {
-	eapply "${FILESDIR}"/${P}-makefile.patch
-	eapply_user
-	if [ -f /usr/share/doc/pari-*/pari.cfg ]; then
-		cp /usr/share/doc/pari-*/pari.cfg .
-	elif [ -f /usr/share/doc/pari-*/pari.cfg.bz2 ]; then
-		cp /usr/share/doc/pari-*/pari.cfg.bz2 .
-		bunzip2 pari.cfg.bz2
-	else die "pari.cfg not found"
+	default
+	if [ -f /usr/share/pari/pari.cfg ]; then
+		cp /usr/share/pari/pari.cfg . || die
+	elif [ -f /usr/share/pari/pari.cfg.bz2 ]; then
+		cp /usr/share/pari/pari.cfg.bz2 . || die
+		bunzip2 pari.cfg.bz2 || die
+	else
+		die "pari.cfg not found"
 	fi
 }
 
 src_compile() {
-	make pari-conf.el
-	make elc
+	emake pari-conf.el
+	emake elc
 }