gentoo resync : 16.06.2019

4 files changed, 4 insertions, 172 deletions

diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 5401edb09b04..8950df34c71c 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -3,12 +3,10 @@ AUX clisp-2.49-get_hostname.patch 2356 BLAKE2B fc1e5e8c2e3b9f1db8c144390564801af
 AUX clisp-2.49-tinfo.patch 404 BLAKE2B 12d9c2a7b6f83b4c0de6f8ab4e57fc2db2f3bfffbb535c0d5793052268a6d12ca21126a8b71895353b37c0a05e268f3eee192d827e63eb71ceb01c3c03cfe176 SHA512 10f27e205557cb48fe0165bd5ee7e3a33b0dbe403fa2d10df62854c44eb762a44ef005c78e8c23a67f7ed6d3c6317c893c7760f9c2ca72b6b088adae5f03247c
 AUX clisp-2.49.90-after_glibc_cfree_bdb.patch 8499 BLAKE2B d093b76cdf25b0822aaca87bd6055c6b58edc68e387d78d7fd979171d881fe585b674246b3a2a6f37a8412b5aef1b997210b4019a1595a07b64471cb9324656f SHA512 1b8cb29bf9caa30ca05474a67202f72f013e57d6b0d2dff1fb5ab0472df9f5c5a5b5de46922c931fa9a4d4a0a25890a05e1f7d38ddfb56c967026eef80001919
 AUX clisp-2.49.92-after_glibc_cfree_bdb.patch 8499 BLAKE2B d093b76cdf25b0822aaca87bd6055c6b58edc68e387d78d7fd979171d881fe585b674246b3a2a6f37a8412b5aef1b997210b4019a1595a07b64471cb9324656f SHA512 1b8cb29bf9caa30ca05474a67202f72f013e57d6b0d2dff1fb5ab0472df9f5c5a5b5de46922c931fa9a4d4a0a25890a05e1f7d38ddfb56c967026eef80001919
-DIST clisp-2.48.tar.bz2 7885098 BLAKE2B 42ebfe4721015f522184bce710bf95d79aa7f2a239410af249a8e85d80f140344ec80daaa34f7cdbfd2ae86407984657163ce3f6e4201eb132f7c71e21523cba SHA512 3288b6a2973c924006b14bbed1e8e3e688276a187ac2a6c7851dc7ae699e7832d30e5e7eecdabc76c08c7e8e8ce1b562eb97a44570d3035e558ea2310de2b719
 DIST clisp-2.49.90.tar.bz2 8921458 BLAKE2B 3be7cfe41038f42d8844d500877fa5c20e5c21dc0e162aa0018b297e4dfcd5374ef608793c9d809852e1f9885a155bb5b25fef8efe66016dd0ee400007386b70 SHA512 1fa7205e38883dcc863160b5418ddaaa2c45ee2d2f936de4067d1ea4a1e5043bf1235361bbbfc366afd6d8f1144497ccdccf1767ecf327f7a672b18742ceb651
 DIST clisp-2.49.92.tar.bz2 9055207 BLAKE2B 6cf331eb9f99f62579e35469e2d01cae066083592ccc71cf483b70b4d1be349cdee9d403e0a7ed1ad1c8c5d805c1dab51c1a5031d77469ff8c4dc52eb58913df SHA512 cc9412a7b3f21c85b040bf5e660380fafb3c2374765a1c00272feb3f7838f2161e27a5d6295cef9976f0c4522f10796cf5ee5447716090d1cc69ecfe598ef306
 DIST clisp-2.49.tar.bz2 8091011 BLAKE2B e034c581b8100837b34d0adf1ef45bd667272d062945875175958178b4ef5b11e899dfb76505eb8cb51fca6101c11a9f21fb2cc9a78a3c0f82b06166211434f7 SHA512 eef66fc85199a2c283b616db61bf67ff103eeb0f19fa907da48994dc790b6f5f8d0c74fb3bd723c6b827c0ff3cfd89fa6ba67934fc669ed5d5249044b5140d81
