Marked stable on x86

6 files changed, 15 insertions, 47 deletions

diff --git a/app-text/html-xml-utils/ChangeLog b/app-text/html-xml-utils/ChangeLog
index 53128240d5d0..0809819631d7 100644
--- a/app-text/html-xml-utils/ChangeLog
+++ b/app-text/html-xml-utils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.10 2004/01/22 09:56:43 obz Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/ChangeLog,v 1.11 2004/04/26 11:51:32 obz Exp $
+
+  26 Apr 2004; Mike Gardiner <obz@gentoo.org> html-xml-utils-2.3-r1.ebuild,
+  html-xml-utils-2.8-r1.ebuild, html-xml-utils-2.8.ebuild:
+  Marked stable on x86, and removed superfluous 2.8 version
 
 *html-xml-utils-2.8-r1 (22 Jan 2004)
 
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index 9ea77e2482c2..e9562c1f9d24 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,8 +1,6 @@
-MD5 dbb9c065bae80c92445ad9b46c300917 ChangeLog 2081
-MD5 56fec377b88c9c56ee64eec0c642ea37 html-xml-utils-2.3-r1.ebuild 1117
-MD5 6b4e5193a4e835551eda962efe9cc3f8 html-xml-utils-2.8-r1.ebuild 961
-MD5 ff0912b43f4578e1983606b160c67f75 html-xml-utils-2.8.ebuild 957
+MD5 db30bf908eefce78d01f5e4d7b60c89b html-xml-utils-2.8-r1.ebuild 960
+MD5 e335b67bff452b359a790c7052940c98 html-xml-utils-2.3-r1.ebuild 1103
+MD5 e6c1ec5cf3f0447d1ce59dbc2e3c25b7 ChangeLog 2277
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 06599f2b88431de765b00f6457bbcf0c files/digest-html-xml-utils-2.3-r1 70
-MD5 cc6d3e76dc6a18f3a3bca84b79a0b8f5 files/digest-html-xml-utils-2.8 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.8 b/app-text/html-xml-utils/files/digest-html-xml-utils-2.8
deleted file mode 100644
index f78334718966..000000000000
--- a/app-text/html-xml-utils/files/digest-html-xml-utils-2.8
+++ /dev/null
@@ -1 +0,0 @@
-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 005c4f60cf43..0b1953042338 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,14 +1,15 @@
 # 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.7 2004/02/22 20:04:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/html-xml-utils-2.3-r1.ebuild,v 1.8 2004/04/26 11:51:32 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/"
+LICENSE="W3C"
+
 KEYWORDS="x86 sparc"
 SLOT="0"
-LICENSE="W3C"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
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
index f70a5d35d0d0..bb2e7e863ac6 100644
--- 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
@@ -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-r1.ebuild,v 1.1 2004/01/22 09:56:43 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/html-xml-utils-2.8-r1.ebuild,v 1.2 2004/04/26 11:51:32 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"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
 LICENSE="W3C"
 
 IUSE=""
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 SLOT="0"
 
 DEPEND="virtual/glibc"
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
deleted file mode 100644
index e2039d94e00e..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-2.8.ebuild
+++ /dev/null
@@ -1,34 +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.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"
-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
-}