dev-lisp/clisp: Clean up and sync with main repo

3 files changed, 17 insertions, 151 deletions

diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 95413678..1bf835c2 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -7,7 +7,6 @@ DIST clisp-2.49.60.tar.bz2 8745713 SHA256 cfc09acda389d152c5761488513d5748fd968b
 DIST clisp-2.49.tar.bz2 8091011 SHA256 8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890 SHA512 eef66fc85199a2c283b616db61bf67ff103eeb0f19fa907da48994dc790b6f5f8d0c74fb3bd723c6b827c0ff3cfd89fa6ba67934fc669ed5d5249044b5140d81 WHIRLPOOL fe14d3cd09ad5768c72470b71068331623239a9d5c7247267be25bc4fc97d91ca6c53dd0a495b3d2a8c45faeaa01060aa135a19fea5f76d2968ffc505f5b6416
 DIST clisp-2.50_pre20130414.tar.bz2 8221222 SHA256 f40cd9a39957289286634500f537a0d18e41aadfc8dcbd5d78593770143b9f68 SHA512 c7344536bee6f1cb6c739a54ec93385401b4c67ad0e187d732f8b79965aaa8bb39ad645a426d703f92736105bf6c9a3bbcb77edc2f14f148d1a7a866701704d6 WHIRLPOOL d5a0854b8787ef4c38f5b7c464599ce556c3b328bfbe72f0d636d5e63f56cbabe4b79b5c9cd8b0b30880e7397029bfb81c4c6420d7593637913fbf6344792f9c
 EBUILD clisp-2.49-r100.ebuild 4495 SHA256 34088fb45660f30dccb1960fdfb577566c8970480cb591a37a96c237a2638d5c SHA512 c022a0b1c704d9d252fdbc741ef6fe6a44ae26b1047c7e8d334aeb171f4bfa836b043432294d508725d429a43bfbca3c413be35b6a38fd02ab8be79506c43dd0 WHIRLPOOL 2320eaa519d90878e2eb23f27d9409778cb08bdee5c528fe917a4ac7e51aad1e2e838cf23282091eab3496d5a008586f42aa0bf9305d3c2420d6ff78dacb48c8
-EBUILD clisp-2.49-r6.ebuild 4330 SHA256 dca0fdf3b4d36392c90fb92f4014c430c1107f3474dee267f21c436f7e9a6b04 SHA512 52df819f081153513bbe2dce0bcb6c86de58a11158089ba1fa1982a54976d81ecd72e4dff9838ea655ebc15b297166897d29ea849a6ab5d6f8513399fe59e126 WHIRLPOOL e892dbdef464c0946825322df61c8df01664837c98fa8303cff89097df14261e910c9d5b53675182c16e943b47e347ee64169dda27556e0e13339cea2bf55d0e
-EBUILD clisp-2.49-r8.ebuild 4394 SHA256 f211b05b2bc503e85fa63f36837b1f377baa44102925ef40b08e9a8372a05b19 SHA512 7548cca817b47bfb9b09812c9564e86f2b5092d1263919d563172555d1371c86bdd0aa7f2f4b3315237a154b911f8c025f62917f434973a608f86728873e97f5 WHIRLPOOL ed75d54fa125ec188a6e7384fd83f70be3e546de62c342609d34e2d37ab0775731c0824ad9bfce0e290c1ec36ef3b7af64dde9dbbdf9ed3722aa87a634af0af5
+EBUILD clisp-2.49-r101.ebuild 4565 SHA256 44e4eeff3ef084ea40e72265275dbe6feb204e8612fb154e9183575bea1ddefe SHA512 3d8ee8697b8faed8df82f151cc947bc0e3b689e4710f418b9ee31b1803d59928d0ca4a087f48f77240b06c24527a003a9d9141489ff37fcb778f3c024343e480 WHIRLPOOL 5d483e7db20f49628b5d911ab70755b3e5e9eb05913e84bee53e36a16263c0495ab91f6533dfa801519cf857ca8c24df54e1567e85827eec2311c755658b1135
 EBUILD clisp-2.49.60.ebuild 4303 SHA256 5db413ffa9aa673b67a98095e52df87c569d4634b81a9f394c3d3bc6dec8b8b5 SHA512 a401923215f7cef4626e5f8ccfe5a69af26eaee07a30a2e4d4b0fd11a56ca76dbe7b13887f0c2469a46f7c01d9daf92bee788c3d2161e847355c692eb43f0bbf WHIRLPOOL ec563f61898e9454b1f62c37e0c05ecb0940de6475c90f67a1fc18cc5f75dedc73c4381975f55a9d70342ccaf21e53ec3e0353e576d7bc32795d7e35323e1821
 EBUILD clisp-2.50_pre20130414.ebuild 4410 SHA256 550f8a4c60f007b256ab7508a34aacca8fcf62b61c9d9297d315b228b4b08914 SHA512 bb2c9b6cb937e70ed25cb0b3fb1e1ce0945fa0063ae08249ee24ce47880f521cdc4edcbd763e6770b3b6929dbe5b3df091ba8e1159dfc89cc27b80a15adb0fc1 WHIRLPOOL 7941fa423aa3a04edf3574db9b9ec914cc18ef0e42a176250c575a56f0531a4646e68f534bf1902634ceae72b75b9b4e4d6c611de8a08a9053371852c1aa8cfc
diff --git a/dev-lisp/clisp/clisp-2.49-r8.ebuild b/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
-}