-EBUILD clisp-2.48-r1.ebuild 4667 BLAKE2B 3faf58158a98b83123813e31c4267af979eeaf32b4e5666e5c6ba770065e73112ba614141bcd4ad63b00025da83b4b2a1298e7f3486cc0100c930aedb94da065 SHA512 ea91c2007b376afc8d3b2e86753b63838e0662b9a4eadcdd473cbbbe17057dbfc6ab31411e5ff68a6814f83cbd37ddbb414cdd66b21c1aa9629c22b0daa40122
 EBUILD clisp-2.49-r9.ebuild 4238 BLAKE2B ff86f053328cf35a316be36309f43f881ae8490a866bdd0d00cf663f9fac6677824a2f5178f666966b0bcf24ab92aef09f9813f84b60bd1b9559ad7bcc72e8a2 SHA512 270ea4dac37edee7eaba10549e9cc126b622808951af59f84ac3955b83db6bc041475a7a5c83b394236e89ea74437324ef66f7e54821823a8d5ca143a3b5c9f2
 EBUILD clisp-2.49.90.ebuild 4045 BLAKE2B 382cf51c99663621a8c118d384c09fb6e490f986d65922558a2d5a998ed5204d9768ffc2a5a4963f6e8176b7f5ec1bfbbde9fd7e86275a54cd4a039bbe6c310f SHA512 5cb44922365a74b9451491baa2fe7f87be4d80323cd6601a65ed2f9d4f293e947df1af18dffce9404328a6702e162482b1d8a537d51f2fbb7f2f48780cfc6d1e
