Add stand-alone manual for Emacs 22 and 23.

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

7 files changed, 123 insertions, 11 deletions

diff --git a/app-doc/elisp-manual/ChangeLog b/app-doc/elisp-manual/ChangeLog
index 1dc1eb7c055c..0e322162b139 100644
--- a/app-doc/elisp-manual/ChangeLog
+++ b/app-doc/elisp-manual/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-doc/elisp-manual
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/ChangeLog,v 1.14 2009/02/17 08:08:10 ulm Exp $
+# 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 $
+
+*elisp-manual-23.3.0 (05 Sep 2009)
+*elisp-manual-22.2.9 (05 Sep 2009)
+
+  05 Sep 2009; Ulrich Mueller <ulm@gentoo.org> elisp-manual-18.1.03.ebuild,
+  elisp-manual-21.2.8-r2.ebuild, +elisp-manual-22.2.9.ebuild,
+  +files/elisp-manual-22.2.9-direntry.patch, +elisp-manual-23.3.0.ebuild,
+  +files/elisp-manual-23.3.0-direntry.patch:
+  Add stand-alone manual for Emacs 22 and 23. Don't use versionator.eclass,
+  it has no advantage here.
 
   17 Feb 2009; Ulrich Mueller <ulm@gentoo.org> elisp-manual-18.1.03.ebuild,
   elisp-manual-21.2.8-r2.ebuild:
@@ -99,7 +109,7 @@
   adding s390 keywords
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
+
 *elisp-manual-21.2.8 (23 Aug 2002)
 
   23 Aug 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
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 ff770fd0d8bb..58868a540901 100644
--- a/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild
@@ -1,11 +1,10 @@
 # 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.6 2009/02/17 08:08:10 ulm Exp $
+# $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 $
 
-inherit eutils versionator
+inherit eutils
 
-MY_PV=$(replace_version_separator 1 '-')
-MY_P=${PN}-${MY_PV}
+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"
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 dcca07fb3e7c..8b9e20e243aa 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,11 +1,10 @@
 # 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.7 2009/02/17 08:08:10 ulm Exp $
+# $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 $
 
-inherit eutils versionator
+inherit eutils
 
-MY_PV=$(replace_version_separator 1 '-')
-MY_P=${PN}-${MY_PV}
+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"
diff --git a/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild b/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild
new file mode 100644
index 000000000000..8332ca6466e8
--- /dev/null
+++ b/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild
@@ -0,0 +1,33 @@
+# 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-22.2.9.ebuild,v 1.1 2009/09/05 23:40:01 ulm Exp $
+
+inherit eutils
+
+MY_P=${PN}-${PV/./-}
+DESCRIPTION="The GNU Emacs Lisp Reference Manual"
+HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
+# Taken from lispref/ of emacs-22.3
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="FDL-1.2"
+SLOT="22"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-direntry.patch"
+}
+
+src_compile() {
+	makeinfo elisp.texi || die "makeinfo failed"
+}
+
+src_install() {
+	doinfo elisp22.info* || die "doinfo failed"
+	dodoc ChangeLog README
+}
diff --git a/app-doc/elisp-manual/elisp-manual-23.3.0.ebuild b/app-doc/elisp-manual/elisp-manual-23.3.0.ebuild
new file mode 100644
index 000000000000..5ccf35e5b06e
--- /dev/null
+++ b/app-doc/elisp-manual/elisp-manual-23.3.0.ebuild
@@ -0,0 +1,33 @@
+# 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-23.3.0.ebuild,v 1.1 2009/09/05 23:40:01 ulm Exp $
+
+inherit eutils
+
+MY_P=${PN}-${PV/./-}
+DESCRIPTION="The GNU Emacs Lisp Reference Manual"
+HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
+# Taken from doc/lispref/ of emacs-23.1
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="FDL-1.3"
+SLOT="23"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-direntry.patch"
+}
+
+src_compile() {
+	makeinfo elisp.texi || die "makeinfo failed"
+}
+
+src_install() {
+	doinfo elisp23.info* || die "doinfo failed"
+	dodoc ChangeLog README
+}
diff --git a/app-doc/elisp-manual/files/elisp-manual-22.2.9-direntry.patch b/app-doc/elisp-manual/files/elisp-manual-22.2.9-direntry.patch
new file mode 100644
index 000000000000..090e03a7a622
--- /dev/null
+++ b/app-doc/elisp-manual/files/elisp-manual-22.2.9-direntry.patch
@@ -0,0 +1,19 @@
+--- elisp-manual-22-2.9-orig/elisp.texi
++++ elisp-manual-22-2.9/elisp.texi
+@@ -1,6 +1,6 @@
+ \input texinfo  @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename elisp
++@setfilename elisp22.info
+ @settitle GNU Emacs Lisp Reference Manual
+ @c %**end of header
+ 
+@@ -11,7 +11,7 @@
+ 
+ @dircategory Emacs
+ @direntry
+-* Elisp: (elisp).       The Emacs Lisp Reference Manual.
++* Elisp 22: (elisp22).  The Emacs Lisp Reference Manual for Emacs 22.
+ @end direntry
+ 
+ @c in general, keep the following line commented out, unless doing a
diff --git a/app-doc/elisp-manual/files/elisp-manual-23.3.0-direntry.patch b/app-doc/elisp-manual/files/elisp-manual-23.3.0-direntry.patch
new file mode 100644
index 000000000000..ee0cd80ad470
--- /dev/null
+++ b/app-doc/elisp-manual/files/elisp-manual-23.3.0-direntry.patch
@@ -0,0 +1,19 @@
+--- elisp-manual-23-3.0-orig/elisp.texi
++++ elisp-manual-23-3.0/elisp.texi
+@@ -1,6 +1,6 @@
+ \input texinfo  @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename elisp
++@setfilename elisp23.info
+ @settitle GNU Emacs Lisp Reference Manual
+ @c %**end of header
+ 
+@@ -65,7 +65,7 @@
+ 
+ @dircategory Emacs
+ @direntry
+-* Elisp: (elisp).       The Emacs Lisp Reference Manual.
++* Elisp 23: (elisp23).  The Emacs Lisp Reference Manual for Emacs 23.
+ @end direntry
+ 
+ @titlepage