Add build-time dependency on sys-apps/texinfo. Make version 23.4 build with makeinfo 5. EAPI bump.

(Portage version: 2.1.11.59/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

9 files changed, 69 insertions, 76 deletions

diff --git a/app-doc/elisp-manual/ChangeLog b/app-doc/elisp-manual/ChangeLog
index 6b2511acf8a0..0de90750ceec 100644
--- a/app-doc/elisp-manual/ChangeLog
+++ b/app-doc/elisp-manual/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-doc/elisp-manual
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/ChangeLog,v 1.51 2013/03/15 08:41:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/ChangeLog,v 1.52 2013/04/01 23:27:09 ulm Exp $
+
+  01 Apr 2013; Ulrich Müller <ulm@gentoo.org> 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, elisp-manual-22.2.9.ebuild,
+  elisp-manual-23.4.ebuild, -files/elisp-manual-23.4-direntry.patch,
+  elisp-manual-24.3.ebuild:
+  Add build-time dependency on sys-apps/texinfo. Make version 23.4 build with
+  makeinfo 5. EAPI bump.
 
 *elisp-manual-24.3 (12 Mar 2013)
 
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 9b771c533d85..b6d641904c98 100644
--- a/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.12 2012/07/29 17:34:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild,v 1.13 2013/04/01 23:27:09 ulm Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -13,24 +15,23 @@ SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${MY_P}.tar.gz
 LICENSE="Texinfo-manual"
 SLOT="18"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
+
+DEPEND="sys-apps/texinfo"
 
 S="${WORKDIR}/elisp"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# 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"
+	ln -s index.unperm index.texi || die
+	makeinfo elisp.texi || die
 }
 
 src_install() {
-	doinfo elisp18.info* || die "doinfo failed"
+	doinfo elisp18.info*
 	dodoc README
 }
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
index 398a5f2af23d..3a10e72cb8c7 100644
--- a/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.5 2012/07/29 17:34:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild,v 1.6 2013/04/01 23:27:09 ulm Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -13,24 +15,23 @@ SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${MY_P}.tar.gz
 LICENSE="Texinfo-manual"
 SLOT="19"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+
+DEPEND="sys-apps/texinfo"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# 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"
+	ln -s index.unperm index.texi || die
+	makeinfo elisp.texi || die
 }
 
 src_install() {
-	doinfo elisp19.info* || die "doinfo failed"
+	doinfo elisp19.info*
 	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
index 721f34c1b4b9..1545b198d3b6 100644
--- a/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.5 2012/07/29 17:34:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild,v 1.6 2013/04/01 23:27:09 ulm Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -13,24 +15,23 @@ SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${MY_P}.tar.gz
 LICENSE="Texinfo-manual"
 SLOT="20"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+
+DEPEND="sys-apps/texinfo"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# 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"
+	ln -s index.unperm index.texi || die
+	makeinfo elisp.texi || die
 }
 
 src_install() {
-	doinfo elisp20.info* || die "doinfo failed"
+	doinfo elisp20.info*
 	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 618ca2a2df18..aa694df42a70 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,6 +1,8 @@
 # Copyright 1999-2013 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.12 2013/03/15 08:41:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild,v 1.13 2013/04/01 23:27:09 ulm Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -13,24 +15,23 @@ SRC_URI="mirror://gnu/emacs/${MY_P}.tar.gz
 LICENSE="FDL-1.1+"
 SLOT="21"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
+
+DEPEND="sys-apps/texinfo"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# 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"
+	ln -s index.unperm index.texi || die
+	makeinfo elisp.texi || die
 }
 
 src_install() {
-	doinfo elisp21.info* || die "doinfo failed"
+	doinfo elisp21.info*
 	dodoc README
 }
diff --git a/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild b/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild
index e933b5ad94f3..741f911b86c3 100644
--- a/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2013 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.8 2013/03/15 08:41:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild,v 1.9 2013/04/01 23:27:09 ulm Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -13,21 +15,20 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 LICENSE="FDL-1.2+"
 SLOT="22"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
+
+DEPEND="sys-apps/texinfo"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${P}-direntry.patch"
 }
 
 src_compile() {
-	makeinfo elisp.texi || die "makeinfo failed"
+	makeinfo elisp.texi || die
 }
 
 src_install() {
-	doinfo elisp22.info* || die "doinfo failed"
+	doinfo elisp22.info*
 	dodoc ChangeLog README
 }
diff --git a/app-doc/elisp-manual/elisp-manual-23.4.ebuild b/app-doc/elisp-manual/elisp-manual-23.4.ebuild
index e61771b31486..c136ddc6f65d 100644
--- a/app-doc/elisp-manual/elisp-manual-23.4.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-23.4.ebuild
@@ -1,34 +1,35 @@
 # Copyright 1999-2013 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.4.ebuild,v 1.7 2013/03/15 08:41:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-23.4.ebuild,v 1.8 2013/04/01 23:27:09 ulm Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils
 
 DESCRIPTION="The GNU Emacs Lisp Reference Manual"
 HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
 # taken from doc/lispref/ of emacs-${PV}
-SRC_URI="mirror://gentoo/${P}.tar.xz"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	mirror://gentoo/${P}-patches-1.tar.xz"
 
 LICENSE="FDL-1.3+"
 SLOT="23"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
 
-DEPEND="app-arch/xz-utils"
+DEPEND="app-arch/xz-utils
+	sys-apps/texinfo"
 
 S="${WORKDIR}/lispref"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-direntry.patch"
+	EPATCH_SUFFIX=patch epatch
 }
 
 src_compile() {
-	makeinfo elisp.texi || die "makeinfo failed"
+	makeinfo elisp.texi || die
 }
 
 src_install() {
-	doinfo elisp23.info*
+	doinfo elisp${SLOT}.info*
 	dodoc ChangeLog README
 }
diff --git a/app-doc/elisp-manual/elisp-manual-24.3.ebuild b/app-doc/elisp-manual/elisp-manual-24.3.ebuild
index ded97c8f8e8f..0579e48035bd 100644
--- a/app-doc/elisp-manual/elisp-manual-24.3.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-24.3.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/app-doc/elisp-manual/elisp-manual-24.3.ebuild,v 1.1 2013/03/15 08:41:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-24.3.ebuild,v 1.2 2013/04/01 23:27:09 ulm Exp $
 
 EAPI=5
 
@@ -15,7 +15,8 @@ LICENSE="FDL-1.3+"
 SLOT="24"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
-DEPEND="app-arch/xz-utils"
+DEPEND="app-arch/xz-utils
+	sys-apps/texinfo"
 
 S="${WORKDIR}/lispref"
 
@@ -25,7 +26,7 @@ src_prepare() {
 }
 
 src_compile() {
-	makeinfo elisp.texi || die "makeinfo failed"
+	makeinfo elisp.texi || die
 }
 
 src_install() {
diff --git a/app-doc/elisp-manual/files/elisp-manual-23.4-direntry.patch b/app-doc/elisp-manual/files/elisp-manual-23.4-direntry.patch
deleted file mode 100644
index b0a085f1633b..000000000000
--- a/app-doc/elisp-manual/files/elisp-manual-23.4-direntry.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lispref-orig/elisp.texi
-+++ lispref/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
- 
-@@ -63,9 +63,9 @@
- @end quotation
- @end copying
- 
--@dircategory GNU Emacs Lisp
-+@dircategory Emacs
- @direntry
--* Elisp: (elisp).       The Emacs Lisp Reference Manual.
-+* Elisp 23: (elisp23).  The Emacs Lisp Reference Manual for Emacs 23.
- @end direntry
- 
- @titlepage