5 files changed, 20 insertions, 94 deletions

diff --git a/app-text/man2html/ChangeLog b/app-text/man2html/ChangeLog
index af11df281314..9002062e531d 100644
--- a/app-text/man2html/ChangeLog
+++ b/app-text/man2html/ChangeLog
@@ -1,53 +1,6 @@
 # ChangeLog for app-text/man2html
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/man2html/ChangeLog,v 1.17 2005/10/13 17:30:07 metalgod Exp $
-
-  13 Oct 2005; Luis Medinas <metalgod@gentoo.org> man2html-1.5l-r2.ebuild:
-  Added ~amd64 keyword. Bug #109085.
-
-  08 May 2005; Bryan Østergaard <kloeri@gentoo.org>
-  man2html-1.5l-r2.ebuild:
-  Stable on ia64.
-
-  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
-  man2html-1.5l-r2.ebuild:
-  Stable on ppc.
-
-  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  05 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> man2html-1.5l-r2.ebuild:
-  Stable on alpha.
-
-  31 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> man2html-1.5l-r2.ebuild:
-  Stable on sparc
-
-  29 Aug 2004; <twp@gentoo.org> man2html-1.5l-r2.ebuild:
-  Stable on x86
-
-  03 Jun 2004; David Holm <dholm@gentoo.org> man2html-1.5l-r2.ebuild:
-  Added to ~ppc.
-
-*man2html-1.5l-r2 (31 May 2004)
-
-  31 May 2004; twp +files/mansec.patch, +man2html-1.5l-r2.ebuild:
-  Patch to use webapp eclass, thanks Rob Kruus. Bug # 52119, masked in
-  package.mask pending bug # 52544.
-
-  20 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org>
-  man2html-1.5l-r1.ebuild, man2html-1.5l.ebuild:
-  arm mips and hppa need deps first; header fix; move webapp-detect into setup
-
-  16 Feb 2004; Aron Griffis <agriffis@gentoo.org> man2html-1.5l-r1.ebuild:
-  stable on ia64
-
-*man2html-1.5l-r1 (27 Dec 2003)
-
-  27 Dec 2003; Tom Payne <twp@gentoo.org> man2html-1.5l-r1.ebuild :
-  Use HTTPD_{ROOT,CGIBIN,CGIAUX} in scripts. Bug # 36533.
-
-  15 Dec 2003; Stuart Herbert <stuart@gentoo.org> man2html-1.5l.ebuild:
-  Fix for bug #32636
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/man2html/ChangeLog,v 1.1 2003/09/28 02:03:47 twp Exp $
 
 *man2html-1.5l (28 Sep 2003)
 
diff --git a/app-text/man2html/Manifest b/app-text/man2html/Manifest
index 5eb43adf295c..0820f62fe501 100644
--- a/app-text/man2html/Manifest
+++ b/app-text/man2html/Manifest
@@ -1,22 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a62c67148ba1539a79819f17083c7892 ChangeLog 1849
+MD5 a2903c8ea25e9bc37754b14b4c8fc16c man2html-1.5l.ebuild 1449
 MD5 a63bfea0511bb4ea9292d63dc11348b3 files/digest-man2html-1.5l 60
-MD5 a63bfea0511bb4ea9292d63dc11348b3 files/digest-man2html-1.5l-r1 60
-MD5 a63bfea0511bb4ea9292d63dc11348b3 files/digest-man2html-1.5l-r2 60
-MD5 8907539a119c6fcb706af01a90e6923f files/man2html.cron 120
-MD5 cc4443b206a96b25c569d6fb800f717d files/mansearch-gentoo.patch 686
-MD5 1f9c3d195ff74e7f73229d5024179273 files/mansec.patch 639
-MD5 56100920b7436cf90ed14c82d9d6475e files/manwhatis-gentoo.patch 638
-MD5 3af5d41f1e323799c0ce76d306a60194 man2html-1.5l-r1.ebuild 1822
-MD5 938ad41d504cbd20bd01ad66d2cce13c man2html-1.5l-r2.ebuild 1455
-MD5 240204af381dd8cf73538da575009b00 man2html-1.5l.ebuild 1554
-MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDTqfPwUpWvClEHQoRAmldAJ9MEkmcbk4FZmZHUfmFsSL344vofQCfVsm+
-ppmIjUzrjGR9LertoEyzwJ0=
-=GEqp
------END PGP SIGNATURE-----
+MD5 cc4443b206a96b25c569d6fb800f717d files/man2html-1.5l-gentoo.patch 686
diff --git a/app-text/man2html/man2html-1.5l-r1.ebuild b/app-text/man2html/man2html-1.5l-r1.ebuild
index 8e9fe98b7383..98d72d0fe75e 100644
--- a/app-text/man2html/man2html-1.5l-r1.ebuild
+++ b/app-text/man2html/man2html-1.5l-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/man2html/man2html-1.5l-r1.ebuild,v 1.6 2005/01/01 16:25:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/man2html/man2html-1.5l-r1.ebuild,v 1.1 2003/12/27 13:32:15 twp Exp $
 
 inherit eutils webapp-apache
