summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Boshell <leonardop@gentoo.org>2006-06-06 03:26:38 +0000
committerLeonardo Boshell <leonardop@gentoo.org>2006-06-06 03:26:38 +0000
commitaf8a01a9316e787d553f00514b61b3b031e6e0cf (patch)
treea419e9ccd910f0342bcbe564f927f3b896c9d34b /app-text/docbook-sgml-utils
parentmarking stable sparc (diff)
downloadgentoo-2-af8a01a9316e787d553f00514b61b3b031e6e0cf.tar.gz
gentoo-2-af8a01a9316e787d553f00514b61b3b031e6e0cf.tar.bz2
gentoo-2-af8a01a9316e787d553f00514b61b3b031e6e0cf.zip
Re-added support for links (bug #134894).
(Portage version: 2.1_rc4)
Diffstat (limited to 'app-text/docbook-sgml-utils')
-rw-r--r--app-text/docbook-sgml-utils/ChangeLog7
-rw-r--r--app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14.ebuild22
-rw-r--r--app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch14
3 files changed, 35 insertions, 8 deletions
diff --git a/app-text/docbook-sgml-utils/ChangeLog b/app-text/docbook-sgml-utils/ChangeLog
index 14f650fe9149..e87e5f5387e4 100644
--- a/app-text/docbook-sgml-utils/ChangeLog
+++ b/app-text/docbook-sgml-utils/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-text/docbook-sgml-utils
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/ChangeLog,v 1.49 2006/04/28 10:16:52 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/ChangeLog,v 1.50 2006/06/06 03:26:38 leonardop Exp $
+
+ 06 Jun 2006; Leonardo Boshell <leonardop@gentoo.org>
+ +files/docbook-utils-0.6.14-elinks.patch,
+ docbook-sgml-utils-0.6.14.ebuild:
+ Re-add support for links (bug #134894).
28 Apr 2006; Martin Ehmsen <ehmsen@gentoo.org>
docbook-sgml-utils-0.6.14.ebuild:
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14.ebuild
index 1a3a7dc03c1e..cc58eeb2171e 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 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.14.ebuild,v 1.23 2006/04/28 10:16:52 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14.ebuild,v 1.24 2006/06/06 03:26:38 leonardop Exp $
inherit eutils
@@ -30,20 +30,28 @@ DEPEND=">=dev-lang/perl-5
~app-text/docbook-sgml-dtd-4.1
tetex? ( app-text/jadetex )
userland_GNU? ( sys-apps/which )
- || ( www-client/lynx www-client/elinks virtual/w3m )"
+ || (
+ www-client/lynx
+ www-client/links
+ www-client/elinks
+ 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_unpack() {
- unpack ${A}
- cd ${S} || die
- sed -i -e "s:links:elinks:g" backends/txt || die
+ unpack "${A}"
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${MY_P}-elinks.patch
}
src_install() {
- #einstall htmldir=${D}/usr/share/doc/${PF}/html || die
- make DESTDIR=${D} htmldir=/usr/share/doc/${PF}/html install || die
+ make DESTDIR="${D}" \
+ htmldir="/usr/share/doc/${PF}/html" \
+ install || die "Installation failed"
+
if ! use tetex ; then
for i in dvi pdf ps ; do
rm ${D}/usr/bin/docbook2$i
diff --git a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch
new file mode 100644
index 000000000000..5256570458af
--- /dev/null
+++ b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch
@@ -0,0 +1,14 @@
+diff -NurdB docbook-utils-0.6.14/backends/txt docbook-utils-0.6.14-patched/backends/txt
+--- docbook-utils-0.6.14/backends/txt 2004-02-11 08:58:03.000000000 -0500
++++ docbook-utils-0.6.14-patched/backends/txt 2006-06-05 21:57:23.000000000 -0500
+@@ -10,6 +10,10 @@
+ then
+ CONVERT=/usr/bin/links
+ ARGS="-dump"
++elif [ -x /usr/bin/elinks ]
++then
++ CONVERT=/usr/bin/elinks
++ ARGS="-dump"
+ elif [ -x /usr/bin/w3m ]
+ then
+ CONVERT=/usr/bin/w3m