Fixed doc installation (bug #479526), added subslot, old files cleaned

(Portage version: 2.2.0_alpha195/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)

13 files changed, 19 insertions, 398 deletions

diff --git a/dev-lisp/clisp/ChangeLog b/dev-lisp/clisp/ChangeLog
index f92c8243a9fa..cdc3474d6488 100644
--- a/dev-lisp/clisp/ChangeLog
+++ b/dev-lisp/clisp/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-lisp/clisp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.108 2013/06/14 02:31:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.109 2013/08/12 15:11:30 grozin Exp $
+
+*clisp-2.49-r8 (12 Aug 2013)
+
+  12 Aug 2013; Andrey Grozin <grozin@gentoo.org> -clisp-2.49-r7.ebuild,
+  +clisp-2.49-r8.ebuild, -files/2.38/README.Gentoo, -files/2.38/clisp.sh,
+  -files/2.38/fastcgi-Makefile-gentoo.patch, -files/2.38/install-clc.lisp,
+  -files/2.39/README.Gentoo, -files/2.39/clisp.sh,
+  -files/2.39/fastcgi-Makefile-gentoo.patch, -files/2.39/install-clc.lisp,
+  -files/2.41-fastcgi-Makefile-gentoo.patch, -files/2.41-fastcgi-build.patch,
+  -files/2.41-linux-headers.patch:
+  Fixed doc installation (bug #479526), added subslot, old files cleaned
 
   14 Jun 2013; Patrick Lauer <patrick@gentoo.org> clisp-2.49-r7.ebuild:
   Removing alpha and ia64 keywords until dependency dev-lisp/asdf catches up
diff --git a/dev-lisp/clisp/clisp-2.49-r7.ebuild b/dev-lisp/clisp/clisp-2.49-r8.ebuild
index 88d7a13c73e9..c2b033dace06 100644
--- a/dev-lisp/clisp/clisp-2.49-r7.ebuild
+++ b/dev-lisp/clisp/clisp-2.49-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.49-r7.ebuild,v 1.2 2013/06/14 02:31:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.49-r8.ebuild,v 1.1 2013/08/12 15:11:30 grozin Exp $
 
 EAPI=5
 inherit flag-o-matic eutils toolchain-funcs multilib
@@ -10,7 +10,7 @@ HOMEPAGE="http://clisp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT="2"
+SLOT="2/${PV}"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
 # "jit" disabled ATM
@@ -127,18 +127,18 @@ src_compile() {
 	export VARTEXFONTS="${T}"/fonts
 	cd "${BUILDDIR}"
 	# parallel build fails
-	emake -j1 || die "emake failed"
+	emake -j1
 }
 
 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
+	doman clisp.1
+	dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
 	# 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
+	dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
+	dodoc doc/{CLOS-guide,LISP-tutorial}.txt
 }
diff --git a/dev-lisp/clisp/files/2.38/README.Gentoo b/dev-lisp/clisp/files/2.38/README.Gentoo
deleted file mode 100644
index 6bec925fb0d3..000000000000
--- a/dev-lisp/clisp/files/2.38/README.Gentoo
+++ /dev/null
@@ -1,11 +0,0 @@
-                                                            -*-outline-*-
-
-* Gentoo Specific Notes
-
-The CLISP port for Gentoo uses Common Lisp Controller related code
-(install-clc.lisp and clisp.sh) from Debian.  This code contains the following
-copyright:
-
-    ;;;; Copyright (c) 2004 Kevin M. Rosenberg
-    ;;;; GNU GPL v2 license
-
diff --git a/dev-lisp/clisp/files/2.38/clisp.sh b/dev-lisp/clisp/files/2.38/clisp.sh
deleted file mode 100644
index f5ed6a1d8fce..000000000000
--- a/dev-lisp/clisp/files/2.38/clisp.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2002 Kevin M. Rosenberg
-# GNU GPL v2 license
- 
-if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
-  echo "*** Can't find common-lisp-controller.lisp ***" >&2
-  echo "Please report this as a bug" &>2
-  exit 1
-fi
-
-clisp_dir=/usr/lib/clisp
-clc_lib_dir=/usr/lib/common-lisp/clisp
-
-builder=/usr/bin/clisp
-old_mem=$clisp_dir/full/lispinit.mem
-new_mem=$clisp_dir/full/lispinit-new.mem
-clean_mem=$clisp_dir/full/lispinit-clean.mem
-
-lisp_error()
-{
-    echo "Error running $builder" >&2
-    exit 1
-}
-
-mem_error()
-{
-    echo "Error moving new lisp image $new_mem" >&2
-    exit 1
-}
-
-
-case $1 in
-    rebuild)
-	echo $0 Rebuilding packages...
-	shift
-	while [ -x $builder ] && [ ! -z "$1" ] ; do
-	    echo ...rebuilding $1
-	    $builder -norc -q -M $old_mem -x "
-(let ((*compile-print* nil)
-      (*compile-progress* nil)
-      (*compile-verbose*  nil)
-      (*require-verbose* nil)
-      (*load-verbose* nil) 
-      (mk::*load-source-if-no-binary* nil)
-      (mk::*bother-user-if-no-binary* nil)
-      (mk::*compile-during-load* t))
-   (handler-case
-      (progn
-         (c-l-c:compile-library (quote $1))
-         (ext:exit 0)
-       )
-    (error (e)
-      (ignore-errors (format t \"~&Build error: ~A~%\" e))
-      (finish-output)
-      (ext:exit 1))))"  || exit 1
-	    shift
-	done 
-	;;
-    remove)
-	echo $0 Removing packages...
-	shift
-	while [ ! -z "$1" ] ; do
-	    echo ...removing package $1
-	    rm -rf "${clc_lib_dir}/$1"
-	    shift
-	done
-	rmdir $clc_lib_dir 2> /dev/null 
-	;;
-    install-clc)
-	echo Installing clc...
-	if [ ! -f $clean_mem ]; then
-	    cp $old_mem $clean_mem
-	fi
-	if [ -x $clisp_dir/$lisp_builder ]; then
-	    $builder -norc -q -M $clean_mem \
-		-x "
-(handler-case
-  (progn 
-    (when (find-package :c-l-c) ; have to remove 
-      (delete-package :c-l-c))  ; for clisp workaround
-    (load \"$clisp_dir/install-clc.lisp\") 
-    (saveinitmem \"${new_mem}\")
-    (ext:exit 0))
-  (error (e)
-    (ignore-errors (format t \"~&install-clc error: ~A~%\" e))
-    (finish-output)
-    (ext:exit 1)))"   || lisp_error
-  	    mv $new_mem $old_mem || mem_error
-	fi
-	;;
-    remove-clc)
-	if [ -f $clean_mem ]; then
-	    cp $clean_mem $old_mem
-	else
-	    echo "Warning: Can't find original image file $clean_mem. Aborting." >& 2
-	fi
-	;;
-    make-user-image)
-	if [ ! -f $2 ] ; then 
-	    echo "Trying to make-user image, but can not find file $2" >&2
-	    exit 1
-	fi 
-	$builder -norc -q -M $old_mem \
-	    -x "(progn    
-  (load \"$2\") 
-  (saveinitmem \"${new_mem}\"))
-  (ext:exit 0)" || lisp_error
-	mv $new_mem $old_mem || mem_error
-	;;
-    *)
-	echo "`basename $0`: Unknown command $1" >&2
-	echo "Known commands are:" >&2 
-	echo "install-clc, remove-clc, rebuild, remove, and make-user-image" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/dev-lisp/clisp/files/2.38/fastcgi-Makefile-gentoo.patch b/dev-lisp/clisp/files/2.38/fastcgi-Makefile-gentoo.patch
deleted file mode 100644
index ffe24d237751..000000000000
--- a/dev-lisp/clisp/files/2.38/fastcgi-Makefile-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur clisp-2.38.orig/modules/fastcgi/Makefile.in clisp-2.38/modules/fastcgi/Makefile.in
---- clisp-2.38.orig/modules/fastcgi/Makefile.in	2004-08-12 09:38:36.000000000 -0500
-+++ clisp-2.38/modules/fastcgi/Makefile.in	2006-04-24 15:14:38.000000000 -0500
-@@ -23,10 +23,10 @@
- 	$(CLISP) -c fastcgi.lisp
- 
- fastcgi.o:       fastcgi.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDES) -I.. -c fastcgi.c
- 
- fastcgi_wrappers.o:       fastcgi_wrappers.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi_wrappers.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDES) -I.. -c fastcgi_wrappers.c
- 
- # Make a module
- clisp-module : all
diff --git a/dev-lisp/clisp/files/2.38/install-clc.lisp b/dev-lisp/clisp/files/2.38/install-clc.lisp
deleted file mode 100644
index 06cb217d32cf..000000000000
--- a/dev-lisp/clisp/files/2.38/install-clc.lisp
+++ /dev/null
@@ -1,15 +0,0 @@
-;;;; -*- Mode: Lisp; Package: CL-USER -*-
-;;;; Copyright (c) 2004 Kevin M. Rosenberg
-;;;; GNU GPL v2 license
-
-(in-package #:cl-user)
-
-(handler-case
-    (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")
-  (error (e)
-    (format t "Error during loading of common-lisp-controller.lisp: ~A~%" e)))
-
-(handler-case
-    (common-lisp-controller:init-common-lisp-controller-v4 "clisp")
-  (error (e)
-    (format t "Error during init-common-lisp-controller-v4: ~A~%" e)))
diff --git a/dev-lisp/clisp/files/2.39/README.Gentoo b/dev-lisp/clisp/files/2.39/README.Gentoo
deleted file mode 100644
index 6bec925fb0d3..000000000000
--- a/dev-lisp/clisp/files/2.39/README.Gentoo
+++ /dev/null
@@ -1,11 +0,0 @@
-                                                            -*-outline-*-
-
-* Gentoo Specific Notes
-
-The CLISP port for Gentoo uses Common Lisp Controller related code
-(install-clc.lisp and clisp.sh) from Debian.  This code contains the following
-copyright:
-
-    ;;;; Copyright (c) 2004 Kevin M. Rosenberg
-    ;;;; GNU GPL v2 license
-
diff --git a/dev-lisp/clisp/files/2.39/clisp.sh b/dev-lisp/clisp/files/2.39/clisp.sh
deleted file mode 100644
index f5ed6a1d8fce..000000000000
--- a/dev-lisp/clisp/files/2.39/clisp.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2002 Kevin M. Rosenberg
-# GNU GPL v2 license
- 
-if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
-  echo "*** Can't find common-lisp-controller.lisp ***" >&2
-  echo "Please report this as a bug" &>2
-  exit 1
-fi
-
-clisp_dir=/usr/lib/clisp
-clc_lib_dir=/usr/lib/common-lisp/clisp
-
-builder=/usr/bin/clisp
-old_mem=$clisp_dir/full/lispinit.mem
-new_mem=$clisp_dir/full/lispinit-new.mem
-clean_mem=$clisp_dir/full/lispinit-clean.mem
-
-lisp_error()
-{
-    echo "Error running $builder" >&2
-    exit 1
-}
-
-mem_error()
-{
-    echo "Error moving new lisp image $new_mem" >&2
-    exit 1
-}
-
-
-case $1 in
-    rebuild)
-	echo $0 Rebuilding packages...
-	shift
-	while [ -x $builder ] && [ ! -z "$1" ] ; do
-	    echo ...rebuilding $1
-	    $builder -norc -q -M $old_mem -x "
-(let ((*compile-print* nil)
-      (*compile-progress* nil)
-      (*compile-verbose*  nil)
-      (*require-verbose* nil)
-      (*load-verbose* nil) 
-      (mk::*load-source-if-no-binary* nil)
-      (mk::*bother-user-if-no-binary* nil)
-      (mk::*compile-during-load* t))
-   (handler-case
-      (progn
-         (c-l-c:compile-library (quote $1))
-         (ext:exit 0)
-       )
-    (error (e)
-      (ignore-errors (format t \"~&Build error: ~A~%\" e))
-      (finish-output)
-      (ext:exit 1))))"  || exit 1
-	    shift
-	done 
-	;;
-    remove)
-	echo $0 Removing packages...
-	shift
-	while [ ! -z "$1" ] ; do
-	    echo ...removing package $1
-	    rm -rf "${clc_lib_dir}/$1"
-	    shift
-	done
-	rmdir $clc_lib_dir 2> /dev/null 
-	;;
-    install-clc)
-	echo Installing clc...
-	if [ ! -f $clean_mem ]; then
-	    cp $old_mem $clean_mem
-	fi
-	if [ -x $clisp_dir/$lisp_builder ]; then
-	    $builder -norc -q -M $clean_mem \
-		-x "
-(handler-case
-  (progn 
-    (when (find-package :c-l-c) ; have to remove 
-      (delete-package :c-l-c))  ; for clisp workaround
-    (load \"$clisp_dir/install-clc.lisp\") 
-    (saveinitmem \"${new_mem}\")
-    (ext:exit 0))
-  (error (e)
-    (ignore-errors (format t \"~&install-clc error: ~A~%\" e))
-    (finish-output)
-    (ext:exit 1)))"   || lisp_error
-  	    mv $new_mem $old_mem || mem_error
-	fi
-	;;
-    remove-clc)
-	if [ -f $clean_mem ]; then
-	    cp $clean_mem $old_mem
-	else
-	    echo "Warning: Can't find original image file $clean_mem. Aborting." >& 2
-	fi
-	;;
-    make-user-image)
-	if [ ! -f $2 ] ; then 
-	    echo "Trying to make-user image, but can not find file $2" >&2
-	    exit 1
-	fi 
-	$builder -norc -q -M $old_mem \
-	    -x "(progn    
-  (load \"$2\") 
-  (saveinitmem \"${new_mem}\"))
-  (ext:exit 0)" || lisp_error
-	mv $new_mem $old_mem || mem_error
-	;;
-    *)
-	echo "`basename $0`: Unknown command $1" >&2
-	echo "Known commands are:" >&2 
-	echo "install-clc, remove-clc, rebuild, remove, and make-user-image" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/dev-lisp/clisp/files/2.39/fastcgi-Makefile-gentoo.patch b/dev-lisp/clisp/files/2.39/fastcgi-Makefile-gentoo.patch
deleted file mode 100644
index 982ec67458ef..000000000000
--- a/dev-lisp/clisp/files/2.39/fastcgi-Makefile-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur clisp-2.39.orig/modules/fastcgi/Makefile.in clisp-2.39/modules/fastcgi/Makefile.in
---- clisp-2.39.orig/modules/fastcgi/Makefile.in	2004-08-12 09:38:36.000000000 -0500
-+++ clisp-2.39/modules/fastcgi/Makefile.in	2006-04-24 15:14:38.000000000 -0500
-@@ -23,10 +23,10 @@
- 	$(CLISP) -c fastcgi.lisp
- 
- fastcgi.o:       fastcgi.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDES) -I.. -c fastcgi.c
- 
- fastcgi_wrappers.o:       fastcgi_wrappers.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi_wrappers.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDES) -I.. -c fastcgi_wrappers.c
- 
- # Make a module
- clisp-module : all
diff --git a/dev-lisp/clisp/files/2.39/install-clc.lisp b/dev-lisp/clisp/files/2.39/install-clc.lisp
deleted file mode 100644
index 06cb217d32cf..000000000000
--- a/dev-lisp/clisp/files/2.39/install-clc.lisp
+++ /dev/null
@@ -1,15 +0,0 @@
-;;;; -*- Mode: Lisp; Package: CL-USER -*-
-;;;; Copyright (c) 2004 Kevin M. Rosenberg
-;;;; GNU GPL v2 license
-
-(in-package #:cl-user)
-
-(handler-case
-    (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")
-  (error (e)
-    (format t "Error during loading of common-lisp-controller.lisp: ~A~%" e)))
-
-(handler-case
-    (common-lisp-controller:init-common-lisp-controller-v4 "clisp")
-  (error (e)
-    (format t "Error during init-common-lisp-controller-v4: ~A~%" e)))
diff --git a/dev-lisp/clisp/files/2.41-fastcgi-Makefile-gentoo.patch b/dev-lisp/clisp/files/2.41-fastcgi-Makefile-gentoo.patch
deleted file mode 100644
index 9e8af6e11ca0..000000000000
--- a/dev-lisp/clisp/files/2.41-fastcgi-Makefile-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur clisp-2.41.orig/modules/fastcgi/Makefile.in clisp-2.41/modules/fastcgi/Makefile.in
---- clisp-2.41.orig/modules/fastcgi/Makefile.in	2004-08-12 09:38:36.000000000 -0500
-+++ clisp-2.41/modules/fastcgi/Makefile.in	2006-04-24 15:14:38.000000000 -0500
-@@ -23,10 +23,10 @@
- 	$(CLISP) -c fastcgi.lisp
- 
- fastcgi.o:       fastcgi.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDES) -I.. -c fastcgi.c
- 
- fastcgi_wrappers.o:       fastcgi_wrappers.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi_wrappers.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDES) -I.. -c fastcgi_wrappers.c
- 
- # Make a module
- clisp-module : all
diff --git a/dev-lisp/clisp/files/2.41-fastcgi-build.patch b/dev-lisp/clisp/files/2.41-fastcgi-build.patch
deleted file mode 100644
index 05206f1acf9a..000000000000
--- a/dev-lisp/clisp/files/2.41-fastcgi-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- clisp-2.41.orig/modules/fastcgi/fastcgi.lisp	2006-10-13 05:02:24.000000000 +0200
-+++ clisp-2.41/modules/fastcgi/fastcgi.lisp	2007-09-08 11:58:49.000000000 +0200
-@@ -147,6 +147,9 @@
- 
- ; --------------   "C" functions
- ;(c-lines "#include \"fastcgi.h\"~%"); completely wrapped
-+(eval-when (compile)
-+  ;;NB this global affects further compilations in this session
-+  (setq ffi:*output-c-functions* t))
- 
- ; Our wrappers
- (def-call-out fcgi_getenv       (:arguments (var c-string))               (:return-type c-string))
diff --git a/dev-lisp/clisp/files/2.41-linux-headers.patch b/dev-lisp/clisp/files/2.41-linux-headers.patch
deleted file mode 100644
index 6da6eefafe88..000000000000
--- a/dev-lisp/clisp/files/2.41-linux-headers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-2007-05-20  Bruno Haible  <bruno@clisp.org>
-
-	* unix.d [UNIX_LINUX && UNIX_GNU]: Don't include <asm/page.h>.
-	* lispbibl.d (UNIX_GNU): Move definition down.
-	Reported by Ulrich Müller <ulm@gentoo.org>.
-
---- src/unix.d	2006/05/23 12:32:25	1.76
-+++ src/unix.d	2007/05/20 13:59:43	1.77
-@@ -174,7 +174,7 @@
-   #ifdef UNIX_AUX
-     #include <sys/mmu.h> /* for SHMLBA */
-   #endif
--  #ifdef UNIX_LINUX
-+  #if defined(UNIX_LINUX) && !defined(UNIX_GNU)
-     #include <asm/page.h> /* for SHMLBA on Linux 2.0 */
-   #endif
-   #if defined(UNIX_SUNOS4) || defined(UNIX_SUNOS5)
---- src/lispbibl.d	2007/04/05 01:56:47	1.718
-+++ src/lispbibl.d	2007/05/20 22:49:59	1.719
-@@ -376,9 +376,6 @@
- #if defined(UNIX_MACOSX) && defined(HAVE_MSYNC)
-   #define UNIX_DARWIN  # MacOS X, a.k.a. Darwin
- #endif
--#if (__GLIBC__ >= 2)
--  #define UNIX_GNU # glibc2 (may be UNIX_LINUX, UNIX_HURD or UNIX_FREEBSD)
--#endif
- 
- 
- # Choose the character set:
-@@ -1267,6 +1264,12 @@
- 
- #include <stdio.h>    /* libc i/o */
- 
-+# A more precise classification of the operating system:
-+# (This test works only after at least one system header has been included.)
-+#if (__GLIBC__ >= 2)
-+  #define UNIX_GNU # glibc2 (may be UNIX_LINUX, UNIX_HURD or UNIX_FREEBSD)
-+#endif
-+
- # Determine the offset of a component 'ident' in a struct of the type 'type':
- # See 0 as pointer to 'type', put a struct 'type' there and determine the
- # address of its component 'ident' and return it as number: