Add manuals for versions 19 and 20. Patchsets moved to mirrors.

(Portage version: 2.2_rc40/cvs/Linux i686)

9 files changed, 94 insertions, 279 deletions

diff --git a/app-doc/elisp-manual/ChangeLog b/app-doc/elisp-manual/ChangeLog
index 0e322162b139..87a1586d909d 100644
--- a/app-doc/elisp-manual/ChangeLog
+++ b/app-doc/elisp-manual/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-doc/elisp-manual
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/ChangeLog,v 1.15 2009/09/05 23:40:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/ChangeLog,v 1.16 2009/09/17 15:00:02 ulm Exp $
+
+*elisp-manual-20.2.5 (17 Sep 2009)
+*elisp-manual-19.2.4.2 (17 Sep 2009)
+
+  17 Sep 2009; Ulrich Mueller <ulm@gentoo.org>
+  -files/elisp-manual-18.1.03-direntry.patch,
+  -files/elisp-manual-18.1.03-fix-texinfo.patch,
+  -files/elisp-manual-21.2.8-direntry.patch,
+  -files/elisp-manual-21.2.8-fix-texinfo.patch,
+  elisp-manual-18.1.03.ebuild, +elisp-manual-19.2.4.2.ebuild,
+  +elisp-manual-20.2.5.ebuild, elisp-manual-21.2.8-r2.ebuild:
+  Add manuals for Emacs versions 19 and 20, for the sake of completeness.
+  Patchsets moved to mirrors.
 
 *elisp-manual-23.3.0 (05 Sep 2009)
 *elisp-manual-22.2.9 (05 Sep 2009)
diff --git a/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild b/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild
index 58868a540901..bdf67acfb089 100644
--- a/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild,v 1.7 2009/09/05 23:40:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild,v 1.8 2009/09/17 15:00:02 ulm Exp $
 
 inherit eutils
 
 MY_P=${PN}-${PV/./-}
 DESCRIPTION="The GNU Emacs Lisp Reference Manual"
 HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
-SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${MY_P}.tar.gz
+	mirror://gentoo/${P}-patches.tar.gz"
 
 LICENSE="as-is"
 SLOT="18"
@@ -21,8 +22,7 @@ src_unpack() {
 	cd "${S}"
 	# remove pre-made info files
 	rm -f elisp elisp-[0-9]*
-	epatch "${FILESDIR}/${P}-fix-texinfo.patch"
-	epatch "${FILESDIR}/${P}-direntry.patch"
+	EPATCH_SUFFIX=patch epatch
 }
 
 src_compile() {
diff --git a/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild b/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild
new file mode 100644
index 000000000000..6f37aefab9a6
--- /dev/null
+++ b/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild,v 1.1 2009/09/17 15:00:02 ulm Exp $
+
+inherit eutils
+
+MY_P=${PN}-${PV/./-}
+DESCRIPTION="The GNU Emacs Lisp Reference Manual"
+HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
+SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${MY_P}.tar.gz
+	mirror://gentoo/${P}-patches.tar.gz"
+
+LICENSE="as-is"
+SLOT="19"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# remove pre-made info files
+	rm -f elisp elisp-[0-9]*
+	EPATCH_SUFFIX=patch epatch
+}
+
+src_compile() {
+	ln -s index.unperm index.texi
+	makeinfo elisp.texi || die "makeinfo failed"
+}
+
+src_install() {
+	doinfo elisp19.info* || die "doinfo failed"
+	dodoc README
+}
diff --git a/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild b/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild
new file mode 100644
index 000000000000..90f3b8d4b5cd
--- /dev/null
+++ b/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild,v 1.1 2009/09/17 15:00:02 ulm Exp $
+
+inherit eutils
+
+MY_P=${PN}-${PV/./-}
+DESCRIPTION="The GNU Emacs Lisp Reference Manual"
+HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
+SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${MY_P}.tar.gz
+	mirror://gentoo/${P}-patches.tar.gz"
+
+LICENSE="as-is"
+SLOT="20"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# remove pre-made info files
+	rm -f elisp elisp-[0-9]*
+	EPATCH_SUFFIX=patch epatch
+}
+
+src_compile() {
+	ln -s index.unperm index.texi
+	makeinfo elisp.texi || die "makeinfo failed"
+}
+
+src_install() {
+	doinfo elisp20.info* || die "doinfo failed"
+	dodoc README
+}
diff --git a/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild b/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild
index 8b9e20e243aa..a6dc27561b06 100644
--- a/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild,v 1.8 2009/09/05 23:40:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild,v 1.9 2009/09/17 15:00:02 ulm Exp $
 
 inherit eutils
 
 MY_P=${PN}-${PV/./-}
 DESCRIPTION="The GNU Emacs Lisp Reference Manual"
 HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
-SRC_URI="mirror://gnu/emacs/${MY_P}.tar.gz"
+SRC_URI="mirror://gnu/emacs/${MY_P}.tar.gz
+	mirror://gentoo/${P}-patches.tar.gz"
 
 LICENSE="FDL-1.1"
 SLOT="21"
@@ -21,8 +22,7 @@ src_unpack() {
 	cd "${S}"
 	# remove pre-made info files
 	rm -f elisp elisp-[0-9]*
-	epatch "${FILESDIR}/${P}-fix-texinfo.patch"
-	epatch "${FILESDIR}/${P}-direntry.patch"
+	EPATCH_SUFFIX=patch epatch
 }
 
 src_compile() {
diff --git a/app-doc/elisp-manual/files/elisp-manual-18.1.03-direntry.patch b/app-doc/elisp-manual/files/elisp-manual-18.1.03-direntry.patch
deleted file mode 100644
index 4918ada959e1..000000000000
--- a/app-doc/elisp-manual/files/elisp-manual-18.1.03-direntry.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- elisp-orig/elisp.texi
-+++ elisp/elisp.texi
-@@ -1,8 +1,13 @@
- \input texinfo  @c -*-texinfo-*-
- @c %**start of header
--@setfilename elisp
-+@setfilename elisp18.info
- @settitle GNU Emacs Lisp Reference Manual
- @c %**end of header
- 
-+@dircategory Emacs
-+@direntry
-+* Elisp 18: (elisp18).	The Emacs Lisp Reference Manual for Emacs 18.
-+@end direntry
-+
- @c ================================================================
- @c THIS file has the new style title page commands.
diff --git a/app-doc/elisp-manual/files/elisp-manual-18.1.03-fix-texinfo.patch b/app-doc/elisp-manual/files/elisp-manual-18.1.03-fix-texinfo.patch
deleted file mode 100644
index c23c40a40dc4..000000000000
--- a/app-doc/elisp-manual/files/elisp-manual-18.1.03-fix-texinfo.patch
+++ /dev/null
@@ -1,153 +0,0 @@
---- elisp-orig/display.texi
-+++ elisp/display.texi
-@@ -484,5 +484,5 @@
- 
- @quotation
--@strong{Note:} in version 18, this function is named
-+@strong{Please note:} in version 18, this function is named
- @code{blink-paren-hook}, but since it is not called with the standard
- convention for hooks, it is being renamed to @code{blink-paren-function}
---- elisp-orig/elisp.texi
-+++ elisp/elisp.texi
-@@ -112,5 +112,5 @@
- @page
- 
--@node Top, Introduction, (dir), (dir)
-+@node Top, License, (dir), (dir)
- 
- @ifinfo
---- elisp-orig/files.texi
-+++ elisp/files.texi
-@@ -189,6 +189,6 @@
- appended to get an unused name.  See also @ref{Creating Buffers}.
- 
--@strong{Note:} @code{create-file-buffer} does @emph{not} associate the
--new buffer with a file and does not make it the current buffer.
-+@strong{Please note:} @code{create-file-buffer} does @emph{not} associate
-+the new buffer with a file and does not make it the current buffer.
- 
- @example
---- elisp-orig/help.texi
-+++ elisp/help.texi
-@@ -252,6 +252,6 @@
- @end table
- 
--@strong{Note:} each @samp{\} must be doubled when written in a string in
--Emacs Lisp.
-+@strong{Please note:} each @samp{\} must be doubled when written in a
-+string in Emacs Lisp.
- 
-   Here are examples of the special substrings:
---- elisp-orig/hooks.texi
-+++ elisp/hooks.texi
-@@ -12,5 +12,5 @@
- 
- @quotation
--@strong{Note:} in version 19, @code{blink-paren-hook} and
-+@strong{Please note:} in version 19, @code{blink-paren-hook} and
- @code{auto-fill-hook} are renamed to @code{blink-paren-function} and
- @code{auto-fill-function} respectively, since they are not called by the
---- elisp-orig/markers.texi
-+++ elisp/markers.texi
-@@ -364,6 +364,6 @@
- The old value of the mark is @emph{not} pushed onto the mark ring.
- 
--  @strong{Note:} use this function only if you want the user to see that
--the mark has moved, and you want the previous mark position to be lost.
-+  @strong{Please note:} use this function only if you want the user to see
-+that the mark has moved, and you want the previous mark position to be lost.
- Normally, when a new mark is set, the old one should go on the
- @code{mark-ring}, which is why most applications should use
---- elisp-orig/os.texi
-+++ elisp/os.texi
-@@ -90,5 +90,5 @@
- @end defopt
- 
--@node Init File, Terminal-Specific, Start-Up Summary, Starting Up
-+@node Init File, Terminal-Specific, Start-up Summary, Starting Up
- @subsection The Init File: @file{.emacs}
- @cindex init file
-@@ -688,5 +688,5 @@
- are swapped and the characters @kbd{C-q} and @kbd{C-^} are swapped.
- After executing this function, typing @kbd{C-\} has all the usual
--effects of typing @kbd{C-s}, and vice versa.  (@xref{Flow Control} for
-+effects of typing @kbd{C-s}, and vice versa.  (@xref{Flow Control}, for
- more information on this subject.)
- 
-@@ -743,6 +743,6 @@
- you will have to start Emacs afresh to make this take effect.
- 
--@strong{Note:} In version 19, @code{baud-rate} is a variable so that you
--can change it conveniently within Emacs.
-+@strong{Please note:} In version 19, @code{baud-rate} is a variable so
-+that you can change it conveniently within Emacs.
- @end defun
- 
---- elisp-orig/positions.texi
-+++ elisp/positions.texi
-@@ -75,5 +75,5 @@
- current buffer.  This is @code{(1+ (buffer-size))}, unless narrowing is
- in effect, in which case it is the position of the end of the region
--that you narrowed to.  (@xref{Narrowing}).
-+that you narrowed to.  (@xref{Narrowing}.)
- @end defun
- 
-@@ -745,5 +745,5 @@
- last of @var{forms}, or @code{nil} if no forms were given.
- 
--@strong{Note:} it is easy to make a mistake when using
-+@strong{Caution:} it is easy to make a mistake when using
- @code{save-restriction}.  Read the entire description here before you
- try it.
---- elisp-orig/processes.texi
-+++ elisp/processes.texi
-@@ -90,8 +90,8 @@
- supplied to @var{program} as separate command line arguments.  Wildcard
- characters and other shell constructs are not allowed in these strings,
--since they are passed directly to the specified program.  @strong{Note:}
--the argument @var{program} contains only the name of the program; it may
--not contain any command-line arguments.  Such arguments must be provided
--via @var{args}.
-+since they are passed directly to the specified program.
-+@strong{Please note:} the argument @var{program} contains only the name
-+of the program; it may not contain any command-line arguments.  Such
-+arguments must be provided via @var{args}.
- 
-   The subprocess gets its current directory from the value of
---- elisp-orig/searching.texi
-+++ elisp/searching.texi
-@@ -292,10 +292,10 @@
- @end table
- 
--@strong{Note:} for historical compatibility, special characters are treated as
--ordinary ones if they are in contexts where their special meanings make no
--sense.  For example, @samp{*foo} treats @samp{*} as ordinary since there is
--no preceding expression on which the @samp{*} can act.  It is poor practice
--to depend on this behavior; better to quote the special character anyway,
--regardless of where it appears.@refill
-+@strong{Please note:} for historical compatibility, special characters
-+are treated as ordinary ones if they are in contexts where their special
-+meanings make no sense.  For example, @samp{*foo} treats @samp{*} as
-+ordinary since there is no preceding expression on which the @samp{*}
-+can act.  It is poor practice to depend on this behavior; better to quote
-+the special character anyway, regardless of where it appears.@refill
- 
- For the most part, @samp{\} followed by any character matches only
---- elisp-orig/strings.texi
-+++ elisp/strings.texi
-@@ -621,5 +621,5 @@
-   The definition of a word is any sequence of consecutive characters
- that are assigned to the word constituent category in the current syntax
--table (@xref{Syntax Class Table}).
-+table (@pxref{Syntax Class Table}).
- 
-   When the argument to @code{capitalize} is a character, @code{capitalize}
---- elisp-orig/variables.texi
-+++ elisp/variables.texi
-@@ -425,5 +425,5 @@
- of @var{symbol} to the result, provided @var{value} is given.
- 
--@strong{Note:} don't use @code{defconst} for user option variables in
-+Don't use @code{defconst} for user option variables in
- libraries that are not normally loaded.  The user should be able to
- specify a value for such a variable in the @file{.emacs} file, so that
diff --git a/app-doc/elisp-manual/files/elisp-manual-21.2.8-direntry.patch b/app-doc/elisp-manual/files/elisp-manual-21.2.8-direntry.patch
deleted file mode 100644
index baaa6a96944a..000000000000
--- a/app-doc/elisp-manual/files/elisp-manual-21.2.8-direntry.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- elisp-manual-21-2.8-orig/elisp.texi
-+++ elisp-manual-21-2.8/elisp.texi
-@@ -1,11 +1,11 @@
- \input texinfo  @c -*-texinfo-*-
- @c %**start of header
--@setfilename elisp
-+@setfilename elisp21.info
- @settitle GNU Emacs Lisp Reference Manual
- @c %**end of header
- 
--@dircategory Editors
-+@dircategory Emacs
- @direntry
--* Elisp: (elisp).	The Emacs Lisp Reference Manual.
-+* Elisp 21: (elisp21).	The Emacs Lisp Reference Manual for Emacs 21.
- @end direntry
- 
diff --git a/app-doc/elisp-manual/files/elisp-manual-21.2.8-fix-texinfo.patch b/app-doc/elisp-manual/files/elisp-manual-21.2.8-fix-texinfo.patch
deleted file mode 100644
index e2408867d04a..000000000000
--- a/app-doc/elisp-manual/files/elisp-manual-21.2.8-fix-texinfo.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Change all occurences of @strong{Note:} to avoid makeinfo warnings and
-spurious cross references. This is a backport of the following change:
-
-2003-09-26  Richard M. Stallman  <rms@gnu.org>
-
-	* buffers.texi, commands.texi, debugging.texi, eval.texi:
-	* loading.texi, minibuf.texi, text.texi, variables.texi:
-	Avoid @strong{Note:}.
-
---- elisp-orig/buffers.texi
-+++ elisp/buffers.texi
-@@ -107,5 +107,5 @@
- that, you must use the functions described in @ref{Displaying Buffers}.
- 
--  @strong{Note:} Lisp functions that change to a different current buffer
-+  @strong{Warning:} Lisp functions that change to a different current buffer
- should not depend on the command loop to set it back afterwards.
- Editing commands written in Emacs Lisp can be called from other programs
---- elisp-orig/commands.texi
-+++ elisp/commands.texi
-@@ -2018,5 +2018,5 @@
- function.
- 
--@strong{Note:} Don't bind this variable with @code{let}.  It is often
-+@strong{Warning:} Don't bind this variable with @code{let}.  It is often
- buffer-local, and if you bind it around reading input (which is exactly
- when you @emph{would} bind it), switching buffers asynchronously while
---- elisp-orig/debugging.texi
-+++ elisp/debugging.texi
-@@ -216,5 +216,5 @@
- @code{debug-on-entry} always returns @var{function-name}.
- 
--@strong{Note:} if you redefine a function after using
-+@strong{Warning:} if you redefine a function after using
- @code{debug-on-entry} on it, the code to enter the debugger is discarded
- by the redefinition.  In effect, redefining the function cancels
---- elisp-orig/eval.texi
-+++ elisp/eval.texi
-@@ -589,5 +589,5 @@
- values.  Loading a file also does evaluation (@pxref{Loading}).
- 
--  @strong{Note:} it is generally cleaner and more flexible to store a
-+  It is generally cleaner and more flexible to store a
- function in a data structure, and call it with @code{funcall} or
- @code{apply}, than to store an expression in the data structure and
---- elisp-orig/loading.texi
-+++ elisp/loading.texi
-@@ -149,5 +149,5 @@
- functions should use @code{read}.
- 
--@strong{Note:} Instead of using this variable, it is cleaner to use
-+Instead of using this variable, it is cleaner to use
- another, newer feature: to pass the function as the @var{read-function}
- argument to @code{eval-region}.  @xref{Eval}.
---- elisp-orig/minibuf.texi
-+++ elisp/minibuf.texi
-@@ -1064,6 +1064,6 @@
- case, point goes at the beginning of @var{initial}.  The default for
- @var{initial} is @code{nil}---don't insert any file name.  To see what
--@var{initial} does, try the command @kbd{C-x C-v}.  @strong{Note:} we
--recommend using @var{default} rather than @var{initial} in most cases.
-+@var{initial} does, try the command @kbd{C-x C-v}.  @strong{Please note:}
-+we recommend using @var{default} rather than @var{initial} in most cases.
- 
- Here is an example: 
---- elisp-orig/text.texi
-+++ elisp/text.texi
-@@ -3694,5 +3694,5 @@
- the body of a @code{combine-after-change-calls} form.
- 
--@strong{Note:} If the changes you combine occur in widely scattered
-+@strong{Warning:} If the changes you combine occur in widely scattered
- parts of the buffer, this will still work, but it is not advisable,
- because it may lead to inefficient behavior for some change hook
---- elisp-orig/variables.texi
-+++ elisp/variables.texi
-@@ -1290,5 +1290,5 @@
- Displays}.
- 
--@strong{Note:} Do not use @code{make-local-variable} for a hook
-+@strong{Warning:} Do not use @code{make-local-variable} for a hook
- variable.  Instead, use @code{make-local-hook}.  @xref{Hooks}.
- @end deffn