summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-04-03 21:50:25 +0000
committerUlrich Müller <ulm@gentoo.org>2013-04-03 21:50:25 +0000
commitcd24ac68afd894dc80d8cad6d0bef3537c0f47e6 (patch)
tree5f959acb182cad635fece82af9a27b66aa60d1a6 /app-emacs
parentmuch nicer way of installing required files, thanks to floppym for the idea (diff)
downloadgentoo-2-cd24ac68afd894dc80d8cad6d0bef3537c0f47e6.tar.gz
gentoo-2-cd24ac68afd894dc80d8cad6d0bef3537c0f47e6.tar.bz2
gentoo-2-cd24ac68afd894dc80d8cad6d0bef3537c0f47e6.zip
Version bump. Fix build failure with texinfo-5.1, bug 464316. Remove old.
(Portage version: 2.1.11.60/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/yatex/ChangeLog10
-rw-r--r--app-emacs/yatex/files/yatex-1.73-gentoo.patch72
-rw-r--r--app-emacs/yatex/files/yatex-1.77-texinfo-5.patch86
-rw-r--r--app-emacs/yatex/yatex-1.74.ebuild53
-rw-r--r--app-emacs/yatex/yatex-1.77.ebuild52
5 files changed, 146 insertions, 127 deletions
diff --git a/app-emacs/yatex/ChangeLog b/app-emacs/yatex/ChangeLog
index 2b55f3cdaa46..9ef19a0c4240 100644
--- a/app-emacs/yatex/ChangeLog
+++ b/app-emacs/yatex/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-emacs/yatex
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/ChangeLog,v 1.41 2012/10/17 11:26:05 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/ChangeLog,v 1.42 2013/04/03 21:50:25 ulm Exp $
+
+*yatex-1.77 (03 Apr 2013)
+
+ 03 Apr 2013; Ulrich Müller <ulm@gentoo.org> -files/yatex-1.73-gentoo.patch,
+ -yatex-1.74.ebuild, +yatex-1.77.ebuild, +files/yatex-1.77-texinfo-5.patch:
+ Version bump. Fix build failure with texinfo-5.1, bug 464316. Remove old.
17 Oct 2012; Anthony G. Basile <blueness@gentoo.org> yatex-1.76.ebuild:
stable ppc, bug #433187
diff --git a/app-emacs/yatex/files/yatex-1.73-gentoo.patch b/app-emacs/yatex/files/yatex-1.73-gentoo.patch
deleted file mode 100644
index 79a707516d1a..000000000000
--- a/app-emacs/yatex/files/yatex-1.73-gentoo.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- yatex1.73-orig/yatexhlp.el 2006-12-24 07:25:29.000000000 +0100
-+++ yatex1.73/yatexhlp.el 2008-05-12 12:19:02.000000000 +0200
-@@ -9,12 +9,7 @@
- (cond (YaTeX-japan "jp")
- (t "eng"))))
- (help-dir
-- (cond
-- ((and (boundp 'site-directory) site-directory) site-directory)
-- ((string-match "\\.app/" doc-directory) ;For Emacs.app(Darwin)
-- (expand-file-name "../site-lisp" doc-directory))
-- (YaTeX-emacs-19 (expand-file-name "../../site-lisp" doc-directory))
-- (t exec-directory))))
-+ "/usr/share/emacs/etc/yatex"))
- (defvar YaTeX-help-file
- (expand-file-name help-file help-dir)
- "*Help file of LaTeX/TeX commands or macros.")
---- yatex1.73-orig/docs/yahtmle 2006-12-24 07:28:10.000000000 +0100
-+++ yatex1.73/docs/yahtmle 2008-05-12 12:19:40.000000000 +0200
-@@ -3,8 +3,9 @@
- from file `yahtmle.tex'
- using `texinfmt.el' version 2.32 of 19 November 1993.
-
--
--
-+START-INFO-DIR-ENTRY
-+* yahtml: (yahtml). Yet Another HTML-mode for Emacs. (English).
-+END-INFO-DIR-ENTRY
-
- 
- File: yahtmle, Node: Top, Next: Intro, Prev: (dir), Up: (dir)
---- yatex1.73-orig/docs/yahtmlj 2006-12-24 07:28:10.000000000 +0100
-+++ yatex1.73/docs/yahtmlj 2008-05-12 12:21:03.000000000 +0200
-@@ -3,8 +3,9 @@
- from file `yahtmlj.tex'
- using `texinfmt.el' version 2.32 of 19 November 1993.
-
--
--
-+START-INFO-DIR-ENTRY
-+* yahtml-ja: (yahtml-ja). Yet Another HTML-mode for Emacs. (Japanese).
-+END-INFO-DIR-ENTRY
-
- 
- File: yahtmlj, Node: Top, Next: Intro, Prev: (dir), Up: (dir)
---- yatex1.73-orig/docs/yatexe 2006-12-24 07:28:10.000000000 +0100
-+++ yatex1.73/docs/yatexe 2008-05-12 12:20:30.000000000 +0200
-@@ -3,8 +3,9 @@
- from file `yatexe.tex'
- using `texinfmt.el' version 2.32 of 19 November 1993.
-
--
--
-+START-INFO-DIR-ENTRY
-+* YaTeX: (yatex). Yet Another tex-mode for Emacs. (English).
-+END-INFO-DIR-ENTRY
-
- 
- File: yatexe, Node: Top, Next: What is YaTeX?, Prev: (dir), Up: (dir)
---- yatex1.73-orig/docs/yatexj 2006-12-24 07:28:10.000000000 +0100
-+++ yatex1.73/docs/yatexj 2008-05-12 12:20:56.000000000 +0200
-@@ -3,8 +3,9 @@
- from file `yatexj.tex'
- using `texinfmt.el' version 2.32 of 19 November 1993.
-
--
--
-+START-INFO-DIR-ENTRY
-+* YaTeX-ja: (yatex-ja). Yet Another tex-mode for Emacs. (Japanese).
-+END-INFO-DIR-ENTRY
-
- 
- File: yatexj, Node: Top, Next: Intro, Prev: (dir), Up: (dir)
diff --git a/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch b/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch
new file mode 100644
index 000000000000..73ff873cce34
--- /dev/null
+++ b/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch
@@ -0,0 +1,86 @@
+--- yatex1.77-orig/docs/yahtmle.tex
++++ yatex1.77/docs/yahtmle.tex
+@@ -1,4 +1,4 @@
+-\def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1
++@c \def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1
+ \input texinfo
+ @setfilename yahtml.info
+ @settitle Yet Another html-mode for Emacs
+--- yatex1.77-orig/docs/yahtmlj.tex
++++ yatex1.77/docs/yahtmlj.tex
+@@ -1,4 +1,4 @@
+-\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1
++@c \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1
+ \input texinfo
+ @setfilename yahtml-ja.info
+ @settitle Yet Another html-mode for Emacs
+--- yatex1.77-orig/docs/yatexe.tex
++++ yatex1.77/docs/yatexe.tex
+@@ -1,4 +1,4 @@
+-\def\lang{jp} % -*- texinfo -*-
++@c \def\lang{jp} % -*- texinfo -*-
+ \input texinfo.tex
+ @setfilename yatex.info
+ @settitle Yet Another tex-mode for Emacs
+@@ -705,7 +705,7 @@
+ @item M-x YaTeX-section-overview
+ @dots{} Generate *Sectioning Lines* buffer
+ @end table
+-@cindex{Generate the listing of sectioning units}
++@cindex Generate the listing of sectioning units
+ from the LaTeX source buffer. In this listing buffer, typing @kbd{u} on
+ the sectioning command shifts up the corresponding sectioning command in
+ source text and @kbd{d} shifts down. After marking lines in the listing
+@@ -1087,7 +1087,7 @@
+ @node Invoking image processor, Jump to main file, Jump to corresponding object, Cursor jump
+ @comment node-name, next, previous, up
+ @section Invoking image processor
+-@cindex{Drawing tool invocation}
++@cindex Drawing tool invocation
+
+ `image-including line' described above means such lines as
+ @code{\epsfile@{file=foo.ps@}}. If you type @kbd{[prefix] g} on that
+@@ -2179,9 +2179,9 @@
+ @table @kbd
+ @item [F]
+ YaTeX:read-position
+-@itemx [A]
++@item [A]
+ Character list which can show up in the brackets
+-@itemx [D]
++@item [D]
+ Return the location specifier such as `[htb]'. When
+ nothing is entered, omit [] itself. If the possible characters
+ are "htbp", call this function as
+@@ -2189,9 +2189,9 @@
+
+ @item [F]
+ YaTeX:read-coordinates
+-@itemx [A]
++@item [A]
+ Base prompt, X-axis prompt, Y-axis prompt (each optional)
+-@itemx [D]
++@item [D]
+ Read the coordinates with the prompt ``BasePrompt X-axisPrompt:'' for
+ X-axis, ``BasePrompt Y-axisPrompt:'' for Y-axis, and return it in the form
+ of ``(X,Y)''. The default prompts are @code{Dimension}, @code{X},
+@@ -2199,9 +2199,9 @@
+
+ @item [F]
+ YaTeX:check-completion-type
+-@itemx [A]
++@item [A]
+ One of the symbols: 'begin, 'section, or 'maketitle
+-@itemx [D]
++@item [D]
+ Check the current completion type is specified one and cause error if
+ not. The variable @code{YaTeX-current-completion-type} holds the symbol
+ according to the current completion type.
+--- yatex1.77-orig/docs/yatexj.tex
++++ yatex1.77/docs/yatexj.tex
+@@ -1,4 +1,4 @@
+-\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1
++@c \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1
+ \input texinfo
+ @setfilename yatex-ja.info
+ @settitle Yet Another tex-mode for Emacs
diff --git a/app-emacs/yatex/yatex-1.74.ebuild b/app-emacs/yatex/yatex-1.74.ebuild
deleted file mode 100644
index 95369557a319..000000000000
--- a/app-emacs/yatex/yatex-1.74.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/yatex-1.74.ebuild,v 1.6 2012/10/14 18:50:40 armin76 Exp $
-
-inherit elisp eutils
-
-DESCRIPTION="Yet Another TeX mode for Emacs"
-HOMEPAGE="http://www.yatex.org/"
-SRC_URI="http://www.yatex.org/${P/-/}.tar.gz"
-
-KEYWORDS="amd64 ppc ~ppc64 x86"
-SLOT="0"
-LICENSE="YaTeX"
-IUSE="linguas_ja"
-
-S=${WORKDIR}/${P/-/}
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${PN}-1.73-gentoo.patch"
-}
-
-src_compile() {
- # byte-compilation fails (as of 1.74): yatexlib.el requires fonts
- # that are only available under X
-
- cd docs
- mv yatexe yatex.info
- mv yahtmle yahtml.info
- if use linguas_ja; then
- iconv -f ISO-2022-JP -t EUC-JP yatexj > yatex-ja.info
- iconv -f ISO-2022-JP -t EUC-JP yahtmlj > yahtml-ja.info
- fi
-}
-
-src_install() {
- elisp-install ${PN} *.el || die
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-
- insinto ${SITEETC}/${PN}
- doins help/YATEXHLP.eng || die "doins failed"
-
- doinfo docs/*.info || die "doinfo failed"
- dodoc docs/*.eng || die "dodoc failed"
-
- if use linguas_ja; then
- doins help/YATEXHLP.jp || die "doins failed"
- dodoc 00readme install docs/{htmlqa,qanda} docs/*.doc \
- || die "dodoc failed"
- fi
-}
diff --git a/app-emacs/yatex/yatex-1.77.ebuild b/app-emacs/yatex/yatex-1.77.ebuild
new file mode 100644
index 000000000000..73ff59072b6f
--- /dev/null
+++ b/app-emacs/yatex/yatex-1.77.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/yatex/yatex-1.77.ebuild,v 1.1 2013/04/03 21:50:25 ulm Exp $
+
+EAPI=5
+
+inherit elisp eutils
+
+DESCRIPTION="Yet Another TeX mode for Emacs"
+HOMEPAGE="http://www.yatex.org/"
+SRC_URI="http://www.yatex.org/${P/-/}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+LICENSE="YaTeX"
+IUSE="linguas_ja"
+
+S="${WORKDIR}/${P/-/}"
+ELISP_PATCHES="${PN}-1.76-gentoo.patch
+ ${PN}-1.76-direntry.patch
+ ${PN}-1.77-texinfo-5.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ # byte-compilation fails (as of 1.74): yatexlib.el requires fonts
+ # that are only available under X
+
+ cd docs
+ makeinfo yatexe.tex yahtmle.tex || die
+
+ if use linguas_ja; then
+ iconv -f WINDOWS-31J -t UTF-8 yatexj.tex >yatex-ja.texi || die
+ iconv -f WINDOWS-31J -t UTF-8 yahtmlj.tex >yahtml-ja.texi || die
+ makeinfo yatex-ja.texi yahtml-ja.texi || die
+ fi
+}
+
+src_install() {
+ elisp-install ${PN} *.el || die
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+ insinto ${SITEETC}/${PN}
+ doins help/YATEXHLP.eng
+ doinfo docs/yatex.info* docs/yahtml.info*
+ dodoc docs/*.eng
+
+ if use linguas_ja; then
+ doins help/YATEXHLP.jp
+ doinfo docs/yatex-ja.info* docs/yahtml-ja.info*
+ dodoc 00readme install docs/{htmlqa,qanda} docs/*.doc
+ fi
+}