Re-added support for links (bug #134894).

Package-Manager: portage-2.1_rc4

diff --git a/app-text/docbook-sgml-utils/ChangeLog b/app-text/docbook-sgml-utils/ChangeLog
index 14f650fe9149939f8f47b38ea8a99e566bb78f3f..e87e5f5387e48b2b96b7878a265851bb3318e33a 100644 (file)
--- 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/Manifest b/app-text/docbook-sgml-utils/Manifest
index b2d9bd34fc2e1a83936cd09722b790f1d2e2bc12..bff56dfa33ca8a2371f537251a397806e7858344 100644 (file)
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -1,26 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST docbook-utils-0.6.14.tar.gz 124998 RMD160 710fe047ea8a794cc6c0d944521184375a666e6b SHA256 48faab8ee8a7605c9342fb7b906e0815e3cee84a489182af38e8f7c0df2e92e9 size 124998
-EBUILD docbook-sgml-utils-0.6.14.ebuild 1655 RMD160 b79ff51203b5ae6426c6c489b61c15de0e09e22f SHA1 f93c7bd9bd2264f0c3a5d5f2da821063c40486e3 SHA256 7d9e3e62933783e2a7f337793e4888c3b40fdf7f7eab3454c07784a3fcbf639a size 1655
-MD5 c963a5316912703264995d3fe98f6704 docbook-sgml-utils-0.6.14.ebuild 1655
-RMD160 b79ff51203b5ae6426c6c489b61c15de0e09e22f docbook-sgml-utils-0.6.14.ebuild 1655
-SHA256 7d9e3e62933783e2a7f337793e4888c3b40fdf7f7eab3454c07784a3fcbf639a docbook-sgml-utils-0.6.14.ebuild 1655
-MISC ChangeLog 7259 RMD160 fda79d6d960663ae19c35bfd5b26fd4b6a16cb24 SHA1 542652e336995a29a656db43a4cfc9dfc0078aa1 SHA256 4cdc35aad2fe447ee613dd5b0ccec3018a8c1d1e371addccd561d9dfc6f30af5 size 7259
-MD5 180f9f94d4d38b45895c2d6a15cc60ff ChangeLog 7259
-RMD160 fda79d6d960663ae19c35bfd5b26fd4b6a16cb24 ChangeLog 7259
-SHA256 4cdc35aad2fe447ee613dd5b0ccec3018a8c1d1e371addccd561d9dfc6f30af5 ChangeLog 7259
-MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f size 164
+AUX docbook-utils-0.6.14-elinks.patch 445 RMD160 e596d1099b4b428e3a67f3894cc8ba8aae3b2f87 SHA1 0de527f0bd1482c3e3309b613df5772143891cf0 SHA256 9e26e6ad17c2e2bd1d66a06aecc4ec6a077bb94ed2942acad0368f8fe923331b
+MD5 beea9dd19bf5e28e9513c830e0bc3e41 files/docbook-utils-0.6.14-elinks.patch 445
+RMD160 e596d1099b4b428e3a67f3894cc8ba8aae3b2f87 files/docbook-utils-0.6.14-elinks.patch 445
+SHA256 9e26e6ad17c2e2bd1d66a06aecc4ec6a077bb94ed2942acad0368f8fe923331b files/docbook-utils-0.6.14-elinks.patch 445
+DIST docbook-utils-0.6.14.tar.gz 124998 RMD160 710fe047ea8a794cc6c0d944521184375a666e6b SHA1 aae596844930e0e4bb7f8824024be0982cc4fa85 SHA256 48faab8ee8a7605c9342fb7b906e0815e3cee84a489182af38e8f7c0df2e92e9
+EBUILD docbook-sgml-utils-0.6.14.ebuild 1654 RMD160 cb6d24fb493246925599949349dfa72f67050cb3 SHA1 26c2f3bee1138943fde8ecc5cdf187dd7254b820 SHA256 ec808b8ea142838db77fa0ae6184739be2d12b46487e9f55f8aca1e2284610ce
+MD5 c8e6a45dc2685674acb499b125beb254 docbook-sgml-utils-0.6.14.ebuild 1654
+RMD160 cb6d24fb493246925599949349dfa72f67050cb3 docbook-sgml-utils-0.6.14.ebuild 1654
+SHA256 ec808b8ea142838db77fa0ae6184739be2d12b46487e9f55f8aca1e2284610ce docbook-sgml-utils-0.6.14.ebuild 1654
+MISC ChangeLog 7440 RMD160 585f5b0e0f245fc637e0872c4325b0bf5f2b71ab SHA1 4116ef9ec3fc2ad39eda71e5e631e3613ff3b3dc SHA256 406151d288ec415d990d83cdb7a1a80bb6adc8f7a043c439276c1145ab687f5f
+MD5 09f83a16db05e74e0ea6044bb69c6e85 ChangeLog 7440
+RMD160 585f5b0e0f245fc637e0872c4325b0bf5f2b71ab ChangeLog 7440
+SHA256 406151d288ec415d990d83cdb7a1a80bb6adc8f7a043c439276c1145ab687f5f ChangeLog 7440
+MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
 MD5 aa92a2c2c2c4010870d2e5b095c53407 files/digest-docbook-sgml-utils-0.6.14 262
 RMD160 579955a852f58dbf0b6f2aa13e06a2ee242148b0 files/digest-docbook-sgml-utils-0.6.14 262
 SHA256 e8eee197d07cf78a0c7a52b002a96c5f12f251289b94afb75f06d8ed9cea9b4e files/digest-docbook-sgml-utils-0.6.14 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEUeugzxUa4FWw6mwRAjNaAJ9eaL2qgb52jIIY5ywo7V4EhAeLmgCdFT6M
-rue99exkhVK5YpL8XMakZh0=
-=hNqW
------END PGP SIGNATURE-----

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 1a3a7dc03c1e0e2f8b5879635a6dad9f6b23d3be..cc58eeb2171e0f569a32b67fe90e3c151551eff1 100644 (file)
--- 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 (file)
index 0000000..5256570
--- /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