+webapp-detect || NO_HTTPD=1
 
 DESCRIPTION="Convert manual pages to HTML"
 HOMEPAGE="http://freshmeat.net/projects/man/"
@@ -10,8 +11,7 @@ SRC_URI="mirror://kernel/linux/utils/man/man-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha sparc x86 ia64"
-IUSE=""
+KEYWORDS="alpha arm hppa mips sparc x86"
 
 DEPEND="app-misc/glimpse
 	sys-apps/gawk
@@ -20,7 +20,6 @@ DEPEND="app-misc/glimpse
 S=${WORKDIR}/man-${PV}
 
 pkg_setup() {
-	webapp-detect || NO_HTTPD=1
 	webapp-pkg_setup "${NO_HTTPD}"
 	einfo "Installing into ${ROOT}${HTTPD_ROOT}"
 }
diff --git a/app-text/man2html/man2html-1.5l-r2.ebuild b/app-text/man2html/man2html-1.5l-r2.ebuild
index 4b62841b26cf..6701100d6dbe 100644
--- a/app-text/man2html/man2html-1.5l-r2.ebuild
+++ b/app-text/man2html/man2html-1.5l-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/man2html/man2html-1.5l-r2.ebuild,v 1.11 2005/10/13 17:30:07 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/man2html/man2html-1.5l-r2.ebuild,v 1.1 2004/05/31 12:14:01 twp Exp $
 
 inherit eutils webapp
 
@@ -9,8 +9,7 @@ HOMEPAGE="http://freshmeat.net/projects/man/"
 SRC_URI="mirror://kernel/linux/utils/man/man-${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ia64 ppc sparc x86"
-IUSE=""
+KEYWORDS="~alpha ~sparc ~x86 ~ia64"
 
 DEPEND="app-misc/glimpse
 	sys-apps/gawk
diff --git a/app-text/man2html/man2html-1.5l.ebuild b/app-text/man2html/man2html-1.5l.ebuild
index 37302914ac95..0143b1715a7b 100644
--- a/app-text/man2html/man2html-1.5l.ebuild
+++ b/app-text/man2html/man2html-1.5l.ebuild
@@ -1,26 +1,22 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/man2html/man2html-1.5l.ebuild,v 1.8 2005/01/01 16:25:16 eradicator Exp $
-
-inherit eutils webapp-apache
+# $Header: /var/cvsroot/gentoo-x86/app-text/man2html/man2html-1.5l.ebuild,v 1.1 2003/09/28 02:03:47 twp Exp $
 
 DESCRIPTION="Convert manual pages to HTML"
 HOMEPAGE="http://freshmeat.net/projects/man/"
-SRC_URI="mirror://kernel/linux/utils/man/man-${PV}.tar.gz"
-
+SRC_URI="http://www.kernel.org/pub/linux/utils/man/man-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha sparc x86"
-IUSE=""
+KEYWORDS="alpha arm hppa mips sparc x86"
+DEPEND="app-misc/glimpse sys-apps/gawk sys-apps/man"
+S="${WORKDIR}/man-${PV}"
 
-DEPEND="app-misc/glimpse
-	sys-apps/gawk
-	sys-apps/man"
+inherit eutils
+inherit webapp-apache
 
-S=${WORKDIR}/man-${PV}
+webapp-detect || NO_HTTPD=1
 
 pkg_setup() {
-	webapp-detect || NO_HTTPD=1
 	webapp-pkg_setup "${NO_HTTPD}"
 	einfo "Installing into ${ROOT}${HTTPD_ROOT}"
 }
@@ -37,8 +33,6 @@ src_compile() {
 }
 
 src_install() {
-	webapp-mkdirs
-
 	cd man2html
 	exeinto ${HTTPD_CGIBIN}/man
 	doexe scripts/cgi-bin/man/*