Version bump. Closing #83435 by James Rowe <jnrowe@ukfsn.org>

(Portage version: 2.0.51.16)

4 files changed, 58 insertions, 7 deletions

diff --git a/app-text/html-xml-utils/ChangeLog b/app-text/html-xml-utils/ChangeLog
index 8c22ace21f0a..0e1fdef732a8 100644
--- a/app-text/html-xml-utils/ChangeLog
+++ b/app-text/html-xml-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/html-xml-utils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/ChangeLog,v 1.19 2005/01/01 16:20:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/ChangeLog,v 1.20 2005/02/28 07:42:49 pclouds Exp $
+
+*html-xml-utils-3.6 (28 Feb 2005)
+
+  28 Feb 2005; <pclouds@gentoo.org> +html-xml-utils-3.6.ebuild:
+  Version bump. Closing #83435 by James Rowe <jnrowe@ukfsn.org>
 
   10 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   html-xml-utils-2.8-r2.ebuild:
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index 720b5de74707..c49cde4ed137 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,10 +1,13 @@
-MD5 5e78632e79ce354b1b6803d768a9a050 ChangeLog 3138
+MD5 5c2a1a46e5772d5deca9b074f11052b6 patch 658
 MD5 b24da29c38a038b66a6aadc9b068a326 html-xml-utils-2.8-r1.ebuild 961
+MD5 93b8902f99148c9f16131b8989406c43 html-xml-utils-3.4.ebuild 1273
+MD5 9598bc5ef4fdd8304292ce4e43875678 html-xml-utils-3.6.ebuild 1165
+MD5 5e78632e79ce354b1b6803d768a9a050 ChangeLog 3138
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 0adf2d7ecbd8050590a4082246d3b851 html-xml-utils-2.8-r2.ebuild 1273
-MD5 93b8902f99148c9f16131b8989406c43 html-xml-utils-3.4.ebuild 1273
-MD5 cc6d3e76dc6a18f3a3bca84b79a0b8f5 files/digest-html-xml-utils-2.8-r2 70
-MD5 cc6d3e76dc6a18f3a3bca84b79a0b8f5 files/digest-html-xml-utils-2.8-r1 70
-MD5 1911d1290459bc65c1319f67fef70e77 files/digest-html-xml-utils-3.4 70
-MD5 171bede4d22a09f2068d6dd6c9c030db files/html-xml-utils-addid-man 2033
 MD5 c38f364e7304aad97fc8fe22b6cbcec2 files/html-xml-utils-incl-man-fix.patch 1813
+MD5 171bede4d22a09f2068d6dd6c9c030db files/html-xml-utils-addid-man 2033
+MD5 1911d1290459bc65c1319f67fef70e77 files/digest-html-xml-utils-3.4 70
+MD5 b49c111127cc870efe38354665cefde0 files/digest-html-xml-utils-3.6 70
+MD5 cc6d3e76dc6a18f3a3bca84b79a0b8f5 files/digest-html-xml-utils-2.8-r1 70
+MD5 cc6d3e76dc6a18f3a3bca84b79a0b8f5 files/digest-html-xml-utils-2.8-r2 70
diff --git a/app-text/html-xml-utils/files/digest-html-xml-utils-3.6 b/app-text/html-xml-utils/files/digest-html-xml-utils-3.6
new file mode 100644
index 000000000000..3a8b4c86822f
--- /dev/null
+++ b/app-text/html-xml-utils/files/digest-html-xml-utils-3.6
@@ -0,0 +1 @@
+MD5 384fe7441d9c992a2b20621529138934 html-xml-utils-3.6.tar.gz 211872
diff --git a/app-text/html-xml-utils/html-xml-utils-3.6.ebuild b/app-text/html-xml-utils/html-xml-utils-3.6.ebuild
new file mode 100644
index 000000000000..ebf8454e7702
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-3.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 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-3.6.ebuild,v 1.1 2005/02/28 07:42:49 pclouds 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"
+SLOT="0"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# 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
+
+	# 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
+
+}