Changed the normalize script to normalize-html due to conflicts, see bug# 27399

8 files changed, 64 insertions, 34 deletions

diff --git a/app-text/html-xml-utils/ChangeLog b/app-text/html-xml-utils/ChangeLog
index 3fee4790b5e7..53128240d5d0 100644
--- a/app-text/html-xml-utils/ChangeLog
+++ b/app-text/html-xml-utils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/html-xml-utils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/ChangeLog,v 1.9 2004/01/17 09:49:57 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/ChangeLog,v 1.10 2004/01/22 09:56:43 obz Exp $
+
+*html-xml-utils-2.8-r1 (22 Jan 2004)
+
+  22 Jan 2004; Mike Gardiner <obz@gentoo.org> html-xml-utils-2.3-r1.ebuild,
+  html-xml-utils-2.3.ebuild, html-xml-utils-2.8-r1.ebuild,
+  html-xml-utils-2.8.ebuild:
+  Renamed the 'normalize' binary to 'normalize-html' as it conflicts with a
+  seperate package. See bug #27399 for more, and thanks to reporter
+  <degrenier@easyconnect.fr> for picking this one up
 
 *html-xml-utils-2.8 (17 Jan 2004)
 
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index aa30604a2d47..5b99d81a28b6 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,8 +1,8 @@
+MD5 457bfebe4936f9dad779f25ab8dd5f2f html-xml-utils-2.8-r1.ebuild 968
 MD5 332052bae7f50879fda756fe948bc2f4 html-xml-utils-2.3-r1.ebuild 821
 MD5 45ca6edefaf9fd9b4d21e932c8e8fd17 html-xml-utils-2.8.ebuild 667
-MD5 0a0e3d1b9489b186a981e6277d621070 html-xml-utils-2.3.ebuild 819
 MD5 208a26f957c4a89cccf266c0ce861a57 ChangeLog 1680
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 06599f2b88431de765b00f6457bbcf0c files/digest-html-xml-utils-2.3 70
 MD5 cc6d3e76dc6a18f3a3bca84b79a0b8f5 files/digest-html-xml-utils-2.8 70
 MD5 06599f2b88431de765b00f6457bbcf0c files/digest-html-xml-utils-2.3-r1 70
+MD5 cc6d3e76dc6a18f3a3bca84b79a0b8f5 files/digest-html-xml-utils-2.8-r1 70
diff --git a/app-text/html-xml-utils/files/digest-html-xml-utils-2.3 b/app-text/html-xml-utils/files/digest-html-xml-utils-2.3
deleted file mode 100644
index 4dc322525755..000000000000
--- a/app-text/html-xml-utils/files/digest-html-xml-utils-2.3
+++ /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-r1 b/app-text/html-xml-utils/files/digest-html-xml-utils-2.8-r1
new file mode 100644
index 000000000000..f78334718966
--- /dev/null
+++ b/app-text/html-xml-utils/files/digest-html-xml-utils-2.8-r1
@@ -0,0 +1 @@
+MD5 68a7bbd63f44f0f046c734aecec3db98 html-xml-utils-2.8.tar.gz 193198
diff --git a/app-text/html-xml-utils/html-xml-utils-2.3-r1.ebuild b/app-text/html-xml-utils/html-xml-utils-2.3-r1.ebuild
index 10a20a1b4609..a902590955f6 100644
--- a/app-text/html-xml-utils/html-xml-utils-2.3-r1.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.5 2004/01/17 09:49:57 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/html-xml-utils-2.3-r1.ebuild,v 1.6 2004/01/22 09:56:43 obz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A number of simple utilities for manipulating HTML and XML files."
@@ -25,4 +25,12 @@ src_install () {
 
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS ChangeLog COPYING NEWS 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
+
 }
diff --git a/app-text/html-xml-utils/html-xml-utils-2.3.ebuild b/app-text/html-xml-utils/html-xml-utils-2.3.ebuild
deleted file mode 100644
index 7702159ba3a8..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-2.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# 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.ebuild,v 1.10 2004/01/17 09:49:57 obz Exp $
-
-S=${WORKDIR}/${P}
-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/"
-KEYWORDS="x86 sparc "
-SLOT="0"
-LICENSE="W3C"
-
-DEPEND="virtual/glibc"
-
-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
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING NEWS README TODO
-}
diff --git a/app-text/html-xml-utils/html-xml-utils-2.8-r1.ebuild b/app-text/html-xml-utils/html-xml-utils-2.8-r1.ebuild
new file mode 100644
index 000000000000..f70a5d35d0d0
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-2.8-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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-r1.ebuild,v 1.1 2004/01/22 09:56:43 obz Exp $
+
+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"
+SLOT="0"
+
+DEPEND="virtual/glibc"
+
+src_compile() {
+
+	econf || die
+	emake || die
+
+}
+
+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
+
+}
diff --git a/app-text/html-xml-utils/html-xml-utils-2.8.ebuild b/app-text/html-xml-utils/html-xml-utils-2.8.ebuild
index 59151d7944ab..e2039d94e00e 100644
--- a/app-text/html-xml-utils/html-xml-utils-2.8.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.ebuild,v 1.1 2004/01/17 09:49:57 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/html-xml-utils-2.8.ebuild,v 1.2 2004/01/22 09:56:43 obz Exp $
 
 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"
@@ -25,4 +25,10 @@ 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
 }