Replacing text-markup herd with the new sgml herd.

Package-Manager: portage-2.1.2.2

6 files changed, 6 insertions, 200 deletions

diff --git a/app-text/htmltidy/ChangeLog b/app-text/htmltidy/ChangeLog
index f8f0d9fae42d..709304881aed 100644
--- a/app-text/htmltidy/ChangeLog
+++ b/app-text/htmltidy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/htmltidy
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.41 2007/03/10 11:31:10 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmltidy/ChangeLog,v 1.42 2007/03/12 22:49:59 leonardop Exp $
+
+  12 Mar 2007; Leonardo Boshell <leonardop@gentoo.org> metadata.xml,
+  -htmltidy-3.10.29.ebuild, -htmltidy-5.10.26-r1.ebuild:
+  Replacing text-markup herd with the new sgml herd. Pruning old ebuilds.
 
   10 Mar 2007; Alexander H. Færøy <eroyf@gentoo.org>
   htmltidy-5.10.26-r2.ebuild:
diff --git a/app-text/htmltidy/files/digest-htmltidy-3.10.29 b/app-text/htmltidy/files/digest-htmltidy-3.10.29
deleted file mode 100644
index 98c7a8dcf8ed..000000000000
--- a/app-text/htmltidy/files/digest-htmltidy-3.10.29
+++ /dev/null
@@ -1,9 +0,0 @@
-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-5.10.26-r1 b/app-text/htmltidy/files/digest-htmltidy-5.10.26-r1
deleted file mode 100644
index c6926c832c5b..000000000000
--- a/app-text/htmltidy/files/digest-htmltidy-5.10.26-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-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-3.10.29.ebuild b/app-text/htmltidy/htmltidy-3.10.29.ebuild
deleted file mode 100644
index ba928f3df1bc..000000000000
--- a/app-text/htmltidy/htmltidy-3.10.29.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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-3.10.29.ebuild,v 1.19 2006/01/18 12:18:43 vapier Exp $
-
-inherit eutils
-
-# 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_040317.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="alpha amd64 arm hppa ia64 ppc ppc-macos s390 sh sparc x86"
-IUSE="debug doc xml"
-
-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}/03-${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-r1.ebuild b/app-text/htmltidy/htmltidy-5.10.26-r1.ebuild
deleted file mode 100644
index 02550e57101d..000000000000
--- a/app-text/htmltidy/htmltidy-5.10.26-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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-r1.ebuild,v 1.1 2006/05/08 09:02:05 ehmsen Exp $
-
-inherit eutils
-
-# 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
-	>=sys-devel/autoconf-2.5
-	>=sys-devel/automake-1.5"
-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
-}
diff --git a/app-text/htmltidy/metadata.xml b/app-text/htmltidy/metadata.xml
index 06689a1a9114..e96086477315 100644
--- a/app-text/htmltidy/metadata.xml
+++ b/app-text/htmltidy/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>text-markup</herd>
+  <herd>sgml</herd>
 </pkgmetadata>