From a1946d1b15c132c93c232cc13700665235f763ed Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Fri, 25 Sep 2015 03:51:46 +0000 Subject: [PATCH 1/2] dev-util/txt2regex: EAPI 5 bump. Remove suspicious use of einstall. Fixes bug 521548. Package-Manager: portage-2.2.18 RepoMan-Options: --force Signed-off-by: Patrice Clement --- ...t2regex-0.8-r1.ebuild => txt2regex-0.8-r2.ebuild} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename dev-util/txt2regex/{txt2regex-0.8-r1.ebuild => txt2regex-0.8-r2.ebuild} (76%) diff --git a/dev-util/txt2regex/txt2regex-0.8-r1.ebuild b/dev-util/txt2regex/txt2regex-0.8-r2.ebuild similarity index 76% rename from dev-util/txt2regex/txt2regex-0.8-r1.ebuild rename to dev-util/txt2regex/txt2regex-0.8-r2.ebuild index ba29402f29668..0fbea1e027bd9 100644 --- a/dev-util/txt2regex/txt2regex-0.8-r1.ebuild +++ b/dev-util/txt2regex/txt2regex-0.8-r2.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI=5 + inherit eutils DESCRIPTION="A Regular Expression wizard that converts human sentences to regexs" @@ -10,22 +12,20 @@ SRC_URI="http://txt2regex.sourceforge.net/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 hppa ~mips ~ppc sparc x86" +KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86" IUSE="nls cjk" DEPEND="nls? ( sys-devel/gettext )" RDEPEND=">=app-shells/bash-2.04" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { # See bug 93568 use nls || epatch "${FILESDIR}"/${P}-disable-nls.patch use cjk && sed -i -e 's/\xa4/:+:/g' "${S}"/${P}.sh } src_install() { - einstall DESTDIR="${D}" MANDIR="${D}"/usr/share/man/man1 || die + emake DESTDIR="${D}" MANDIR="${D}"/usr/share/man/man1 || die dodoc Changelog NEWS README README.japanese TODO || die newman txt2regex.man txt2regex.6 || die } From ea1428f58306efcf26e6c5fb787591755896bd77 Mon Sep 17 00:00:00 2001 From: Andrey Grozin Date: Fri, 25 Sep 2015 09:54:05 +0600 Subject: [PATCH 2/2] sci-mathematics/fricas: bump to 1.2.7 Package-Manager: portage-2.2.21 --- sci-mathematics/fricas/Manifest | 1 + sci-mathematics/fricas/fricas-1.2.7.ebuild | 90 ++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 sci-mathematics/fricas/fricas-1.2.7.ebuild diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest index 524b685148d1d..70b887a8b10f2 100644 --- a/sci-mathematics/fricas/Manifest +++ b/sci-mathematics/fricas/Manifest @@ -1,2 +1,3 @@ DIST fricas-1.2.5-full.tar.bz2 10153745 SHA256 842e85d2799fd5271957c0d306c243f9f9d9db791e781e848b430f17a11d5e57 SHA512 78e99c2b791d8680e939adf8dfde96d3b305c58e9333da1ae98e214b5fc9ca2d6c365c7857cb4e30a68aa5450c992973243e058e4d4a412f57ff37137bc19ba0 WHIRLPOOL 13e91e451ffa707c220704aa5d017df264806feaa6b1b52c03ddaecff57594d06fe957ae61e0c5a0f49e4f96fb6f420a99aac49279f4f9e0efa07a11bedac1cd DIST fricas-1.2.6-full.tar.bz2 10196018 SHA256 725b62d9139a345a3bc0eb0d29bd0e0764de475792918165c3bcd293d3c292ae SHA512 6c98844b6815bd6bfbe50881179b746aa38af48e3992179e3746bd175ef2a0940d9855e79b66b1b5e34d9fc9fe1b8f3578483847b18d7cc2781f7f72b65fb2ac WHIRLPOOL de221add1c68da205d8689834ccb52a0ea468af253ccae70ce7c25156b0ece810dcc50a9db99549ed461a10dcaea13f503c1f0838141262dd6c6d524a217be61 +DIST fricas-1.2.7-full.tar.bz2 10289500 SHA256 f23d892c17fca850726ab6f1f03061bbced6c487d2eed23e86037672b7473e1b SHA512 1e6e34dc0e4b535bf937ebdefb5099629b2893e6db0dba8b84f259e2a3b7244692ab704dd04aa24f257089661f6747d8f367d0f58bb8cebd652469cb58c72897 WHIRLPOOL 41934d03203b6b6ca51ab0f54d3c7087de67366bba5794785360cbb61fc7cb18a6d4b489c176d75815bdb7b68b4aba31d0724bb5be94f1bfa6cb01e930af7991 diff --git a/sci-mathematics/fricas/fricas-1.2.7.ebuild b/sci-mathematics/fricas/fricas-1.2.7.ebuild new file mode 100644 index 0000000000000..a6701e5bcd73c --- /dev/null +++ b/sci-mathematics/fricas/fricas-1.2.7.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +EAPI=5 +inherit multilib elisp-common + +DESCRIPTION="FriCAS is a fork of Axiom computer algebra system" +HOMEPAGE="http://${PN}.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.bz2" +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +# Supported lisps, number 0 is the default +LISPS=( sbcl cmucl gcl ecls clisp clozurecl ) +# command name: . means just ${LISP} +COMS=( . lisp . ecl . ccl ) + +IUSE="${LISPS[*]} X emacs gmp" +RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE ) + emacs? ( virtual/emacs ) + gmp? ( dev-libs/gmp )" + +# Generating lisp deps +n=${#LISPS[*]} +for ((n--; n > 0; n--)); do + LISP=${LISPS[$n]} + RDEPEND="${RDEPEND} ${LISP}? ( dev-lisp/${LISP}:= ) !${LISP}? (" +done +RDEPEND="${RDEPEND} dev-lisp/${LISPS[0]}:=" +n=${#LISPS[*]} +for ((n--; n > 0; n--)); do + RDEPEND="${RDEPEND} )" +done + +DEPEND="${RDEPEND}" + +# necessary for clisp and gcl +RESTRICT="strip" + +src_configure() { + local LISP n + LISP=sbcl + n=${#LISPS[*]} + for ((n--; n > 0; n--)); do + if use ${LISPS[$n]}; then + LISP=${COMS[$n]} + if [ "${LISP}" = "." ]; then + LISP=${LISPS[$n]} + fi + fi + done + einfo "Using lisp: ${LISP}" + + # aldor is not yet in portage + econf --disable-aldor --with-lisp=${LISP} $(use_with X x) $(use_with gmp) +} + +src_compile() { + # bug #300132 + emake -j1 +} + +src_test() { + emake -j1 all-input +} + +src_install() { + emake -j1 DESTDIR="${D}" install + dodoc README FAQ + + if use emacs; then + sed -e "s|(setq load-path (cons (quote \"/usr/$(get_libdir)/fricas/emacs\") load-path)) ||" \ + -i "${D}"/usr/bin/efricas \ + || die "sed efricas failed" + elisp-install ${PN} "${D}"/usr/$(get_libdir)/${PN}/emacs/*.el + elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el + else + rm "${D}"/usr/bin/efricas || die "rm efricas failed" + fi + rm -r "${D}"/usr/$(get_libdir)/${PN}/emacs || die "rm -r emacs failed" +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +}