New ebuild. This closes Bug #18726

7 files changed, 191 insertions, 1 deletions

diff --git a/app-text/yodl/Manifest b/app-text/yodl/Manifest
index b6575c7bd08c..aa98d8e67947 100644
--- a/app-text/yodl/Manifest
+++ b/app-text/yodl/Manifest
@@ -1,4 +1,6 @@
-MD5 92e9b216301e37c542d3cfbf6154f29f yodl-1.31.18.ebuild 1239
+MD5 488bd354d67dd37e084181fe352ba608 yodl-1.31.18.ebuild 1425
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 472258ee0910e17299f660a8665cb13b ChangeLog 511
 MD5 dd6529b5aba8890ca04cd66abe69c733 files/yodl-1.31.18-debian.patch 1968
 MD5 a553ffa04e5a7a6e7a127f6a8e246931 files/bison-configure.patch 501
 MD5 e9b9d8a049fd84a23d04a74118bfedb8 files/digest-yodl-1.31.18 64
diff --git a/app-text/yodl/files/bison-configure.patch b/app-text/yodl/files/bison-configure.patch
new file mode 100644
index 000000000000..e637d73c9852
--- /dev/null
+++ b/app-text/yodl/files/bison-configure.patch
@@ -0,0 +1,12 @@
+--- /tmp/configure	1999-11-17 12:09:38.000000000 -0800
++++ ./configure	2003-03-02 20:10:38.000000000 -0800
+@@ -1836,7 +1836,8 @@
+ 
+ 
+     if test $BISON != "error"; then
+-	bison_version=`$BISON --version | sed 's/^.*version 1.//g'`
++	bison_version=`$BISON --version | sed -ne 's/^.*\(version\|(GNU Bison)\) 1\.//p'`
++
+ 	if test `echo $bison_version | sed 's/\..*$//g'` -lt 25; then
+ 	    
+     echo "configure: warning: Your bison is a bit old (1.$bison_version). You might have to install 1.25" 1>&2
diff --git a/app-text/yodl/files/digest-yodl-1.31.18 b/app-text/yodl/files/digest-yodl-1.31.18
new file mode 100644
index 000000000000..506facdd2e2a
--- /dev/null
+++ b/app-text/yodl/files/digest-yodl-1.31.18
@@ -0,0 +1 @@
+MD5 247c5bf178baeb1f0b96511323f30a61 yodl-1.31.18.tar.gz 320053
diff --git a/app-text/yodl/files/yodl-1.31.18-compile-fix-ia64.patch b/app-text/yodl/files/yodl-1.31.18-compile-fix-ia64.patch
new file mode 100644
index 000000000000..487ec4644f3c
--- /dev/null
+++ b/app-text/yodl/files/yodl-1.31.18-compile-fix-ia64.patch
@@ -0,0 +1,30 @@
+--- yodl-1.31.18/src/yodl2html-post/newfile.c.badz      Wed Jun 27 14:17:38 2001
++++ yodl-1.31.18/src/yodl2html-post/newfile.c   Wed Jun 27 14:17:54 2001
+@@ -1,6 +1,7 @@
+ 
+ #include "yodl2html-post.h"
+ #include "libc-extension.h"
++#include "libgen.h"
+ 
+ void 
+ newfile (STRINGTAB t)
+--- yodl-1.31.18/src/yodl2html-post/init.c.badz	Wed Jun 27 13:34:05 2001
++++ yodl-1.31.18/src/yodl2html-post/init.c	Wed Jun 27 13:34:32 2001
+@@ -3,6 +3,7 @@
+ #include "yodl2html-post.h"
+ #include "libc-extension.h"
+ #include "lib.h"
++#include "libgen.h"
+ 
+ void 
+ init ()
+--- yodl-1.31.18/src/yodl2html-post/yodl2html-post.c.badz	Wed Jun 27 13:34:12 2001
++++ yodl-1.31.18/src/yodl2html-post/yodl2html-post.c	Wed Jun 27 13:34:38 2001
+@@ -1,6 +1,7 @@
+ 
+ #define EXTERN
+ #include "yodl2html-post.h"
++#include "libgen.h"
+ 
+ int 
+ main (int argc, char **argv)
diff --git a/app-text/yodl/files/yodl-1.31.18-debian.patch b/app-text/yodl/files/yodl-1.31.18-debian.patch
new file mode 100644
index 000000000000..ebe5cb30226d
--- /dev/null
+++ b/app-text/yodl/files/yodl-1.31.18-debian.patch
@@ -0,0 +1,84 @@
+--- yodl-1.31.18.orig/AUTHORS.txt
++++ yodl-1.31.18/AUTHORS.txt
+@@ -3,7 +3,7 @@
+ 
+ This file lists authors of Yodl, in alphabetical order.
+ 
+-o    Frank Brokken <frank@icce.rug.nl>,
++o    Frank Brokken <f.b.brokken@rc.rug.nl>,
+      http://www.icce.rug.nl/frank/frank.html
+      Original author.
+ 
+--- yodl-1.31.18.orig/src/yodl2html-post/lexer.l.in
++++ yodl-1.31.18/src/yodl2html-post/lexer.l.in
+@@ -16,16 +16,10 @@
+ #endif
+ #   include "yodl2html-post.h"
+ #   include "parser.h"
+-
+-#ifdef yywrap
+-#   undef yywrap
+-#endif
+-static int yywrap ()
+-{
+-    return (1);
+-}
+ %}
+ 
++%option noyywrap
++
+ %%
+ 
+ "@TAGSTART@"            return (tok_starttag);
+--- yodl-1.31.18.orig/src/yodl2html-post/lexer.l
++++ yodl-1.31.18/src/yodl2html-post/lexer.l
+@@ -16,16 +16,10 @@
+ #endif
+ #   include "yodl2html-post.h"
+ #   include "parser.h"
+-
+-#ifdef yywrap
+-#   undef yywrap
+-#endif
+-static int yywrap ()
+-{
+-    return (1);
+-}
+ %}
+ 
++%option noyywrap
++
+ %%
+ 
+ ".YODLTAGSTART."            return (tok_starttag);
+--- yodl-1.31.18.orig/macros/shared.yodoc.in
++++ yodl-1.31.18/macros/shared.yodoc.in
+@@ -455,7 +455,7 @@
+ DEFINEMACRO(endit)(0)(\
+     latexcommand(\end{itemize})\
+     texinfocommand(@end itemize)\
+-    htmlcommand(</dl>)\
++    htmlcommand(</ul>)\
+     whenman(ADDTOCOUNTER(XXinlistcounter)(-1))\
+     whenms(ADDTOCOUNTER(XXinlistcounter)(-1))\
+     sgmlcommand(</itemize>))
+@@ -1755,7 +1755,7 @@
+ DEFINEMACRO(startit)(0)(\
+     latexcommand(\begin{itemize})\
+     texinfocommand(@itemize @bullet)\
+-    htmlcommand(<dl>)\
++    htmlcommand(<ul>)\
+     whenman(ADDTOCOUNTER(XXinlistcounter)(1))\
+     whenms(ADDTOCOUNTER(XXinlistcounter)(1))\
+     sgmlcommand(<itemize>))
+--- yodl-1.31.18.orig/macros/chartables/man.tables.yo
++++ yodl-1.31.18/macros/chartables/man.tables.yo
+@@ -3,7 +3,7 @@
+ DEFINECHARTABLE(standard)(
+     '\\'    = "\\e"
+     '.'	    = "\\&."
+-    '\''    = "\\'"
++    '\''    = "\\&'"
+ )
+ 
+ COMMENT(*** Accent characters, leading to empty chars. ***)
diff --git a/app-text/yodl/metadata.xml b/app-text/yodl/metadata.xml
new file mode 100644
index 000000000000..06689a1a9114
--- /dev/null
+++ b/app-text/yodl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>text-markup</herd>
+</pkgmetadata>
diff --git a/app-text/yodl/yodl-1.31.18.ebuild b/app-text/yodl/yodl-1.31.18.ebuild
new file mode 100644
index 000000000000..2a7c3031a7af
--- /dev/null
+++ b/app-text/yodl/yodl-1.31.18.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/yodl/yodl-1.31.18.ebuild,v 1.1 2003/10/02 14:04:27 usata Exp $
+
+inherit eutils
+
+IUSE=""
+
+HOMEPAGE="http://www.xs4all.nl/~jantien/yodl/"
+SRC_URI="ftp://ftp.lilypond.org/pub/yodl/development/${P}.tar.gz"
+DESCRIPTION="Yet oneOther Document Language"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+DEPEND="sys-devel/bison
+	sys-devel/flex
+	sys-apps/diffutils
+	sys-apps/groff
+	dev-lang/python
+	sys-apps/texinfo"
+
+RDEPEND=""
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S} || die "pre-patch chdir failed"
+	epatch "${FILESDIR}/bison-configure.patch"
+	#use ia64 && epatch "${FILESDIR}/${P}-compile-fix-ia64.patch"
+	epatch "${FILESDIR}/${P}-debian.patch"
+}
+
+src_compile() {
+	# Avoid a makefile bug if this var is already defined in the environment.
+	unset NAME
+
+	# The auto-dependencies break if ccache is used (for the first compile).
+	export CCACHE_DISABLE=yes
+	econf --datadir=/usr/share/yodl || die "econf failed"
+	make || die "make failed"
+
+	cd Documentation
+	make info || die "make info failed"
+}
+
+src_install() {
+	make prefix="${D}/usr" \
+		datadir="${D}/usr/share/yodl" \
+		mandir="${D}/usr/share/man" \
+		infodir="${D}/usr/share/info" \
+		install || die
+
+	doinfo Documentation/out/*.info*
+	dodoc ANNOUNCE-1.22 ChangeLog-1.22 CHANGES TODO VERSION *.txt
+}