Version bumped. Added w3m and elinks support (bug #35166) and removed docbook2pdf if USE="-tetex" (bug #61938).

8 files changed, 82 insertions, 19 deletions

diff --git a/app-text/docbook-sgml-utils/ChangeLog b/app-text/docbook-sgml-utils/ChangeLog
index 8888b58a2a36..33f434c72c26 100644
--- a/app-text/docbook-sgml-utils/ChangeLog
+++ b/app-text/docbook-sgml-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/docbook-sgml-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/ChangeLog,v 1.26 2004/07/02 20:29:24 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/ChangeLog,v 1.27 2004/09/03 18:50:21 usata Exp $
+
+*docbook-sgml-utils-0.6.14 (04 Sep 2004)
+
+  04 Sep 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -docbook-sgml-utils-0.6.11-r2.ebuild, docbook-sgml-utils-0.6.12-r2.ebuild,
+  +docbook-sgml-utils-0.6.14.ebuild:
+  Version bumped. Added w3m and elinks support (bug #35166) and removed
+  docbook2pdf if USE="-tetex" (bug #61938).
 
   02 Jul 2004; Tom Gall <tgall@gentoo.org> docbook-sgml-utils-0.6.12-r2.ebuild:
   stable on ppc64, bug #54799
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 01e9ee9426e5..1ecf25b23b7e 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -1,10 +1,12 @@
-MD5 8045768a9436ea1f89e1724e758aea1c ChangeLog 3950
-MD5 3d7995e1077b4fa370889f2802c707c3 docbook-sgml-utils-0.6.11-r2.ebuild 1188
-MD5 1fee1f393489e308111d27819f2c5b1c docbook-sgml-utils-0.6.12-r2.ebuild 1368
+MD5 98d9f8d034b54a75fe8f3ae3235fe02b ChangeLog 4272
 MD5 28c1c9ce160d69c466e672636e3c752f docbook-sgml-utils-0.6.12.ebuild 1228
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 1dd65666f8e59fae0cbcc281806b1195 files/digest-docbook-sgml-utils-0.6.11-r2 72
+MD5 7790876c7a730cddc1a5658258827934 docbook-sgml-utils-0.6.12-r2.ebuild 1619
+MD5 eb35194c071854431b88f3276fe8467a docbook-sgml-utils-0.6.14.ebuild 1511
 MD5 162814a2342da5479a18dc8e9f74182a files/digest-docbook-sgml-utils-0.6.12 72
 MD5 162814a2342da5479a18dc8e9f74182a files/digest-docbook-sgml-utils-0.6.12-r2 72
 MD5 a52142a3e1462a0e62a1d4b0e4b9e685 files/docbook-sgml-utils-frontend.patch 455
 MD5 f38af9b0090827606a87754c15de3470 files/docbook-sgml-utils-head-jw.patch 379
+MD5 16ad86aaffd129a7036d2e7475bae20a files/digest-docbook-sgml-utils-0.6.14 72
+MD5 2e82c6e8e331d7a3a8858d18c3711862 files/docbook-sgml-utils-backend.patch 515
+MD5 7d5c4302c83e4d132570f155cfe00020 files/docbook-sgml-utils-0.6.14-backend.patch 447
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild
index f9ab280f0a95..221669c012a7 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild,v 1.7 2004/07/02 20:29:24 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.12-r2.ebuild,v 1.8 2004/09/03 18:50:21 usata Exp $
 
 inherit eutils
 
@@ -29,19 +29,27 @@ DEPEND=">=dev-lang/perl-5
 	=app-text/docbook-sgml-dtd-4.0-r1
 	=app-text/docbook-sgml-dtd-4.1-r1
 	tetex? ( app-text/jadetex )
-	|| ( net-www/lynx net-www/links )"
+	|| ( net-www/lynx net-www/links virtual/w3m )"
 
 # including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
 # transition to simple-dtd 1.0, <obz@gentoo.org>
 
 src_compile() {
 	epatch ${FILESDIR}/${PN}-frontend.patch
+	epatch ${FILESDIR}/${PN}-backend.patch
 	epatch ${FILESDIR}/${PN}-head-jw.patch
 	econf || die
 	make || die
 }
 
 src_install() {
-	einstall htmldir=${D}/usr/share/doc/${PF}/html
+	einstall htmldir=${D}/usr/share/doc/${PF}/html || die
+	if ! use tetex ; then
+		for i in dvi pdf ps ; do
+			rm ${D}/usr/bin/docbook2$i
+			rm ${D}/usr/share/sgml/docbook/utils-${PV}/backends/$i
+			rm ${D}/usr/share/man/man1/docbook2$i.1
+		done
+	fi
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r2.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14.ebuild
index 382413f884d1..822173790079 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r2.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14.ebuild
@@ -1,39 +1,53 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r2.ebuild,v 1.14 2004/06/24 22:32:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14.ebuild,v 1.1 2004/09/03 18:50:21 usata Exp $
+
+inherit eutils
 
 MY_PN=${PN/-sgml/}
 MY_P=${MY_PN}-${PV}
 S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="Shell scripts to manage DocBook documents"
-SRC_URI="ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
 HOMEPAGE="http://sources.redhat.com/docbook-tools/"
+SRC_URI="ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha amd64"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~mips ~ppc64"
 IUSE="tetex"
 
 DEPEND=">=dev-lang/perl-5
 	app-text/docbook-dsssl-stylesheets
 	app-text/openjade
 	dev-perl/SGMLSpm
-	app-text/docbook-xml-simple-dtd
+	=app-text/docbook-xml-simple-dtd-4.1.2.4
+	=app-text/docbook-xml-simple-dtd-1.0
 	app-text/docbook-xml-dtd
 	=app-text/docbook-sgml-dtd-3.0-r1
 	=app-text/docbook-sgml-dtd-3.1-r1
 	=app-text/docbook-sgml-dtd-4.0-r1
 	=app-text/docbook-sgml-dtd-4.1-r1
 	tetex? ( app-text/jadetex )
-	|| ( net-www/lynx net-www/links )"
+	virtual/textbrowser"
+
+# including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
+# transition to simple-dtd 1.0, <obz@gentoo.org>
 
 src_compile() {
-	patch -p1 < ${FILESDIR}/docbook-sgml-utils-frontend.patch || die
-	econf || die "econf failed"
+	epatch ${FILESDIR}/${P}-backend.patch
+	econf || die
 	make || die
 }
 
 src_install() {
-	einstall htmldir=${D}/usr/share/doc/${PF}/html
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	einstall htmldir=${D}/usr/share/doc/${PF}/html || die
+	if ! use tetex ; then
+		for i in dvi pdf ps ; do
+			rm ${D}/usr/bin/docbook2$i
+			rm ${D}/usr/share/sgml/docbook/utils-${PV}/backends/$i
+			rm ${D}/usr/share/man/man1/docbook2$i.1
+		done
+	fi
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/app-text/docbook-sgml-utils/files/digest-docbook-sgml-utils-0.6.11-r2 b/app-text/docbook-sgml-utils/files/digest-docbook-sgml-utils-0.6.11-r2
deleted file mode 100644
index caece6759476..000000000000
--- a/app-text/docbook-sgml-utils/files/digest-docbook-sgml-utils-0.6.11-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 584bed7302eab00a47636108903498c5 docbook-utils-0.6.11.tar.gz 118011
diff --git a/app-text/docbook-sgml-utils/files/digest-docbook-sgml-utils-0.6.14 b/app-text/docbook-sgml-utils/files/digest-docbook-sgml-utils-0.6.14
new file mode 100644
index 000000000000..3da20e911561
--- /dev/null
+++ b/app-text/docbook-sgml-utils/files/digest-docbook-sgml-utils-0.6.14
@@ -0,0 +1 @@
+MD5 6b41b18c365c01f225bc417cf632d81c docbook-utils-0.6.14.tar.gz 124998
diff --git a/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-backend.patch b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-backend.patch
new file mode 100644
index 000000000000..b6afc3cd8fcc
--- /dev/null
+++ b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-backend.patch
@@ -0,0 +1,14 @@
+diff -urN docbook-utils-0.6.14.orig/backends/txt docbook-utils-0.6.14/backends/txt
+--- docbook-utils-0.6.14.orig/backends/txt	2004-02-11 22:58:03.000000000 +0900
++++ docbook-utils-0.6.14/backends/txt	2004-09-03 23:45:09.000000000 +0900
+@@ -14,6 +14,10 @@
+ then
+   CONVERT=/usr/bin/w3m
+   ARGS="-dump"
++elif [ -x /usr/bin/elinks ]
++then
++  CONVERT=/usr/bin/elinks
++  ARGS="-dump"
+ else
+   echo >&2 "No way to convert HTML to text found."
+   exit 1
diff --git a/app-text/docbook-sgml-utils/files/docbook-sgml-utils-backend.patch b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-backend.patch
new file mode 100644
index 000000000000..855a78ea1624
--- /dev/null
+++ b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-backend.patch
@@ -0,0 +1,17 @@
+diff -urN docbook-utils-0.6.12.orig/backends/txt docbook-utils-0.6.12/backends/txt
+--- docbook-utils-0.6.12.orig/backends/txt	2002-06-28 00:16:44.000000000 +0900
++++ docbook-utils-0.6.12/backends/txt	2004-09-03 23:47:30.000000000 +0900
+@@ -10,6 +10,13 @@
+ then
+   CONVERT=/usr/bin/links
+   ARGS="-dump"
++elif [ -x /usr/bin/w3m ]
++then
++  CONVERT=/usr/bin/w3m
++  ARGS="-dump"
++elif [ -x /usr/bin/elinks ]
++  CONVERT=/usr/bin/elinks
++  ARGS="-dump"
+ else
+   echo >&2 "No way to convert HTML to text found."
+   exit 1