fixed bug #293743, added a few missing dies

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 90 insertions, 12 deletions

diff --git a/app-text/htmltidy/ChangeLog b/app-text/htmltidy/ChangeLog
index f97ad33a4877..809a2cf96884 100644
--- a/app-text/htmltidy/ChangeLog
+++ b/app-text/htmltidy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/htmltidy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.55 2010/01/02 12:16:07 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.56 2010/03/30 08:32:24 wired Exp $
+
+*htmltidy-20090325-r1 (30 Mar 2010)
+
+  30 Mar 2010; Alex Alexander <wired@gentoo.org>
+  +htmltidy-20090325-r1.ebuild:
+  fixed bug #293743, added a few missing "die"s
 
   02 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   htmltidy-20090325.ebuild:
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index c1504c409f15..ad641e921087 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 03-html2db-null.patch 4249 RMD160 6e798c5cd5a2c9eda0c4ed8b9ef3c39c74df8ed6 SHA1 b9d961e40225b8eed18c3e5bb6a8c1623382f495 SHA256 9a8544d4070d7794ae65a3b75cb398e37c447c3cd5ec5e89306fab765d85cbb5
 AUX 03-htmltidy-docbook.patch 2948 RMD160 75e14983a769f2a2cf06f1c8a4152af4b3ccfe77 SHA1 695850be86d67ff037e6ab205884390031bce5e9 SHA256 5279fcc00d26c35f7bbbac6e513cf4d3dcb71411da9dd76793b71c069eb3fde9
 AUX 04-htmltidy-docbook.patch 2975 RMD160 2f04472d478fc587546fab768c681ce93d4f0681 SHA1 832396516a98d048a9bb36a918dc2ae8e0ed2683 SHA256 ed90c549513c04a62da53f8bb72de131b1d08ac4fc0a74709f12820d8264a430
@@ -15,15 +12,9 @@ DIST tidy_docs_040810.tgz 153044 RMD160 65f31c49074098e7bd071ef693bd9399693c17a9
 DIST tidy_docs_051020.tgz 150402 RMD160 63f033560af9a53393d9a3f656f26bb12bf505b6 SHA1 04988d51267566db6899e8061d9f2e5b58fbeec4 SHA256 8afdf165e7d5ce13cd64af4a5d0961627e006dbb3697fef97d378c94f052e35c
 DIST tidy_src_040806.tgz 244076 RMD160 5cff3fe361d9d9fe9d789d8d087b90efba0546f4 SHA1 477bcdb7b3b75281e41580e962e3f939d9eba8fa SHA256 1158e148ce6e1749baf46cc422e53609b8c7a0423a0e03d14911cc13d031bd3e
 DIST tidy_src_051026.tgz 256131 RMD160 0cae41f8c0cec51d4600d1bf2aac338cf60aa6b9 SHA1 53be36945344af0c4080c34ebc95728bf8617f1c SHA256 538aadc6f06e988cca932bfecae00313063ce01e62f4d395cf84736fca41bbfd
+EBUILD htmltidy-20090325-r1.ebuild 2288 RMD160 2061c133a0806554342f8c5991a973359c66bb6c SHA1 4639607c246d1f7c63a6a6c03fcb9584241eb697 SHA256 1a156ce2bb54c34be1c8d7640b03f8acb1f1dc0a0d18a549af693699265e4356
 EBUILD htmltidy-20090325.ebuild 2075 RMD160 340b27d589bba2488ad8cd9a9d649183cf4ca30a SHA1 3ace7abc9e6e104db896aadd973ddd519f500223 SHA256 e6bf322ecdaa02c4206ef339f1d35a8dfe4bf05070427efa5a06eeb508006ab7
 EBUILD htmltidy-4.8.6.ebuild 2498 RMD160 df3ba1cb7f8e10de50987dc179a739fe540e391a SHA1 4474fda8fbf610bba9fc7d0311ec62005a3f3fa4 SHA256 94f978f1123fa97014d0048780b28be069b1d1460ab517bf3741a5088da79414
 EBUILD htmltidy-5.10.26-r2.ebuild 2757 RMD160 a3e2e2923a6669f5b6fc097b061cdab17f3d7a79 SHA1 7e2de87d26a6d827ef2502f0e24af0e83e3dbf1f SHA256 855ae61a03b87db534952985c08d99727a6ad9b929e4fda437d371290caa689e
-MISC ChangeLog 7680 RMD160 a87867f0331f6273669d3e0258d29d3d96d6af11 SHA1 a4eafe5f6ac57a9f214fec4c98585827d857e148 SHA256 fe4024a566ea9a3fb45b88c074418017c92487f20b019a38565140c3d5c86716
+MISC ChangeLog 7847 RMD160 0f666e7788b9eaa97d3340142bf25969e4242893 SHA1 78ff299892a4fdd4f0ec95c0130e056101b0ecbf SHA256 b15641fd8206d13b253e067d46526e4381bed1559349699ba9e9799969ef25ac
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks/OQ0ACgkQNQqtfCuFneOOiACeJNOQSwbiIEkxUkTlvjPModBG
-VKwAnienK7Bvu0mb020a8Hr5xrkERUjy
-=d4Sa
------END PGP SIGNATURE-----
diff --git a/app-text/htmltidy/htmltidy-20090325-r1.ebuild b/app-text/htmltidy/htmltidy-20090325-r1.ebuild
new file mode 100644
index 000000000000..adec4283b069
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-20090325-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-20090325-r1.ebuild,v 1.1 2010/03/30 08:32:24 wired Exp $
+
+EAPI=2
+inherit eutils autotools
+
+MY_PN="tidy"
+MY_P=${MY_PN}-${PV}
+S="${WORKDIR}"/${MY_P}
+
+DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
+HOMEPAGE="http://tidy.sourceforge.net/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-doc.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_prepare() {
+	# Required to setup the source dist for autotools
+	einfo "Setting up autotools for source build"
+	cp -R  ./build/gnuauto/* . || die "could not prepare autotools environment"
+
+	# Stop tidy from appending -O2 to our CFLAGS
+	epatch "${FILESDIR}"/htmltidy-5.10.26-strip-O2-flag.patch
+
+	# Define /etc/tidyrc for system wide config, bug 154834
+	epatch "${FILESDIR}"/htmltidy-20090325-tidyrc.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		doxygen htmldoc/doxygen.cfg  || die "error making apidocs"
+	fi
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "error during make install"
+
+	cd "${S}"/htmldoc
+	# It seems the manual page installation in the Makefile's
+	# is commented out, so we need to install manually
+	# for the moment. Please check this on updates.
+	# mv man_page.txt tidy.1
+	# doman tidy.1
+	#
+	# Update:
+	# Now the man page is provided as an xsl file, which
+	# we can't use until htmltidy is merged.
+	# I have generated the man page and quickref which is on
+	# the mirrors. (bug #132429)
+	doman "${WORKDIR}"/"${MY_P}"-doc/tidy.1 || die "doman failed"
+
+	# Fix name before installing
+	mv "${WORKDIR}"/"${MY_P}"-doc/quickref-html \
+		"${WORKDIR}"/"${MY_P}"-doc/quickref.html
+
+	# Install basic html documentation
+	dohtml *.html *.css *.gif "${WORKDIR}"/"${MY_P}"-doc/quickref.html ||
+		die "dohtml failed"
+
+	# If use 'doc' is set, then we also want to install the
+	# api documentation
+	if use doc; then
+		dohtml -r api || die "api dohtml failed"
+	fi
+}