summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Buisse <nattfodd@gentoo.org>2006-09-23 17:41:07 +0000
committerAlexandre Buisse <nattfodd@gentoo.org>2006-09-23 17:41:07 +0000
commit5b60a16e9fc3c796e17b4674c0fd038fcf5dfb54 (patch)
tree0b3f157e277966c909a7fdae5604110f3c39b101 /app-text
parentBumping the SUSPEND2_VERSION to 2, introducing a fixed patch for x86_64 (than... (diff)
downloadgentoo-2-5b60a16e9fc3c796e17b4674c0fd038fcf5dfb54.tar.gz
gentoo-2-5b60a16e9fc3c796e17b4674c0fd038fcf5dfb54.tar.bz2
gentoo-2-5b60a16e9fc3c796e17b4674c0fd038fcf5dfb54.zip
Corrected autotools usage (bug #148759).
(Portage version: 2.1.1)
Diffstat (limited to 'app-text')
-rw-r--r--app-text/htmltidy/ChangeLog8
-rw-r--r--app-text/htmltidy/files/digest-htmltidy-3.10.294
-rw-r--r--app-text/htmltidy/files/digest-htmltidy-4.8.62
-rw-r--r--app-text/htmltidy/files/digest-htmltidy-5.10.26-r212
-rw-r--r--app-text/htmltidy/htmltidy-4.8.6.ebuild11
-rw-r--r--app-text/htmltidy/htmltidy-5.10.26-r2.ebuild93
6 files changed, 124 insertions, 6 deletions
diff --git a/app-text/htmltidy/ChangeLog b/app-text/htmltidy/ChangeLog
index cc7da3d2d859..0977487f0cf8 100644
--- a/app-text/htmltidy/ChangeLog
+++ b/app-text/htmltidy/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-text/htmltidy
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.33 2006/07/31 02:27:20 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.34 2006/09/23 17:41:07 nattfodd Exp $
+
+*htmltidy-5.10.26-r2 (23 Sep 2006)
+
+ 23 Sep 2006; Alexandre Buisse <nattfodd@gentoo.org> htmltidy-4.8.6.ebuild,
+ +htmltidy-5.10.26-r2.ebuild:
+ Corrected autotools usage (bug #148759).
30 Jul 2006; <psi29a@gentoo.org> htmltidy-4.8.6.ebuild:
stable on mips
diff --git a/app-text/htmltidy/files/digest-htmltidy-3.10.29 b/app-text/htmltidy/files/digest-htmltidy-3.10.29
index 90d2af740333..98c7a8dcf8ed 100644
--- a/app-text/htmltidy/files/digest-htmltidy-3.10.29
+++ b/app-text/htmltidy/files/digest-htmltidy-3.10.29
@@ -2,4 +2,8 @@ MD5 ca15e9e877a304187a01547996a189a2 html2db.tar.gz 6028
RMD160 811a291e4824fa643d87aefafeddf5eaab728dda html2db.tar.gz 6028
SHA256 c2e68347b5cc78caacc1ab8135b60e1074a24b977c6ea08dfe30e2ef1ab12357 html2db.tar.gz 6028
MD5 ec60e9c63ed5d98cbdf98260a9a03c23 tidy_docs_040317.tgz 152421
+RMD160 7608fbcf1ff0bc092c15ada68a786e592db33545 tidy_docs_040317.tgz 152421
+SHA256 e0c281a9cedb67ed0cc0a7fdb6a1cafc24e33f946cbb44cea4db6be255e2950a tidy_docs_040317.tgz 152421
MD5 bb81e507333c019bc56fa7c3d1a6ef3b tidy_src_031029.tgz 239167
+RMD160 e250baa37609e019226c1e1ef03fb092ebe213b4 tidy_src_031029.tgz 239167
+SHA256 79a59b2d512237733ab3f66c970e932ed83a4b720fa18d53b9f26e545452bde1 tidy_src_031029.tgz 239167
diff --git a/app-text/htmltidy/files/digest-htmltidy-4.8.6 b/app-text/htmltidy/files/digest-htmltidy-4.8.6
index 7c09f272abbb..23b3252a265b 100644
--- a/app-text/htmltidy/files/digest-htmltidy-4.8.6
+++ b/app-text/htmltidy/files/digest-htmltidy-4.8.6
@@ -5,3 +5,5 @@ MD5 04338149bdd3e10753101bc5dff8acd8 tidy_docs_040810.tgz 153044
RMD160 65f31c49074098e7bd071ef693bd9399693c17a9 tidy_docs_040810.tgz 153044
SHA256 c9373469306b9bf40ddef297c1b36548edacf4d22766a5b7f4186c46c1d66302 tidy_docs_040810.tgz 153044
MD5 3a19c40fbd96fd6f6783668a1e6c59d6 tidy_src_040806.tgz 244076
+RMD160 5cff3fe361d9d9fe9d789d8d087b90efba0546f4 tidy_src_040806.tgz 244076
+SHA256 1158e148ce6e1749baf46cc422e53609b8c7a0423a0e03d14911cc13d031bd3e tidy_src_040806.tgz 244076
diff --git a/app-text/htmltidy/files/digest-htmltidy-5.10.26-r2 b/app-text/htmltidy/files/digest-htmltidy-5.10.26-r2
new file mode 100644
index 000000000000..c6926c832c5b
--- /dev/null
+++ b/app-text/htmltidy/files/digest-htmltidy-5.10.26-r2
@@ -0,0 +1,12 @@
+MD5 ca15e9e877a304187a01547996a189a2 html2db.tar.gz 6028
+RMD160 811a291e4824fa643d87aefafeddf5eaab728dda html2db.tar.gz 6028
+SHA256 c2e68347b5cc78caacc1ab8135b60e1074a24b977c6ea08dfe30e2ef1ab12357 html2db.tar.gz 6028
+MD5 0260365a0dc6809d237199d59a5c392e htmltidy-5.10.26-doc.tar.bz2 12636
+RMD160 f9123e37fd274afe9828a81d5edc2b7ac1a3afee htmltidy-5.10.26-doc.tar.bz2 12636
+SHA256 c51ffd8045eda8d63efc99fa690a3726cf7f68aa6241648bb3dc44d16ad03c18 htmltidy-5.10.26-doc.tar.bz2 12636
+MD5 86de2f198e57399c063d2567b2a25628 tidy_docs_051020.tgz 150402
+RMD160 63f033560af9a53393d9a3f656f26bb12bf505b6 tidy_docs_051020.tgz 150402
+SHA256 8afdf165e7d5ce13cd64af4a5d0961627e006dbb3697fef97d378c94f052e35c tidy_docs_051020.tgz 150402
+MD5 1e39fafd6808978871346658c8da1454 tidy_src_051026.tgz 256131
+RMD160 0cae41f8c0cec51d4600d1bf2aac338cf60aa6b9 tidy_src_051026.tgz 256131
+SHA256 538aadc6f06e988cca932bfecae00313063ce01e62f4d395cf84736fca41bbfd tidy_src_051026.tgz 256131
diff --git a/app-text/htmltidy/htmltidy-4.8.6.ebuild b/app-text/htmltidy/htmltidy-4.8.6.ebuild
index f1db4dce7ab4..815b83483888 100644
--- a/app-text/htmltidy/htmltidy-4.8.6.ebuild
+++ b/app-text/htmltidy/htmltidy-4.8.6.ebuild
@@ -1,8 +1,11 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-4.8.6.ebuild,v 1.19 2006/07/31 02:27:20 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-4.8.6.ebuild,v 1.20 2006/09/23 17:41:07 nattfodd Exp $
-inherit eutils
+WANT_AUTOMAKE=1.5
+WANT_AUTOCONF=2.5
+
+inherit eutils autotools
# Convert gentoo version number x.y.z to date xyz for
# tidy's source numbering by date
@@ -22,9 +25,7 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sh sparc x86"
IUSE="debug doc xml"
-DEPEND="virtual/libc
- >=sys-devel/autoconf-2.5
- >=sys-devel/automake-1.5"
+DEPEND="virtual/libc"
RDEPEND="virtual/libc"
src_unpack() {
diff --git a/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild b/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild
new file mode 100644
index 000000000000..38630188ee8d
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild,v 1.1 2006/09/23 17:41:07 nattfodd Exp $
+
+WANT_AUTOMAKE=1.5
+WANT_AUTOCONF=2.5
+
+inherit eutils autotools
+
+# Convert gentoo version number x.y.z to date xyz for
+# tidy's source numbering by date
+parts=(${PV//./ })
+dates=$(printf "%02d%02d%02d" ${parts[0]} ${parts[1]} ${parts[2]})
+MY_P=tidy_src_${dates}
+S=${WORKDIR}/tidy
+
+DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
+HOMEPAGE="http://tidy.sourceforge.net/"
+SRC_URI="http://tidy.sourceforge.net/src/${MY_P}.tgz
+ http://tidy.sourceforge.net/docs/tidy_docs_051020.tgz
+ mirror://gentoo/${P}-doc.tar.bz2
+ xml? ( http://www.cise.ufl.edu/~ppadala/tidy/html2db.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc xml"
+
+DEPEND="virtual/libc"
+RDEPEND="virtual/libc"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ # Required to setup the source dist for autotools
+ einfo "Setting up autotools for source build"
+ export WANT_AUTOMAKE=1.5 WANT_AUTOCONF=2.5
+ /bin/sh ./build/gnuauto/setup.sh > /dev/null
+
+ # Stop tidy from appending -O2 to our CFLAGS
+ epatch ${FILESDIR}/htmltidy-5.10.26-strip-O2-flag.patch || die
+
+ if use xml ; then
+ # Apply the docbook patch to tidy sources
+ epatch ${FILESDIR}/05-${PN}-docbook.patch || die
+
+ # And the null -> NULL patch to html2db sources
+ EPATCH_OPTS="-d ${WORKDIR}" epatch ${FILESDIR}/03-html2db-null.patch || die
+
+ # Point to the tidy source in the html2db Makefile
+ sed -e "/TIDYDIR\=/s:\.\.:${S}:" \
+ -e "/LIBDIR\=/s:lib:src\/\.libs\/:" \
+ ${WORKDIR}/html2db/Makefile > ${T}/Makefile &&
+ mv ${T}/Makefile ${WORKDIR}/html2db/Makefile || die "sed Makefile failed"
+ fi
+}
+
+src_compile() {
+ export WANT_AUTOMAKE=1.5 WANT_AUTOCONF=2.5
+ econf `use_enable debug` || die
+ emake || die
+
+ if use xml ; then
+ cd ${WORKDIR}/html2db
+ emake || die
+ fi
+}
+
+src_install() {
+ make DESTDIR=${D} install || die
+ use xml && dobin ${WORKDIR}/html2db/html2db
+
+ 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}/${P}-doc/tidy.1"
+
+ # Install basic html documentation
+ dohtml *.html *.css *.gif "${WORKDIR}/${P}-doc/quickref.html"
+
+ # If use 'doc' is set, then we also want to install the
+ # api documentation
+ use doc && dohtml -r api
+}