Diff clisp-2.49-r9 with a clisp-2.49.90

/usr/portage/dev-lisp/clisp/clisp-2.49.90.ebuild 2018-10-16 12:39:00.000000000 +0300
1 1
# Copyright 1999-2018 Gentoo Foundation
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=5
4
EAPI=6
5

  
5 6
inherit eutils flag-o-matic multilib toolchain-funcs xdg-utils
6 7

  
7 8
DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
8 9
HOMEPAGE="https://clisp.sourceforge.io/"
9
SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
10
SRC_URI="https://haible.de/bruno/gnu/${P}.tar.bz2"
10 11

  
11 12
LICENSE="GPL-2"
12
SLOT="2/${PV}"
13
KEYWORDS="amd64 ~ppc ~sparc x86"
13
SLOT="2/8"
14
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
14 15
IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm -threads +unicode +zlib"
15 16
# "jit" disabled ATM
16 17

  
17 18
RDEPEND=">=dev-lisp/asdf-2.33-r3
18 19
		 virtual/libiconv
19
		 >=dev-libs/libsigsegv-2.4
20
		 >=dev-libs/libsigsegv-2.10
20 21
		 >=dev-libs/ffcall-1.10
21 22
		 dbus? ( sys-apps/dbus )
22 23
		 fastcgi? ( dev-libs/fcgi )
23 24
		 gdbm? ( sys-libs/gdbm )
24
		 gtk? ( >=x11-libs/gtk+-2.10 >=gnome-base/libglade-2.6 )
25
		 postgres? ( >=dev-db/postgresql-8.0 )
26
		 readline? ( >=sys-libs/readline-5.0 <sys-libs/readline-7.0 )
27
		 pcre? ( dev-libs/libpcre )
25
		 gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 )
26
		 postgres? ( >=dev-db/postgresql-8.0:* )
27
		 readline? ( >=sys-libs/readline-7.0:0= )
28
		 pcre? ( dev-libs/libpcre:3 )
28 29
		 svm? ( sci-libs/libsvm )
29 30
		 zlib? ( sys-libs/zlib )
30 31
		 X? ( x11-libs/libXpm )
31 32
		 hyperspec? ( dev-lisp/hyperspec )
32 33
		 berkdb? ( sys-libs/db:4.8 )"
33
#		 jit? ( >=dev-libs/lightning-1.2 )
34 34

  
35 35
DEPEND="${RDEPEND}
36 36
	X? ( x11-base/xorg-proto x11-misc/imake )"
......
57 57
	if use alpha || use ia64; then
58 58
		sed -i -e 's/-O2//g' src/makemake.in || die
59 59
	fi
60
	epatch "${FILESDIR}"/${P}-bits_ipctypes_to_sys_ipc.patch
61
	epatch "${FILESDIR}"/${P}-get_hostname.patch
62
	epatch "${FILESDIR}"/${P}-tinfo.patch
60
	eapply "${FILESDIR}"/"${P}"-after_glibc_cfree_bdb.patch
61
	eapply_user
63 62

  
64 63
	xdg_environment_reset
65 64
}
66 65

  
67 66
src_configure() {
68
	# Bug 618170. If anyone has a better idea...
69
	append-flags -fno-pie
70

  
71 67
	# We need this to build on alpha/ia64
72 68
	if use alpha || use ia64; then
73 69
		replace-flags -O? -O1
74
		append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP'
75 70
	fi
76 71

  
77
	# QA issue with lisp.run
78
	append-flags -Wa,--noexecstack
72
	if use x86; then
73
		append-flags -falign-functions=4
74
	fi
79 75

  
80 76
	# built-in features
81 77
	local myconf="--with-ffcall --without-dynamic-modules"
......
88 84
	fi
89 85

  
90 86
	# default modules
91
	enable_modules wildcard rawsock
87
	enable_modules rawsock
92 88
	# optional modules
93 89
	use elibc_glibc && enable_modules bindings/glibc
94 90
	use X && enable_modules clx/new-clx
......
98 94
	fi
99 95
	if use berkdb; then
100 96
		enable_modules berkeley-db
101
		append-cppflags -I/usr/include/db4.8
97
		append-cppflags -I"${EPREFIX}"/usr/include/db4.8
102 98
	fi
103 99
	use dbus && enable_modules dbus
104 100
	use fastcgi && enable_modules fastcgi
......
109 105
	use zlib && enable_modules zlib
110 106

  
111 107
	if use hyperspec; then
112
		CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
108
		CLHSROOT="file:///${EPREFIX}/usr/share/doc/hyperspec/HyperSpec/"
113 109
	else
114 110
		CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
115 111
	fi
116 112

  
117 113
	# configure chokes on --sysconfdir option
118
	local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \
119
		$(use_with readline) $(use_with unicode) \
120
		${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
114
	local configure="./configure --prefix=${EPREFIX}/usr --enable-portability \
115
		  --libdir=${EPREFIX}/usr/$(get_libdir) $(use_with readline) $(use_with unicode) \
116
		  ${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
121 117
	einfo "${configure}"
122 118
	${configure} || die "./configure failed"
123 119

  
......
128 124

  
129 125
src_compile() {
130 126
	export VARTEXFONTS="${T}"/fonts
131
	cd "${BUILDDIR}"
127
	cd "${BUILDDIR}" || die
132 128
	# parallel build fails
133 129
	emake -j1
134 130
}
135 131

  
136 132
src_install() {
137 133
	pushd "${BUILDDIR}"
138
	make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
134
	make DESTDIR="${D}" prefix="${EPREFIX}"/usr install-bin || die "Installation failed"
139 135
	doman clisp.1
140 136
	dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
141 137
	popd
Thank you!