Fix building rfc-index by Hartmut Figge, and thanks to Victor for the patch (bug #335152). Clean up old patch.

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64

5 files changed, 81 insertions, 12 deletions

diff --git a/app-text/rfcutil/ChangeLog b/app-text/rfcutil/ChangeLog
index 89ca9f640b82..460165aff1df 100644
--- a/app-text/rfcutil/ChangeLog
+++ b/app-text/rfcutil/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/rfcutil
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rfcutil/ChangeLog,v 1.26 2011/07/20 13:52:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/rfcutil/ChangeLog,v 1.27 2011/12/13 20:22:37 jer Exp $
+
+*rfcutil-3.2.3-r1 (13 Dec 2011)
+
+  13 Dec 2011; Jeroen Roovers <jer@gentoo.org> +rfcutil-3.2.3-r1.ebuild,
+  +files/rfc-3.2.3-index.patch, files/rfc-3.2.3.diff:
+  Fix building rfc-index by Hartmut Figge, and thanks to Victor for the patch
+  (bug #335152). Clean up old patch.
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #34534
diff --git a/app-text/rfcutil/Manifest b/app-text/rfcutil/Manifest
index 25e2342f0fbd..5435c94ea8bf 100644
--- a/app-text/rfcutil/Manifest
+++ b/app-text/rfcutil/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX rfc-3.2.3.diff 840 RMD160 f3a93cf4585e285529f4a33e044d6490b78f7e87 SHA1 23528d7b61a7d6fa62d30311081c7acec141d7a3 SHA256 cc81a40e2cac807fd06f0e58a14a578a83caa21fb888d69476b9ff6abc07c474
+AUX rfc-3.2.3-index.patch 998 RMD160 33680558a2a671c8bce917e47ad6bf5a9eab9f36 SHA1 9a3b1fb89b3f10ef82ace82acd583208093684b3 SHA256 7ccf5a4ca44bf97fbddaef08f1a17c54fd482fff2a6ea65ec2d738fb1edf370a
+AUX rfc-3.2.3.diff 767 RMD160 0c21920653147320ac4a669ec6f6191365cb043e SHA1 3f644258e0e4eb018959c1ebf720165a461515bc SHA256 54b9b38f564ef31961d14a74214ca8f5029ff7a5e61260a9254f099a5059239c
 DIST rfc-3.2.3.tar.gz 10469 RMD160 1ffe2dc4999fa902054315036b830f7458327a1b SHA1 53ed193788115b479b87b340443194d3aa4fac9f SHA256 894ca3d84bbe354748a4808e60f3d35879637b0fb5a6f9e47a1ece3314231950
+EBUILD rfcutil-3.2.3-r1.ebuild 998 RMD160 3db8c7efe2924f62eda114d85dc06c1769abe4ad SHA1 1909b920ea10c9b0a4d0d4c094262d331778380c SHA256 03fef778f15c53be9c9296172498982ef065471e44274ecfe70519db85451c6c
 EBUILD rfcutil-3.2.3.ebuild 960 RMD160 1442a7beccde978d01ecfe0523449983215ea89a SHA1 afd50cc259a28c130be49b2c5a860973dcb6239e SHA256 c6f7aedf8fe65bce8c343a465d66be2a058b4811cdc4d8c31c3e653a43b7f2a6
-MISC ChangeLog 2666 RMD160 665db9da8bdf9ee682cc0642e0c413c40b6c3597 SHA1 d9df25304def67038ad9dfd897597f7007efb039 SHA256 383e65c00eab276f633427ec54454578722e4cc18d21d6b8e1c60c99a3455b65
+MISC ChangeLog 2940 RMD160 a733c08d5ebd12899c6ded27c71c1f1136c0ccdb SHA1 51dd2c4e782558404b5006cd263ed6097c76fdf2 SHA256 f538424a8a88a4deb302b5fd2f2dba0a259b0e813cf3f19d00917b0c0308467d
 MISC metadata.xml 212 RMD160 f278ca2a473dd949f7d0f359c432cfe4ed026e71 SHA1 b67d9ec2368a50032f536d14dbd7f105b25191cf SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk5/GK0ACgkQfXuS5UK5QB3JZQP/Q/v+q3jZmkTFWhSccc6l/SpG
-OG3EoHnFhLKSDK4NZo3hrO4F8JfRGBCOMZJX4Y9pgnlmqOtVEdSsHoKGA5xG6nBv
-twE5djfFhH22va/NPYWfjx3+rzrIaBmGmqMQ+x0/EoOBfMz8wXvj2snQOIWVUKNu
-6WnkhygLudrnnN5vyDc=
-=iSQE
+iEYEARECAAYFAk7ntBMACgkQVWmRsqeSphN+0wCeN6brsGNjn1Z596a9uh4L2FxG
+I+MAn3haNYO+OXFsViY/jwPvPhp2KzRj
+=XFN0
 -----END PGP SIGNATURE-----
diff --git a/app-text/rfcutil/files/rfc-3.2.3-index.patch b/app-text/rfcutil/files/rfc-3.2.3-index.patch
new file mode 100644
index 000000000000..6b4deb607d6a
--- /dev/null
+++ b/app-text/rfcutil/files/rfc-3.2.3-index.patch
@@ -0,0 +1,17 @@
+--- a/rfc-3.2.3/rfc-3.2.3
++++ b/rfc-3.2.3/rfc-3.2.3
+@@ -103,11 +103,12 @@
+     ."It may be desirable to change the\n\$indexpath to a location you can write to.";
+     close (INDEXPATH);
+     $indexlength=numlines($indexpath);
+-    print "Modem users one moment, it's about 400k \(doesn't need to be updated often\)\n";
++    print "Modem users one moment, it's about 1024k \(doesn't need to be updated often\)\n";
+     print "original lines \t= $indexlength\t$indexpath\n";
+     #system ("$viewer -dump http://www.faqs.org/rfc/rfc-index.txt > $indexpath");
+     #system ("$viewer -dump http://www.dewn.com/rfc/rfc-index.txt > $indexpath");
+-    system ("$viewer -dump http://ftp.isi.edu/in-notes/rfc-index.txt > $indexpath");
++    #system ("$viewer -dump http://ftp.isi.edu/in-notes/rfc-index.txt > $indexpath");
++    system ("$viewer -dump http://www.ietf.org/rfc/rfc-index.txt > $indexpath");
+     $indexlength=numlines($indexpath); print "new lines \t= $indexlength\t$indexpath\n";
+     exit }
+ 
diff --git a/app-text/rfcutil/files/rfc-3.2.3.diff b/app-text/rfcutil/files/rfc-3.2.3.diff
index 451b6bd476f8..cb7c14e3e376 100644
--- a/app-text/rfcutil/files/rfc-3.2.3.diff
+++ b/app-text/rfcutil/files/rfc-3.2.3.diff
@@ -1,5 +1,5 @@
---- rfc-3.2.3/rfc-3.2.3.orig	2004-03-24 06:07:06.303313504 +0930
-+++ rfc-3.2.3/rfc-3.2.3	2004-03-24 06:08:14.408959872 +0930
+--- a/rfc-3.2.3/rfc-3.2.3
++++ b/rfc-3.2.3/rfc-3.2.3
 @@ -36,8 +36,8 @@
  
  # These make it avail for all users if you can't 
diff --git a/app-text/rfcutil/rfcutil-3.2.3-r1.ebuild b/app-text/rfcutil/rfcutil-3.2.3-r1.ebuild
new file mode 100644
index 000000000000..4ae42a883d16
--- /dev/null
+++ b/app-text/rfcutil/rfcutil-3.2.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/rfcutil/rfcutil-3.2.3-r1.ebuild,v 1.1 2011/12/13 20:22:37 jer Exp $
+
+EAPI=4
+
+inherit eutils
+
+MY_PN="rfc"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="return all related RFCs based upon a number or a search string"
+HOMEPAGE="http://www.dewn.com/rfc/"
+SRC_URI="http://www.dewn.com/rfc/${MY_P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	|| ( www-client/lynx virtual/w3m )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${MY_P}.diff \
+		"${FILESDIR}"/${MY_P}-index.patch
+}
+
+src_install() {
+	newbin ${MY_P} ${MY_PN}
+	doman ${MY_PN}.1
+	dodoc CHANGELOG KNOWN_BUGS README
+	keepdir /var/cache/rfc
+}
+
+pkg_postinst() {
+	elog "Gaarde suggests you make a cron.monthly to run the following:"
+	elog "   /usr/bin/rfc -i"
+}
+
+pkg_prerm() {
+	rm -f "${ROOT}"/var/cache/rfc/*
+}