Added to macos. This closes bug #58076

3 files changed, 23 insertions, 13 deletions

diff --git a/app-text/htmltidy/ChangeLog b/app-text/htmltidy/ChangeLog
index 04e64ae1c03c..9ab052b92132 100644
--- a/app-text/htmltidy/ChangeLog
+++ b/app-text/htmltidy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/htmltidy
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.18 2004/06/24 22:40:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.19 2004/07/23 18:20:56 usata Exp $
+
+  24 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> htmltidy-3.10.29.ebuild:
+  Added to macos. This closes bug #58076
 
   28 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> htmltidy-3.10.29.ebuild:
   Added WANT_AUTO{MAKE,CONF} to fix configure error, closing bug #42796
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 4f5ace5e75e1..827c11612078 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,13 +1,13 @@
-MD5 614a13345999a5eff251b9051afd4132 htmltidy-0.8.4.ebuild 1088
-MD5 0bb2c3d6dac29a6cefa2706df3c404fe htmltidy-2.7.18-r2.ebuild 1417
 MD5 fab3994b0bc2f50981ade6e42ba7486b htmltidy-2.7.18-r1.ebuild 1108
-MD5 2f61ff05cb617ad72648825b22d2f9b7 htmltidy-3.10.29.ebuild 2206
-MD5 a3b90f0dcf871b6acdf667a457923393 ChangeLog 2753
+MD5 0bb2c3d6dac29a6cefa2706df3c404fe htmltidy-2.7.18-r2.ebuild 1417
+MD5 de56dcbda95700d9cccefa9fe52cff92 htmltidy-3.10.29.ebuild 2488
+MD5 a5ce9f082dfab7ebf66a86ea51ba5098 ChangeLog 2866
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 614a13345999a5eff251b9051afd4132 htmltidy-0.8.4.ebuild 1088
 MD5 2fe7c73c1e39e2714ee35931b23b0b22 files/03-htmltidy-docbook.patch 2948
-MD5 121179b048496c0fabc8c209ab04e114 files/htmltidy-dbpatch.diff 30781
+MD5 969e47b8a4da6f69002add193ef04121 files/digest-htmltidy-0.8.4 59
 MD5 a96b41596c34f139192fe7733d075722 files/digest-htmltidy-2.7.18-r1 122
 MD5 a96b41596c34f139192fe7733d075722 files/digest-htmltidy-2.7.18-r2 122
-MD5 969e47b8a4da6f69002add193ef04121 files/digest-htmltidy-0.8.4 59
 MD5 e97d474e9517a0a945af252d243c455a files/digest-htmltidy-3.10.29 179
 MD5 47ad3e22b233024cc46fa12e2e56656b files/03-html2db-null.patch 4249
+MD5 121179b048496c0fabc8c209ab04e114 files/htmltidy-dbpatch.diff 30781
diff --git a/app-text/htmltidy/htmltidy-3.10.29.ebuild b/app-text/htmltidy/htmltidy-3.10.29.ebuild
index c12168c5227c..a6476ea8c277 100644
--- a/app-text/htmltidy/htmltidy-3.10.29.ebuild
+++ b/app-text/htmltidy/htmltidy-3.10.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-3.10.29.ebuild,v 1.9 2004/06/24 22:40:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-3.10.29.ebuild,v 1.10 2004/07/23 18:20:56 usata Exp $
 
 inherit eutils
 
@@ -17,9 +17,14 @@ SRC_URI="http://tidy.sourceforge.net/src/old/${MY_P}.tgz
 		 http://tidy.sourceforge.net/docs/tidy_docs.tgz
 		 xml? ( http://www.cise.ufl.edu/~ppadala/tidy/html2db.tar.gz )"
 
+DEPEND="virtual/libc
+	>=sys-devel/autoconf-2.5
+	>=sys-devel/automake-1.5"
+RDEPEND="virtual/libc"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha ~amd64"
+KEYWORDS="x86 ppc sparc alpha ~amd64 macos"
 IUSE="debug doc xml"
 
 src_unpack() {
@@ -31,7 +36,8 @@ src_unpack() {
 	/bin/sh ./build/gnuauto/setup.sh > /dev/null
 
 	# Stop tidy from appending -O2 to our CFLAGS
-	sed -i -e "/save_cflags/s/\ \-O2//" configure.in
+	sed -e "/save_cflags/s/\ \-O2//" configure.in > ${T}/configure.in &&
+	mv ${T}/configure.in configure.in || die "sed configure.in failed"
 
 	if use xml ; then
 		# Apply the docbook patch to tidy sources
@@ -42,9 +48,10 @@ src_unpack() {
 		epatch ${FILESDIR}/03-html2db-null.patch
 
 		# Point to the tidy source in the html2db Makefile
-		sed -i -e "/TIDYDIR\=/s:\.\.:${S}:" \
+		sed -e "/TIDYDIR\=/s:\.\.:${S}:" \
 			   -e "/LIBDIR\=/s:lib:src\/\.libs\/:" \
-			   ${WORKDIR}/html2db/Makefile
+			   ${WORKDIR}/html2db/Makefile > ${T}/Makefile &&
+		mv ${T}/Makefile ${WORKDIR}/html2db/Makefile || die "sed Makefile failed"
 	fi
 }
 
@@ -55,7 +62,7 @@ src_compile() {
 
 	if use xml ; then
 		cd ${WORKDIR}/html2db
-		make || die
+		emake || die
 	fi
 }