commit: a9d92bea5bbf4320ff99c75296508ad0ff0c630d Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org> AuthorDate: Sun Dec 10 14:45:29 2017 +0000 Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> CommitDate: Sun Dec 10 14:45:29 2017 +0000 URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=a9d92bea
dev-lisp/clisp: Clean up and sync with main repo ...clisp-2.49-r8.ebuild => clisp-2.49-r101.ebuild} | 23 +++- dev-lisp/clisp/clisp-2.49-r6.ebuild | 142 --------------------- 2 files changed, 16 insertions(+), 149 deletions(-) diff --git a/dev-lisp/clisp/clisp-2.49-r8.ebuild b/dev-lisp/clisp/clisp-2.49-r101.ebuild similarity index 90% rename from dev-lisp/clisp/clisp-2.49-r8.ebuild rename to dev-lisp/clisp/clisp-2.49-r101.ebuild index e19e47f6..8948b19a 100644 --- a/dev-lisp/clisp/clisp-2.49-r8.ebuild +++ b/dev-lisp/clisp/clisp-2.49-r101.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,8 +9,8 @@ HOMEPAGE="http://clisp.sourceforge.net/"; SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2" LICENSE="GPL-2" -SLOT="2/${PV}" -KEYWORDS="amd64 ~ppc ~sparc x86" +SLOT="2/7" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib" # "jit" disabled ATM @@ -21,11 +21,11 @@ RDEPEND=">=dev-lisp/asdf-2.33-r3 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) - gtk? ( >=x11-libs/gtk+-2.10 >=gnome-base/libglade-2.6 ) + gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) pari? ( <sci-mathematics/pari-2.5.0 ) - postgres? ( >=dev-db/postgresql-8.0 ) - readline? ( >=sys-libs/readline-5.0 <sys-libs/readline-7.0 ) - pcre? ( dev-libs/libpcre ) + postgres? ( >=dev-db/postgresql-8.0:* ) + readline? ( >=sys-libs/readline-7.0:0= ) + pcre? ( dev-libs/libpcre:3 ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) @@ -61,15 +61,24 @@ src_prepare() { epatch "${FILESDIR}"/${P}-bits_ipctypes_to_sys_ipc.patch epatch "${FILESDIR}"/${P}-get_hostname.patch epatch "${FILESDIR}"/${P}-tinfo.patch + # bug #594552 + epatch "${FILESDIR}"/${P}-readline-7.patch } src_configure() { + # Bug 618170. If anyone has a better idea... + append-flags -fno-pie + # We need this to build on alpha/ia64 if use alpha || use ia64; then replace-flags -O? -O1 append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP' fi + if use x86; then + append-flags -falign-functions=4 + fi + # QA issue with lisp.run append-flags -Wa,--noexecstack diff --git a/dev-lisp/clisp/clisp-2.49-r6.ebuild b/dev-lisp/clisp/clisp-2.49-r6.ebuild deleted file mode 100644 index 93e79df6..00000000 --- a/dev-lisp/clisp/clisp-2.49-r6.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit flag-o-matic eutils toolchain-funcs multilib - -DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp" -HOMEPAGE="http://clisp.sourceforge.net/"; -SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib" -# "jit" disabled ATM - -RDEPEND=">=dev-lisp/asdf-2.33-r3 - virtual/libiconv - >=dev-libs/libsigsegv-2.4 - >=dev-libs/ffcall-1.10 - dbus? ( sys-apps/dbus ) - fastcgi? ( dev-libs/fcgi ) - gdbm? ( sys-libs/gdbm ) - gtk? ( >=x11-libs/gtk+-2.10 >=gnome-base/libglade-2.6 ) - pari? ( >=sci-mathematics/pari-2.3.0 ) - postgres? ( >=dev-db/postgresql-base-8.0 ) - readline? ( >=sys-libs/readline-5.0 ) - pcre? ( dev-libs/libpcre ) - svm? ( sci-libs/libsvm ) - zlib? ( sys-libs/zlib ) - X? ( x11-libs/libXpm ) - hyperspec? ( dev-lisp/hyperspec ) - berkdb? ( sys-libs/db:4.8 )" -# jit? ( >=dev-libs/lightning-1.2 ) - -DEPEND="${RDEPEND} - X? ( x11-misc/imake x11-proto/xextproto )" - -enable_modules() { - [[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument" - for m in "$@" ; do - einfo "enabling module $m" - myconf+=" --with-module=${m}" - done -} - -BUILDDIR="builddir" - -# modules not enabled: -# * berkdb: must figure out a way to make the configure script pick up the -# currect version of the library and headers -# * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs -# * matlab, netica: not in portage -# * oracle: can't install oracle-instantclient - -src_prepare() { - # More than -O1 breaks alpha/ia64 - if use alpha || use ia64; then - sed -i -e 's/-O2//g' src/makemake.in || die - fi - epatch "${FILESDIR}/${P}-bits_ipctypes_to_sys_ipc.patch" -} - -src_configure() { - # We need this to build on alpha/ia64 - if use alpha || use ia64; then - replace-flags -O? -O1 - append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP' - fi - - # QA issue with lisp.run - append-flags -Wa,--noexecstack - - # built-in features - local myconf="--with-ffcall --without-dynamic-modules" -# There's a problem with jit_allocai function -# if use jit; then -# myconf+=" --with-jitc=lightning" -# fi - if use threads; then - myconf+=" --with-threads=POSIX_THREADS" - fi - - # default modules - enable_modules wildcard rawsock - # optional modules - use elibc_glibc && enable_modules bindings/glibc - use X && enable_modules clx/new-clx - if use postgres; then - enable_modules postgresql - append-cppflags -I$(pg_config --includedir) - fi - if use berkdb; then - enable_modules berkeley-db - append-cppflags -I/usr/include/db4.8 - fi - use dbus && enable_modules dbus - use fastcgi && enable_modules fastcgi - use gdbm && enable_modules gdbm - use gtk && enable_modules gtk2 - use pari && enable_modules pari - use pcre && enable_modules pcre - use svm && enable_modules libsvm - use zlib && enable_modules zlib - - if use hyperspec; then - CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/" - else - CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"; - fi - - # configure chokes on --sysconfdir option - local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \ - $(use_with readline) $(use_with unicode) \ - ${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}" - einfo "${configure}" - ${configure} || die "./configure failed" - - IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html" - sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g"; \ - "${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes" -} - -src_compile() { - export VARTEXFONTS="${T}"/fonts - cd "${BUILDDIR}" - # parallel build fails - emake -j1 || die "emake failed" -} - -src_install() { - pushd "${BUILDDIR}" - make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed" - doman clisp.1 || die - dodoc SUMMARY README* NEWS MAGIC.add ANNOUNCE || die - # stripping them removes common symbols (defined but uninitialised variables) - # which are then needed to build modules... - export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*" - popd - dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png || die - dodoc doc/{CLOS-guide,LISP-tutorial}.txt || die -}
