Fixed info directory entry. Thanks to Doug Weimer <dweimer@socal.rr.com> for supplying the patch. Closing bug #48417

7 files changed, 49 insertions, 47 deletions

diff --git a/dev-tex/latex2rtf/ChangeLog b/dev-tex/latex2rtf/ChangeLog
index 10b752382257..416b2f7e75cc 100644
--- a/dev-tex/latex2rtf/ChangeLog
+++ b/dev-tex/latex2rtf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tex/latex2rtf
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2rtf/ChangeLog,v 1.3 2004/04/17 16:36:41 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2rtf/ChangeLog,v 1.4 2004/04/21 14:16:33 usata Exp $
+
+*latex2rtf-1.9.15-r1 (21 Apr 2004)
+
+  21 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> latex2rtf-1.9.15-r1.ebuild,
+  files/latex2rtf-1.9.15-direntry.patch:
+  Fixed info directory entry. Thanks to Doug Weimer <dweimer@socal.rr.com>
+  for supplying the patch. Closing bug #48417.
 
   17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> latex2rtf-1.9.14.ebuild,
   latex2rtf-1.9.15.ebuild:
diff --git a/dev-tex/latex2rtf/Manifest b/dev-tex/latex2rtf/Manifest
index 94a4afae4871..a02e118f8f25 100644
--- a/dev-tex/latex2rtf/Manifest
+++ b/dev-tex/latex2rtf/Manifest
@@ -1,7 +1,10 @@
 MD5 175dba5a73a821adcb7c383f931ac24b latex2rtf-1.9.14.ebuild 920
 MD5 fe98a5ce563df05b9c4884e4826e67dc latex2rtf-1.9.15.ebuild 920
-MD5 1cf049eafa7e1addc3124fb2c03a2d0c ChangeLog 634
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 5c38ae853a717a1ba595c9b1c29b570b files/latex2rtf-Makefile-gentoo.diff 2211
-MD5 fc7400cc7b21ecd3c0bead32561937ae files/digest-latex2rtf-1.9.14 68
+MD5 1cf049eafa7e1addc3124fb2c03a2d0c ChangeLog 634
+MD5 3b8b772b494e4ceac8176b11a534d66f latex2rtf-1.9.15-r1.ebuild 960
 MD5 0cd549e56f3f8b6d885f04ee983d8661 files/digest-latex2rtf-1.9.15 68
+MD5 fc7400cc7b21ecd3c0bead32561937ae files/digest-latex2rtf-1.9.14 68
+MD5 5c38ae853a717a1ba595c9b1c29b570b files/latex2rtf-Makefile-gentoo.diff 2211
+MD5 8bfc1664436da66fbf401f933c853ff6 files/latex2rtf-1.9.15-direntry.patch 1179
+MD5 0cd549e56f3f8b6d885f04ee983d8661 files/digest-latex2rtf-1.9.15-r1 68
diff --git a/dev-tex/latex2rtf/files/digest-latex2rtf-1.9.14 b/dev-tex/latex2rtf/files/digest-latex2rtf-1.9.14
deleted file mode 100644
index d6ab7dea1c3f..000000000000
--- a/dev-tex/latex2rtf/files/digest-latex2rtf-1.9.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f590067942f15eb9b829afae6cab8a68 latex2rtf-1.9.14.tar.gz 562450
diff --git a/dev-tex/latex2rtf/files/digest-latex2rtf-1.9.15 b/dev-tex/latex2rtf/files/digest-latex2rtf-1.9.15-r1
index 64ea060bdc7b..64ea060bdc7b 100644
--- a/dev-tex/latex2rtf/files/digest-latex2rtf-1.9.15
+++ b/dev-tex/latex2rtf/files/digest-latex2rtf-1.9.15-r1
diff --git a/dev-tex/latex2rtf/files/latex2rtf-1.9.15-direntry.patch b/dev-tex/latex2rtf/files/latex2rtf-1.9.15-direntry.patch
new file mode 100644
index 000000000000..527da97e50cf
--- /dev/null
+++ b/dev-tex/latex2rtf/files/latex2rtf-1.9.15-direntry.patch
@@ -0,0 +1,30 @@
+diff -ru latex2rtf-1.9.15-vanilla/doc/latex2rtf.info latex2rtf-1.9.15/doc/latex2rtf.info
+--- latex2rtf-1.9.15-vanilla/doc/latex2rtf.info	2003-10-29 21:38:25.000000000 -0800
++++ latex2rtf-1.9.15/doc/latex2rtf.info	2004-04-19 15:33:00.985457480 -0700
+@@ -1,6 +1,11 @@
+ This is latex2rtf.info, produced by makeinfo version 4.2 from
+ latex2rtf.texi.
+ 
++INFO-DIR-SECTION TeX
++START-INFO-DIR-ENTRY
++* LaTeX2RTF: (latex2rtf).            Convert a LaTeX file to RTF
++END-INFO-DIR-ENTRY
++
+    
 
 
 
 This file documents LaTeX2RTF , a converter that
