Version bumped and fixed manpages. Thanks to James Rowe <jnrowe@ukfsn.org> for manpage patches. This closes bug #70401.

9 files changed, 237 insertions, 13 deletions

diff --git a/app-text/html-xml-utils/ChangeLog b/app-text/html-xml-utils/ChangeLog
index 05a8867bdcc6..4e5e495d590c 100644
--- a/app-text/html-xml-utils/ChangeLog
+++ b/app-text/html-xml-utils/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/html-xml-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/ChangeLog,v 1.16 2004/10/18 12:29:33 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/ChangeLog,v 1.17 2004/11/08 09:05:20 usata Exp $
+
+*html-xml-utils-3.4 (08 Nov 2004)
+*html-xml-utils-2.8-r2 (08 Nov 2004)
+
+  08 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/html-xml-utils-addid-man, +files/html-xml-utils-incl-man-fix.patch,
+  -html-xml-utils-2.3-r1.ebuild, +html-xml-utils-2.8-r2.ebuild,
+  +html-xml-utils-3.4.ebuild:
+  Version bumped and fixed manpages. Thanks to James Rowe <jnrowe@ukfsn.org>
+  for manpage patches. This closes bug #70401.
 
   18 Oct 2004; David Holm <dholm@gentoo.org> html-xml-utils-2.8-r1.ebuild:
   Added to ~ppc.
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index 9e858655866c..94d42c8c9015 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,6 +1,20 @@
-MD5 0006127ad81f6d86c56ad648364182b7 ChangeLog 2611
-MD5 d33778de1a12f777117ec283fee79de1 html-xml-utils-2.3-r1.ebuild 1101
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 290f222d74286ba447f12bde876d6989 ChangeLog 3028
+MD5 742f5b8143e30939520147d12762c6b6 html-xml-utils-2.8-r2.ebuild 1269
 MD5 215d470ee4e713bb7687be0a2365b2d9 html-xml-utils-2.8-r1.ebuild 956
+MD5 f02cf11e4c013131d2e7ebd3a540b433 html-xml-utils-3.4.ebuild 1268
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 06599f2b88431de765b00f6457bbcf0c files/digest-html-xml-utils-2.3-r1 70
+MD5 1911d1290459bc65c1319f67fef70e77 files/digest-html-xml-utils-3.4 70
+MD5 171bede4d22a09f2068d6dd6c9c030db files/html-xml-utils-addid-man 2033
 MD5 cc6d3e76dc6a18f3a3bca84b79a0b8f5 files/digest-html-xml-utils-2.8-r1 70