-EBUILD clisp-2.49.92.ebuild 4026 BLAKE2B a217cb0f52c5a7b81e12095c7a05395e8486c8e6a5fb8363dd536d74abafba934f566572c8584f65b392155e37732da666728245bcb6634118093bbc5c949834 SHA512 c55e1f0ebc7d14dc4704abb4e56870dcd1448d0b011db3da18b4ab24b357a5832de5b1a804e0a8f11554e784ccad9e824add04cc3681f2d414c7c95bf85c6064
-MISC metadata.xml 1362 BLAKE2B 707ff26161455d73fc21e7f22341e829e9310600a73f9ca28fa39f530f11bb497cc6eb781a628092fabde3eb342582fe34bd456ddd40022b5e4c5277e7be5fb2 SHA512 dc7eb6ebc84df7653de78f6a397677992a7c4c9f20e58562a78e409f8c83304de4ef9eb931db8fc23edee2157d92e9cfa9c08d6e129973bfd8c2cd767ace9a49
+EBUILD clisp-2.49.92.ebuild 4025 BLAKE2B d8916965223e77393d07c12a27518f888a5e0d3d232f3467f937dcbf632bb6c38729db318452ff455d9d8d333bcc96e9505c5ecfa57f0f971817af101d2f3ef9 SHA512 84dd8fd35257f3eec31b0e223744eededa8502b9c857a1500bd27c09ac09e7533b4f2e77315ba0f895110ecc2395ebd8378e49f81d20507fdcab6bbccf2d5d28
+MISC metadata.xml 1240 BLAKE2B f64eb9d2b7885fb771d0bd455c3551191ef85c17ef036686ae213058fa9ae3f87f8dab5dab7d6c89c66dbb883c89f0624009ced645a05f40463f22560802c581 SHA512 8b40fdaba20939478eb982350eed9480df6ac8a48885ceb4e04da9d4bfd77e3c8451f96d2745ce4baff5d4e16db5363d81a66c50a364046f921a47478d563b49
diff --git a/dev-lisp/clisp/clisp-2.48-r1.ebuild b/dev-lisp/clisp/clisp-2.48-r1.ebuild
deleted file mode 100644
index dbdf14a79021..000000000000
--- a/dev-lisp/clisp/clisp-2.48-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit flag-o-matic eutils toolchain-funcs multilib xdg-utils
-
-DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
-HOMEPAGE="https://clisp.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc -sparc x86"
-IUSE="berkdb hyperspec X new-clx dbus fastcgi gdbm gtk +pcre postgres +readline svm -threads +unicode +zlib"
-
-RDEPEND="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:2 >=gnome-base/libglade-2.6:2.0 )
-		 postgres? ( >=dev-db/postgresql-8.0 )
-		 readline? ( >=sys-libs/readline-5.0 )
-		 pcre? ( dev-libs/libpcre )
-		 svm? ( sci-libs/libsvm )
-		 zlib? ( sys-libs/zlib )
-		 X? ( new-clx? ( x11-libs/libXpm ) )
-		 hyperspec? ( dev-lisp/hyperspec )
-		 berkdb? ( sys-libs/db:4.5 )"
-
-DEPEND="${RDEPEND}
-	X? ( new-clx? ( x11-base/xorg-proto x11-misc/imake ) )"
-
-# dev-lisp/gentoo-init is obsolete, it will be dropped soon
-# This version of clisp is its last consumer
-# Bug 648448
-#PDEPEND="dev-lisp/gentoo-init"
-
-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
-	xdg_environment_reset
-}
-
-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
-	if use X; then
-		if use new-clx; then
-			enable_modules clx/new-clx
-		else
-			enable_modules clx/mit-clx
-		fi
-	fi
-	if use postgres; then
-		enable_modules postgresql
-		append-flags -I$(pg_config --includedir)
-	fi
-	if use berkdb; then
-		enable_modules berkeley-db
-		append-flags -I/usr/include/db4.5
-	fi
-	use dbus && enable_modules dbus
-	use fastcgi && enable_modules fastcgi
-	use gdbm && enable_modules gdbm
-	use gtk && enable_modules gtk2
-	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"
-
-	sed -i 's,"vi","nano",g' "${BUILDDIR}"/config.lisp || die
-
-	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
-}
-
-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
-	doman clisp.1 || die
-	dodoc SUMMARY README* NEWS MAGIC.add ANNOUNCE || die
-	fperms a+x /usr/$(get_libdir)/clisp-${PV/_*/}/clisp-link || die
-	popd
-	dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png || die
-	dodoc doc/{CLOS-guide,LISP-tutorial}.txt || die
-}
-
-pkg_postinst() {
-	if use threads || use jit; then
-		while read line; do elog ${line}; done <<EOF
-
-Upstream considers threads to be of Alpha quality, therefore
-it is likely that you will encounter bugs in using them. If you do,
-please report bugs upstream:
-
-Mailing list: https://sourceforge.net/projects/clisp/lists/clisp-devel
-Bug tracker:  https://sourceforge.net/p/clisp/bugs/
-
-EOF
-	fi
-}
diff --git a/dev-lisp/clisp/clisp-2.49.92.ebuild b/dev-lisp/clisp/clisp-2.49.92.ebuild
index 05098a4cc211..1b7e846f3137 100644
--- a/dev-lisp/clisp/clisp-2.49.92.ebuild
+++ b/dev-lisp/clisp/clisp-2.49.92.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2/8"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc ~sparc x86"
 IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm -threads +unicode +zlib"
 # "jit" disabled ATM
 
diff --git a/dev-lisp/clisp/metadata.xml b/dev-lisp/clisp/metadata.xml
index cb525b83d172..88ea109143fa 100644
--- a/dev-lisp/clisp/metadata.xml
+++ b/dev-lisp/clisp/metadata.xml
@@ -20,8 +20,6 @@ changed at run time.
 </longdescription>
 	<use>
 		<flag name="hyperspec">Use local hyperspec instead of online version</flag>
-		<flag name="new-clx">Build CLISP with support for the NEW-CLX module which is a
--C binding to the Xorg libraries</flag>
 		<flag name="svm">Build CLISP with support for the Support Vector Machine module</flag>
 	</use>
 	<upstream>