Revbump to fix bug 343943, Updated SRC_URI/HOMEPAGE.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 80 insertions, 3 deletions

diff --git a/app-text/man2html/ChangeLog b/app-text/man2html/ChangeLog
index 246364fff57a..a5647e2a35b9 100644
--- a/app-text/man2html/ChangeLog
+++ b/app-text/man2html/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/man2html
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/man2html/ChangeLog,v 1.21 2008/05/23 23:29:29 darkside Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/man2html/ChangeLog,v 1.22 2010/11/11 10:04:13 xmw Exp $
+
+*man2html-1.6f-r1 (11 Nov 2010)
+
+  11 Nov 2010; Michael Weber <xmw@gentoo.org> +man2html-1.6f-r1.ebuild,
+  +files/man2html-1.6f-apostrophe.patch:
+  Revbump to fix bug 343943, thanks to OKUMURA N. Shin-ya
+  <oku.ns@dream.com>. Updated SRC_URI/HOMEPAGE.
 
   23 May 2008; Jeremy Olexa <darkside@gentoo.org> files/man2html.cron:
   Modified files/man2html.cron, see bug 189582. Thanks to Harvey Chapman for
diff --git a/app-text/man2html/Manifest b/app-text/man2html/Manifest
index 7228ebc54ebc..d07e7df559dd 100644
--- a/app-text/man2html/Manifest
+++ b/app-text/man2html/Manifest
@@ -1,3 +1,4 @@
+AUX man2html-1.6f-apostrophe.patch 376 RMD160 99878acbc720433bcd1bc0739866e07c771e5167 SHA1 584b2efe945a4886cb215a8b5e6a171c4a88cf82 SHA256 31deeff1bf1a9dc60d3576706910d480b3bbc72cff479c57d7ba340caad8b706
 AUX man2html.cron 572 RMD160 11c4721e9bbd0000240631fea47854dddcb87a47 SHA1 c57765dd1295625d57c4092f33330db1aeea722b SHA256 03925ea56fc5541c9a01330b08e3856877433d9f934ef22e35dbe653f4177dc9
 AUX mansearch-gentoo.patch 686 RMD160 99f6af24a2e227072615b513894670f5b9901e02 SHA1 119e43ae22bd35d48068f3e5ef49d61ca54cb3c2 SHA256 f61a0a4fe9adbc079986f6c8296fa0d3d0b7d341f55669a68480d9c1fa948cc3
 AUX mansec-1.6f.patch 650 RMD160 fbbe9b73e70000f47e5d46418733434ee2a365dc SHA1 9aace19085e88fb9e4e3d6de9127ce3ed940fb20 SHA256 9bb230de814cb5cc036cb3e18c38002120b27b1419060299df0ecdff09fe02b8
@@ -6,6 +7,7 @@ AUX manwhatis-gentoo.patch 638 RMD160 be6613c493130f44bc0dc1a8aa464117a36376f9 S
 DIST man-1.5l.tar.gz 218249 RMD160 f6328da663e6179d382e2261b7114441c51aecf4 SHA1 8d5f195fb3b54a4a00e08534be1db23e2f36ecb7 SHA256 ad46206e0846e89ce9ecfa3a0274eb8f60a45a8c931cc9a319d8b07d53183e2f
 DIST man-1.6f.tar.gz 254827 RMD160 8680bb94bff9b86fb9d061f58d9acb08c934531e SHA1 c97012607ed9d75a6eee7e66d257a99a8ed86918 SHA256 9f208c7e1981371ad4481d6e6c2c566bc726a15778723f94136d220fb9375f6c
 EBUILD man2html-1.5l-r2.ebuild 1402 RMD160 061032137f913e4e47142d1a9d1949d1cb77f914 SHA1 bf59aa9474c87abde283c9347b2319be9268f7fb SHA256 c0ff475dcc57126d626039af174645e1080a312b568ecf281a0d86c1914a2f52
