Remove versions with vad autotools handling.

(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)

3 files changed, 5 insertions, 179 deletions

diff --git a/app-text/htmltidy/ChangeLog b/app-text/htmltidy/ChangeLog
index 249d00bc12bd..ed2f1b545a17 100644
--- a/app-text/htmltidy/ChangeLog
+++ b/app-text/htmltidy/ChangeLog
@@ -1,6 +1,10 @@
 # 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.57 2010/11/17 00:32:57 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.58 2010/12/01 14:44:45 flameeyes Exp $
+
+  01 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org> -htmltidy-4.8.6.ebuild,
+  -htmltidy-5.10.26-r2.ebuild:
+  Remove versions with vad autotools handling.
 
   17 Nov 2010; Sebastian Pipping <sping@gentoo.org>
   -files/03-htmltidy-docbook.patch:
diff --git a/app-text/htmltidy/htmltidy-4.8.6.ebuild b/app-text/htmltidy/htmltidy-4.8.6.ebuild
deleted file mode 100644
index 795b700ccb00..000000000000
--- a/app-text/htmltidy/htmltidy-4.8.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 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.24 2009/09/23 16:36:12 patrick 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/old/${MY_P}.tgz
-	http://tidy.sourceforge.net/docs/tidy_docs_040810.tgz
-	xml? ( http://www.eecs.umich.edu/~ppadala/projects/tidy/html2db.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="debug doc xml"
-
-DEPEND=""
-RDEPEND=""
-
-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
-	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
-		epatch ${FILESDIR}/04-${PN}-docbook.patch
-
-		# And the null -> NULL patch to html2db sources
-		cd ${WORKDIR}
-		epatch ${FILESDIR}/03-html2db-null.patch
-
-		# 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
-
-	# Install basic html documentation
-	dohtml *.html *.gif *.css
-	# If use 'doc' is set, then we also want to install the
-	# api documentation
-	use doc && dohtml -r api
-}
diff --git a/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild b/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild
deleted file mode 100644
index 215355199c5c..000000000000
--- a/app-text/htmltidy/htmltidy-5.10.26-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2009 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.13 2009/07/22 17:28:23 rbu 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.eecs.umich.edu/~ppadala/projects/tidy/html2db.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc xml"
-
-DEPEND=""
-
-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
-}