+ translates LaTeX  to RTF.
 
 Copyright 1998-2002 Georg Lehner, 

+ updates Copyright 1999-2003 by Wilfried Hennings and Scott Prahl, 

+diff -ru latex2rtf-1.9.15-vanilla/doc/latex2rtf.texi latex2rtf-1.9.15/doc/latex2rtf.texi
+--- latex2rtf-1.9.15-vanilla/doc/latex2rtf.texi	2003-10-29 21:36:23.000000000 -0800
++++ latex2rtf-1.9.15/doc/latex2rtf.texi	2004-04-19 15:33:13.635534376 -0700
+@@ -35,6 +35,11 @@
+ @end iftex

+ @end macro

+ 

++@dircategory TeX

++@direntry

++* LaTeX2RTF: (latex2rtf).            Convert a LaTeX file to RTF

++@end direntry

++

+ @ifinfo

+ This file documents @ltor{}, a converter that translates @latex{} to RTF.

+ 

diff --git a/dev-tex/latex2rtf/latex2rtf-1.9.14.ebuild b/dev-tex/latex2rtf/latex2rtf-1.9.15-r1.ebuild
index a2bddeb42bbd..18e80ba6c778 100644
--- a/dev-tex/latex2rtf/latex2rtf-1.9.14.ebuild
+++ b/dev-tex/latex2rtf/latex2rtf-1.9.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2rtf/latex2rtf-1.9.14.ebuild,v 1.2 2004/04/17 16:36:41 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2rtf/latex2rtf-1.9.15-r1.ebuild,v 1.1 2004/04/21 14:16:33 usata Exp $
 
 inherit eutils
 
@@ -21,6 +21,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-Makefile-gentoo.diff
+	epatch ${FILESDIR}/${P}-direntry.patch
 }
 
 src_compile() {
@@ -28,12 +29,13 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/share/doc/latex2rtf
 	PREFIX=${D}/usr make -e install || die
 	dodoc README doc/latex2rtf.txt
 	# if doc is not used, only the text version is intalled.
 	if use doc; then
-		dodoc doc/latex2rtf.html doc/latex2rtf.pdf doc/latex2rtf.txt
+		dohtml doc/latex2rtf.html
+		dodoc doc/latex2rtf.pdf doc/latex2rtf.txt
+		sed -i "s/\r/\n/g" doc/latex2rtf.info
 		doinfo doc/latex2rtf.info
 	fi
 }
diff --git a/dev-tex/latex2rtf/latex2rtf-1.9.15.ebuild b/dev-tex/latex2rtf/latex2rtf-1.9.15.ebuild
deleted file mode 100644
index 97565e212d58..000000000000
--- a/dev-tex/latex2rtf/latex2rtf-1.9.15.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2rtf/latex2rtf-1.9.15.ebuild,v 1.2 2004/04/17 16:36:41 aliz Exp $
-
-inherit eutils
-
-IUSE="doc"
-
-DESCRIPTION="LaTeX to RTF converter"
-HOMEPAGE="http://latex2rtf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/latex2rtf/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-SLOT="0"
-
-DEPEND="virtual/glibc
-	virtual/tetex
-	media-gfx/imagemagick"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-Makefile-gentoo.diff
-}
-
-src_compile() {
-	emake CC=${CC} || die
-}
-
-src_install() {
-	dodir /usr/share/doc/latex2rtf
-	PREFIX=${D}/usr make -e install || die
-	dodoc README doc/latex2rtf.txt
-	# if doc is not used, only the text version is intalled.
-	if use doc; then
-		dodoc doc/latex2rtf.html doc/latex2rtf.pdf doc/latex2rtf.txt
-		doinfo doc/latex2rtf.info
-	fi
-}