+MD5 cc6d3e76dc6a18f3a3bca84b79a0b8f5 files/digest-html-xml-utils-2.8-r2 70
+MD5 c38f364e7304aad97fc8fe22b6cbcec2 files/html-xml-utils-incl-man-fix.patch 1813
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBjzVSVWNWqTUmv+0RArA2AJ9e8b1SPql2n9q0ZlXyFF3GgYZugACgl4GR
+YOBOnFzfQRSpsjTgLgY2S+U=
+=kIEj
+-----END PGP SIGNATURE-----
diff --git a/app-text/html-xml-utils/files/digest-html-xml-utils-2.3-r1 b/app-text/html-xml-utils/files/digest-html-xml-utils-2.3-r1
deleted file mode 100644
index 4dc322525755..000000000000
--- a/app-text/html-xml-utils/files/digest-html-xml-utils-2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1904a710e9fc6b2597f2f1a1a7f8029a html-xml-utils-2.3.tar.gz 169305
diff --git a/app-text/html-xml-utils/files/digest-html-xml-utils-2.8-r2 b/app-text/html-xml-utils/files/digest-html-xml-utils-2.8-r2
new file mode 100644
index 000000000000..f78334718966
--- /dev/null
+++ b/app-text/html-xml-utils/files/digest-html-xml-utils-2.8-r2
@@ -0,0 +1 @@
+MD5 68a7bbd63f44f0f046c734aecec3db98 html-xml-utils-2.8.tar.gz 193198
diff --git a/app-text/html-xml-utils/files/digest-html-xml-utils-3.4 b/app-text/html-xml-utils/files/digest-html-xml-utils-3.4
new file mode 100644
index 000000000000..5f8c226edf0a
--- /dev/null
+++ b/app-text/html-xml-utils/files/digest-html-xml-utils-3.4
@@ -0,0 +1 @@
+MD5 2253859f1775cc5de94301df74dbbffb html-xml-utils-3.4.tar.gz 205307
diff --git a/app-text/html-xml-utils/files/html-xml-utils-addid-man b/app-text/html-xml-utils/files/html-xml-utils-addid-man
new file mode 100644
index 000000000000..2b36ce22b44f
--- /dev/null
+++ b/app-text/html-xml-utils/files/html-xml-utils-addid-man
@@ -0,0 +1,95 @@
+.de d \" begin display
+.sp
+.in +4
+.nf
+..
+.de e \" end display
+.in -4
+.fi
+.sp
+..
+.TH man 1 "27 May 2004"
+.SH NAME
+addid \- add ID's to selected elements
+.SH SYNOPSIS
+.B addid
+.RB "[\| " \-x " \|]"
+.RB "[\-\-]"
+.IR elem|.class|elem.class
+.RB "[\| " html-file " \|]"
+.SH DESCRIPTION
+.LP
+The
+.B addid 
+command opies an HTML or XML file to standard output, while adding
+element IDs to the specified elements or classes.
+.LP
+For example, given the input
+.d
+<p>A paragraph without an ID</p>
+.e
+the command
+.d
+addid p
+.e
+will output
+.d
+<p id="a-paragraph">A paragraph without an ID</p>
+.e
+.LP
+If you specify a class using \fB.class\fP then IDs will only be added
+to elements that contain that class.  And if you specify a element and
+a class using \fBelem.class\fP then IDs will only be added to the 
+specified elements that contain the specified class.
+.LP
+If two elements would naturally generate the same ID, a number is 
+added to the ID name (starting with 0) to make sure the IDs are 
+unique.  IDs are not added to matching elements that already contain 
+an ID.
+.SH OPTIONS
+The following options are supported:
+.TP 10
+.B \-x
+Use XML conventions: empty elements are written with a slash at the
+end: <IMG\ /> Also causes the name of the attribute (see option
+\fB\-a\fP) to become case-sensitive.
+.SH OPERANDS
+The following operand is supported:
+.TP 10
+.I elem
+The name of element to select.
+.TP 10
+.I .class
+The name of class to select.
+.TP 10
+.I elem.class
+The name of element that contains class to select.
+.TP 10
+.I html-file
+The name of an HTML file.
+.SH "EXIT STATUS"
+The following exit values are returned:
+.TP 10
+.B 0
+Successful completion.
+.TP
+.B >0
+An error occurred in the parsing of one of the HTML or XML files.
+.SH "SEE ALSO"
+.BR xml2asc (1),
+.BR UTF-8
+(RFC 2279),
+.BR normalize-html (1),
+.BR num (1),
+.BR toc (1),
+.BR htmlprune (1).
+.BR unent (1)
+.BR asc2xml (1)
+.SH BUGS
+.LP
+Assumes UTF-8 as input. Doesn't expand character entities. Instead
+pipe the input through
+.BR unent (1)
+and
+.BR asc2xml (1)
+to convert it to UTF-8.
diff --git a/app-text/html-xml-utils/files/html-xml-utils-incl-man-fix.patch b/app-text/html-xml-utils/files/html-xml-utils-incl-man-fix.patch
new file mode 100644
index 000000000000..a9bcfd94f714
--- /dev/null
+++ b/app-text/html-xml-utils/files/html-xml-utils-incl-man-fix.patch
@@ -0,0 +1,53 @@
+--- html-xml-utils-3.4/incl.1
++++ html-xml-utils-3.4/incl.1
+@@ -14,10 +14,6 @@
+ .SH SYNOPSIS
+ .B incl
+ .RB "[\| " \-x " \|]"
+-.RB "[\| " \-a
+-.IR attribute " \|]"
+-.RB "[\| " \-c
+-.IR class " \|]"
+ .RB "[\| " \-b
+ .IR base " \|]"
+ .RB "[\| " file\-or\-URL " \|]"
+@@ -26,14 +22,15 @@
+ The
+ .B incl
+ command copies an HTML or XML file to standard output, looking for
+-elements with a certain attribute (by default a \fBclass\fP attribute
+-that includes the word "include"). Such an element is replaced by
+-the file whose name is given as the content of the element. For
+-example, the \fIspan\fP element in
++comments with a certain structure.  Such an comment is replaced by
++the file whose name is given as the atrribute of the directive. For
++example:
+ .d
+- ...<span class="include">foo.html</span>...
++ ...<!-- include "foo.html" -->...
+ .e
+-will be replaced by the content of the file \fIfoo.html\fP.
++will be replaced by the content of the file \fIfoo.html\fP.  It is
++important to note that you must quote filenames if they contain 
++whitespace.
+ .SH OPTIONS
+ The following options are supported:
+ .TP 10
+@@ -42,17 +39,6 @@
+ end: <IMG\ /> Also causes the name of the attribute (see option
+ \fB\-a\fP) to become case-sensitive.
+ .TP
+-.BI \-a " attribute"
+-Sets the name of the attribute to look for. Default is \fBclass\fP.
+-Note that the name is case-insensitive, unless option \fB\-x\fP is
+-given.
+-.TP
+-.BI \-c " class"
+-Sets the keyword to look for. Default is \fBinclude\fP. The attribute
+-is considered to contain a space-separated list of words. If one of
+-those words is the given \fIclass\fP, the element is replaced by the
+-file whose name is given as the element's content.
+-.TP
+ .BI \-b " base"
+ Sets the base URL for resolving relative URLs. By default the file
+ given as argument is the base URL.
diff --git a/app-text/html-xml-utils/html-xml-utils-2.8-r2.ebuild b/app-text/html-xml-utils/html-xml-utils-2.8-r2.ebuild
new file mode 100644
index 000000000000..5e82b069ccec
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-2.8-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/html-xml-utils-2.8-r2.ebuild,v 1.1 2004/11/08 09:05:20 usata Exp $
+
+inherit eutils
+
+DESCRIPTION="A number of simple utilities for manipulating HTML and XML files."
+SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
+HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
+LICENSE="W3C"
+
+IUSE=""
+KEYWORDS="x86 ~sparc ppc ~alpha"
+SLOT="0"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-incl-man-fix.patch
+
+	# Replace references to normalize with normalize-html, which
+	# has been renamed due to clash described in #27399
+	sed -i "s:normalize:&-html:g" *.1 || die "sed failed"
+
+}
+
+src_install () {
+
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog COPYING INSTALL README TODO
+	newman ${FILESDIR}/${PN}-addid-man addid.1
+
+	# Check bug #27399, the following binary conflicts with
+	# one provided by the 'normalize' package, so we're
+	# renaming this one <obz@gentoo.org>
+	mv ${D}/usr/bin/normalize ${D}/usr/bin/normalize-html
+	mv ${D}/usr/share/man/man1/normalize.1 \
+	   ${D}/usr/share/man/man1/normalize-html.1
+
+}
diff --git a/app-text/html-xml-utils/html-xml-utils-2.3-r1.ebuild b/app-text/html-xml-utils/html-xml-utils-3.4.ebuild
index 2c8be536c465..8b76602800a4 100644
--- a/app-text/html-xml-utils/html-xml-utils-2.3-r1.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-3.4.ebuild
@@ -1,31 +1,38 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/html-xml-utils-2.3-r1.ebuild,v 1.10 2004/07/01 11:58:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/html-xml-utils-3.4.ebuild,v 1.1 2004/11/08 09:05:20 usata Exp $
+
+inherit eutils
 
 DESCRIPTION="A number of simple utilities for manipulating HTML and XML files."
 SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
 HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
 LICENSE="W3C"
 
-KEYWORDS="x86 sparc"
-SLOT="0"
 IUSE=""
+KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+SLOT="0"
 
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	cp heap.c heap.c.orig
-	sed -e "s/#define FILE.*/#define FILE __FILE__/" \
-		-e "s/#define LINE.*/#define LINE __LINE__/" \
-		< heap.c.orig > heap.c || die
+	epatch ${FILESDIR}/${PN}-incl-man-fix.patch
+
+	# Replace references to normalize with normalize-html, which
+	# has been renamed due to clash described in #27399
+	sed -i "s:normalize:&-html:g" *.1 || die "sed failed"
+
 }
 
 src_install () {
 
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING NEWS README TODO
+	dodoc AUTHORS ChangeLog COPYING INSTALL README TODO
+	newman ${FILESDIR}/${PN}-addid-man addid.1
 
 	# Check bug #27399, the following binary conflicts with
 	# one provided by the 'normalize' package, so we're