+EBUILD man2html-1.6f-r1.ebuild 1467 RMD160 94bbc7c2dd1a067be58f2a6d983310de69a73017 SHA1 f54ffbf9527a7ba5d7ed6ac252cb0e2b68282e2a SHA256 50847fcd60e9db1742b5b10736dfa6d711ca303a2e424c65d4e10612996070fe
 EBUILD man2html-1.6f.ebuild 1368 RMD160 223e3bb31c65f6f5551cb762c6eca01bcc495a50 SHA1 9d62df7cf596b5ff8366de713fd5958c52905835 SHA256 4d40bdd4e7632e46a7e140ec3227eb9fc0a4bdbaacb05de793be829b0eedbf96
-MISC ChangeLog 2431 RMD160 205fc1a37a97bb37102bcfc9a9f748debe054bd6 SHA1 e3b50cc67e268bd167d2dad447e86e2da771e989 SHA256 5a029dcdc0bf983f276422f1083963590115c703a5e62c4668daa385b9819da4
+MISC ChangeLog 2679 RMD160 509cb985f94a737f0591c7f44ade8446ebf0ca37 SHA1 4708d345e834f2be4562700be0c6619869c4cf1d SHA256 bcdb96621f1235ddacbeca7ccf952e4ccaf892bb8a66b90b29de5d2756bca147
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
diff --git a/app-text/man2html/files/man2html-1.6f-apostrophe.patch b/app-text/man2html/files/man2html-1.6f-apostrophe.patch
new file mode 100644
index 000000000000..5ad467c8097b
--- /dev/null
+++ b/app-text/man2html/files/man2html-1.6f-apostrophe.patch
@@ -0,0 +1,10 @@
+--- man-1.6f/man2html/strdefs.c
++++ man-1.6f/man2html/strdefs.c
+@@ -90,6 +90,7 @@
+     { V('F','l'), 3, "ffl", NULL  },
+     { V('a','a'), 1, "&#180;", NULL  },
+     { V('a','p'), 1, "~", NULL  },
++    { V('a','q'), 1, "&#39;", NULL  },	/* apostrophe */
+     { V('b','r'), 1, "|", NULL  },
+     { V('b','u'), 1, "*", NULL  }, 	/* bullet */
+     { V('b','v'), 1, "|", NULL  },
diff --git a/app-text/man2html/man2html-1.6f-r1.ebuild b/app-text/man2html/man2html-1.6f-r1.ebuild
new file mode 100644
index 000000000000..957cfa36cb71
--- /dev/null
+++ b/app-text/man2html/man2html-1.6f-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/man2html/man2html-1.6f-r1.ebuild,v 1.1 2010/11/11 10:04:13 xmw Exp $
+
+inherit eutils webapp
+
+DESCRIPTION="Convert manual pages to HTML"
+HOMEPAGE="http://primates.ximian.com/~flucifredi/man/
+	http://freshmeat.net/projects/man/"
+SRC_URI="http://primates.ximian.com/~flucifredi/man/man-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-misc/glimpse
+	sys-apps/gawk
+	virtual/man"
+
+S=${WORKDIR}/man-${PV}
+
+pkg_setup() {
+	webapp_pkg_setup
+	einfo "Installing into ${MY_HOSTROOTDIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/mansearch-gentoo.patch
+	epatch "${FILESDIR}"/mansec-${PV}.patch
+	epatch "${FILESDIR}"/${P}-apostrophe.patch
+	find man2html -type f | xargs sed -i \
+		-e "s:/home/httpd/htdocs/:/var/www/localhost/:g" \
+		-e "s:/home/httpd/cgi-bin/:/var/www/localhost/cgi-bin/man:g" \
+		-e "s:/home/httpd/cgi-aux/man:/var/www/localhost/cgi-aux/man:g"
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cd man2html
+	exeinto ${MY_HOSTROOTDIR}/cgi-bin/man
+	doexe scripts/cgi-bin/man/*
+	insinto ${MY_HOSTROOTDIR}/cgi-aux/man
+	doins scripts/cgi-aux/man/*
+	insinto /var/man2html
+	newins glimpse_filters .glimpse_filters
+	fperms 1777 /var/man2html
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/man2html.cron man2html
+
+	webapp_src_install
+}