Use readme.gentoo.eclass to limit elog, bug #489678

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

6 files changed, 48 insertions, 140 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index c1c370294887..14b31a393a61 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.388 2013/10/28 22:03:14 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.389 2013/10/28 22:16:36 blueness Exp $
+
+*tor-0.2.5.1_alpha-r2 (28 Oct 2013)
+*tor-0.2.4.17_rc-r1 (28 Oct 2013)
+
+  28 Oct 2013; Anthony G. Basile <blueness@gentoo.org> +files/README.gentoo,
+  +tor-0.2.4.17_rc-r1.ebuild, +tor-0.2.5.1_alpha-r2.ebuild,
+  -tor-0.2.4.17_rc.ebuild, -tor-0.2.5.1_alpha-r1.ebuild,
+  -tor-0.2.5.1_alpha.ebuild:
+  Use readme.gentoo.eclass to limit elog, bug #489678
 
   28 Oct 2013; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.4.16_rc.ebuild:
   Remove older RC
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 20b5dfbe6705..4ed62f2ee2c1 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX README.gentoo 316 SHA256 bd1a5d6a0973d89d3c89e52d1046c202f52d59aa45ca60d2ee33551ac77de1b9 SHA512 6ca305c710562c0f9a3f0cba07760adf300ea166c8baa47e8872719190d779fb63d4dd6c9193fb60ddb51015138790aaa93935668423e0f861f05496d22ce660 WHIRLPOOL da7f4eaaccab8172dba2f8d264dc6d010b98fdb70ed60eff71175a24b423df3101c8a93d162b309b0a51441ca9b01dcf7257bbecc8fa83f1903a0577d28a47d6
 AUX tor-0.2.3.14_alpha-torrc.sample.patch 1365 SHA256 7f8d64e84590a62c4b5b1ef55ffbac32b770eaeb4252ef550e6130af918cf63b SHA512 8691db8957ab22e8619b4909faef0534a82faee78c685fef005372e0bc423f1b8d83e930a32a2b2dee239796a47b2147d2dd7fd53938161024fd1dfda0be8eec WHIRLPOOL 0531fb6393311ee88915f47862665606f96e94b27064701d35e9828a9f3547bf0db8710cdb4e539f515496607cffbd70a32098cd4f2e7ea90ac595e1c80ccb5f
 AUX tor.confd 44 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660 WHIRLPOOL d3060208cf59c2de5839e7358fae37db883899f715a7411c7ba4c9e09926b6098aca7bfcaa269ea51b47b9f197ccd509f0c1e19909a87b1e087a88b30915a1cf
 AUX tor.initd-r6 1627 SHA256 49da1b5f267927023bc092adcf89d406ec294584039d6bca6b7aea0a9e7c4c4f SHA512 09aea50280fe0efee605e9235ce43d171efdf4cf6c2ccef272e797bac7277940e08155c5f294d9901507112a25a9be3aec5e40466caba4a54dfdb1e48683ab12 WHIRLPOOL 8c7fe6e6f53daa47676e040afceb716308bd836df6db35ddafd9a35d9c7ea2ef2d9c4e10ab971b882ae8b84ad4106a7b3f6a68791f9eefd3977c178b745f96b0
@@ -10,25 +11,24 @@ DIST tor-0.2.3.25.tar.gz 3190011 SHA256 bb2d6f1136f33e11d37e6e34184143bf191e5950
 DIST tor-0.2.4.17-rc.tar.gz 2825527 SHA256 9d143b950a1c920e455bb41f2773e2bee8818e4a81aa9b1877db47d643b95d65 SHA512 6a48954462efdef3e2ea71cb662ca14fc0a711494a95e19807564952dbb7e83b411f51819450aa2611313a2d1277323bbb853af720e83bf6421cfb42f53bf40a WHIRLPOOL 09dbc0d5292b1ddded41fa77c3b4e13225ef5a8df658c4f3c77592ef06c334085f21b9582ab57a2c9ee3e7ce476415749934f6b6a3f3f11b3f26a81c5fa05b43
 DIST tor-0.2.5.1-alpha.tar.gz 2904012 SHA256 3100d8f0ccb296e82f1d3602266d4dcde801daace82af74f5f27ee2fca7bb4a8 SHA512 962ee00022a45d90b7a92428929d9095a74b6e379a804fba5bf9ef8a0581cb5f3453c76ef76bdfc8124d8b83627a57ae5cfd5d74b89795d1233b057ac251c0d1 WHIRLPOOL e0847a2f196f2e258be4c92b58a4e000e7f2f1c709edfad1498fa6149bf5ad80399672830d3ece43268c961c3b2105de3cd5762796d9f90909b09b7ff221540e
 EBUILD tor-0.2.3.25.ebuild 2398 SHA256 c3b4fcb3fce77e12c3ec21abc0e1ddd155eb443d4f5ca8ec7c1c9f7d3488bbcc SHA512 c6b4a79e349945a10f054c70e11c0a4d14769d4cd4ee5585cfd27253fa1ffe935f23489eb2330ccd7ca0fc459739b7700d3650a8827e5077e992cd65f9293760 WHIRLPOOL 8ac04d9f9be3e1c94f7efdf37ee9163c0d224591fc25d09c3b576c493648aa51b3dc7ea5051e3df7979372827c213eda3265d3b4a329fcc8a75a6733738d94d3
-EBUILD tor-0.2.4.17_rc.ebuild 2542 SHA256 4b76c943be6f4ce5689e5ff64a8e16350bf1c96b66b0451862ac571cc0c90ef5 SHA512 7b245e0c660c23a5225cbe23c7d99bdd26d4bd53280772ce71778867cf3f4f2088d029e19f99f977a43c5b684f42763c0ff882aa4dd87028e7a35ee47f356171 WHIRLPOOL e05d45bf1aacf89893c35fa6c10f9099aeb96a8e98ea3ea4f0d487928c9d38b75f9c375b1d3461889f34acc57ccb99dcfc85f460c37f0d2f724512c7e6a3342f
-EBUILD tor-0.2.5.1_alpha-r1.ebuild 2690 SHA256 bdd72a03a79a4aec31cd1591bbc58415af9d49ed425926724661d569d821256e SHA512 803654bc4030a6e2b38d2ed479a4eb9316ce78d9de8e1d0f1b912314de41ebd094cb2fc8aa308d31541242d4b80c9614567f87f689b2aee1c695eaf069ef3b61 WHIRLPOOL 91c4ab4d18e8482901e34fbc43c84bacbf948fb93d9f23d07965ec7e78915ec96ed1396759e3186547d00e45e7d53526ad5c9f42257301e464bc4d1584da8f48
-EBUILD tor-0.2.5.1_alpha.ebuild 2638 SHA256 4b1c976c9cf94ea9cb63ffdc6353c7f0a7f01801e5b6a485c684f232cc8315d4 SHA512 93acb056b2cefc91ff17624d0a7bef544f266ef9d5d03787e52e14c9be23c594767073eb4d27d6565d6e79ea1f470a7bfad2b8c0a9eaa40449f0eecf16f42126 WHIRLPOOL 9f94a4d1c45e50f48845c84407948b126a7df3669e0bb99108baa8c7f3d9ae8bc18c04362fc9c183184d13db12cd7a5a8d9bbc456b18feafed4652b4b648c3e3
-MISC ChangeLog 58236 SHA256 9f7892b60db25f8578562e250e62a692991aba4ebf3bd0f2daa704cdb0b1795f SHA512 aee037e8a1f9219016962447f1733679198f26abc99cbb73a07ad2861ad0cebff4c732e63d62f39a62bdea2253698b16b0a2e367f45d795c7c641081bad63858 WHIRLPOOL 0a5f1db1b282e73a87e46b149a7f877c7e57367c0f91728fbebd18a0562e089b98a571bfa14deeda77882c9373b99ca5a949ebfa48a53308d0130b40bb327227
+EBUILD tor-0.2.4.17_rc-r1.ebuild 2228 SHA256 934df2549343873919f925882996820b249c1d1eacd07651c4f6685862998ddd SHA512 84c153000f1deb2d1a764e45c67ca6bcdd0e0f26233b5d7e35fec573e3e345788287ba4df73f23d7cdad6519d46ac143f49554aa61a57c13d5b5bd83a76d7968 WHIRLPOOL 7d6129ecb324328dab01581400cefd72631c4291bb6a842109321cc7840dae6ff34e69491a968d28e35162d57f9df53aa2495d4a502201c56854e2edb74c4185
+EBUILD tor-0.2.5.1_alpha-r2.ebuild 2381 SHA256 28add1346a23e50a492db9198156bd4084febda77fd6d0385179f1c393fcab51 SHA512 38a0f26380557bb534408bcf51d4d62dd2a3a562d334245ce28e3a07aa0386c588ea3fd0bca35ce9d2149128c44b2954ce843a5784777495193a40196cbac48c WHIRLPOOL 0eb2498b4eae7b3b140909d82ca1f33460671f574d0999295a674bc78d542277378e453dd460a5234f985ee848bd5ff4463ee955767f2710c5314a7f05b08a2e
+MISC ChangeLog 58585 SHA256 17a069d2fc68d016ed4db563c9292d261c75fa528b73a47c0da305f1ae30686a SHA512 4a827a9622eac5aa47d6c5694df61c5ae2933bd6363929533b8abee38d903f123ebd1d907172bf08f297af582608a9091e880e3b8daf486f769fb1e1ff3164a6 WHIRLPOOL f4c6736b4a1d8f4577bc72759746341c312087a48ded96e2770fd6cf2e09ada7f90b49b9e55ec5d9e63d12bda7b3039cf5a7c281df1dcf38bfd50f31db89487b
 MISC metadata.xml 747 SHA256 e59e5cc5a3a79a74cfbe218bd2378c219edd7b6de840129fba578bfb8b05b163 SHA512 c2bfa165d4057b6a32043e1ad7881d8652db4fc10093f8e0d1403c08966793cf179b288da72a70251282a6f8d0787dfc817c305c520abaf11d65b183f171d6ef WHIRLPOOL 53b8d90806c613c03c3b4a2d0498b4b0a55d7aed01aa0af0cbaa82d79ceccfbc91f0e9328b0a12620472254ce97849d330f090f585498b7fdab5431c3ebc5308
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSbt9QAAoJEJOE+m71LUu6480P/0DeGHfK+X7fabovzjTgjhMm
-/u9Du/44pKufXkdSgQD5UOIYA7c/jDQv9LBr5hjP/sQNTApvEspovjboWE75nKvD
-LETn6S2smWaPMUaUvr978qh5E8sz4epPGxkkglBzP6Hi11/DQ//ptlU+NdEbnlPZ
-4tWK4mUANoZ+a8S5fa6chRDTnypr1HfcSCLcbjjYVKfwhts+kQe31Y64ZMdlT64V
-4aCl0RNSIdBoqWfhoHRMnbNDkqo/7SFoq5O+NNYZUPW4/4/v83xSaely8BejZNS7
-Jfyb1ETvRPVKA4mQm88ozJvVihlbSeBLBQFUOYwC6ZFRn5KwT6ukQ0eQdEAcHyFZ
-i4GZPx58ZAyM8wpNF7hN31HhhVsHgmaKDjFycGaJrsGW/xXPkaKHl5Tj+DvhD+ZB
-ydHfdv6ZJAoxK9SMGdSI/RhBToh5jYSKnoMpK2nO7l1jv8JR4mlAE0TDSWqSB5AD
-Eg4NfobAev0UeADXN46QSsBQGcanSaElPIHh/T2E+XaB+ZAqo/Nbf0cV0mhr4whR
-xaXewr5aymrXlCfcXiAnliLW7lo2r1Yr9PgELkPevqJapAfqIXK785WxyLJ6TzbM
-5MxNKNYAUiKRBp5IuRUOM7DMHL20ryo4JK3TDkVhYK02VP1OhfXlfcYppPeNwA+v
-dumG+gHMC85peJasFcC+
-=frEa
+iQIcBAEBCAAGBQJSbuJiAAoJEJOE+m71LUu61XAP/jyQetJu3vP8u3z2dW+HxBGp
+2Q3Fh37WAsr9LvScg0K0wzQmVfbwcivbdSbkhctCczzeCgvjsdPZpF4jCXFX0Ti/
+jGgHTPEUGhW/b+z43uids4PvobL6mt3YgsGsaMMZH8Ax4Ym3QY+5blEWRPYIaCMG
+L8+b4sQENjjFw+bFS2W1aRIy3qgNI84WjxtUlJZ3huoSMb751iYKKI2M0K+gYVt/
+Ds933g3s4XZjqledYLms9gRcXEopkHQ6/pJbCVevECNTPVc5u213UDwtPhkmapQ6
+LE3Jttv10YqSFYwdn3aAeOe3l85C8lCUxC/iAakxVy716D4HAC7DjgbwXxf+jzDq
+04ju86lSTwaXIkWXE0ziCA1tPuGV6S+F7Oi6lxpZACLAOjwyjGyIltYgmC4Z804D
+aP9m8w5T+VkILKCcrxV6cpftazrFmhKzgFrXelhF8AZMv/X3ZzWNTeGUpIzV925U
+L5ygcRmfU86DSIp7JPIFOqXnC497stV94u+Yz/9a3oOC4n/H4c74vYoJGgq9d51S
+pHkKvp0RynCr28/Ctukh4Ttvat3L8zkIfU8TBfy/t+umCc4spmsmYhDPpacH87Px
+n9Bv1Bk6wC42P2YCek0L3ov2yNkIyev8zAADkD5xCSmn0iw3AZf24BZ928OO371z
+73jhIn4zfNs0WTI89s0U
+=b56a
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/README.gentoo b/net-misc/tor/files/README.gentoo
new file mode 100644
index 000000000000..35214ac6fbb5
--- /dev/null
+++ b/net-misc/tor/files/README.gentoo
@@ -0,0 +1,8 @@
+We created a configuration file for tor, /etc/tor/torrc, but you can
+change it according to your needs.  Use the torrc.sample that is in
+that directory as a guide.  Also, to have privoxy work with tor
+just add the following line
+
+forward-socks4a / localhost:9050 .
+
+to /etc/privoxy/config.  Notice the . at the end!
diff --git a/net-misc/tor/tor-0.2.4.17_rc.ebuild b/net-misc/tor/tor-0.2.4.17_rc-r1.ebuild
index 18f9a117c0cf..7f88b04b5708 100644
--- a/net-misc/tor/tor-0.2.4.17_rc.ebuild
+++ b/net-misc/tor/tor-0.2.4.17_rc-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.4.17_rc.ebuild,v 1.1 2013/09/05 20:03:50 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.4.17_rc-r1.ebuild,v 1.1 2013/10/28 22:16:36 blueness Exp $
 
-EAPI="4"
+EAPI="5"
 
-inherit eutils flag-o-matic versionator
+inherit eutils flag-o-matic readme.gentoo versionator
 
 MY_PV="$(replace_version_separator 4 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -59,6 +59,8 @@ src_configure() {
 }
 
 src_install() {
+	readme.gentoo_create_doc
+
 	newconfd "${FILESDIR}"/tor.confd tor
 	newinitd "${FILESDIR}"/tor.initd-r6 tor
 
@@ -76,14 +78,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
+	readme.gentoo_pkg_postinst
 }
diff --git a/net-misc/tor/tor-0.2.5.1_alpha-r1.ebuild b/net-misc/tor/tor-0.2.5.1_alpha-r2.ebuild
index 366dda79a2bb..fcd0788bad70 100644
--- a/net-misc/tor/tor-0.2.5.1_alpha-r1.ebuild
+++ b/net-misc/tor/tor-0.2.5.1_alpha-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.5.1_alpha-r1.ebuild,v 1.1 2013/10/28 19:41:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.5.1_alpha-r2.ebuild,v 1.1 2013/10/28 22:16:36 blueness Exp $
 
-EAPI="4"
+EAPI="5"
 
-inherit eutils flag-o-matic systemd versionator
+inherit eutils flag-o-matic readme.gentoo systemd versionator
 
 MY_PV="$(replace_version_separator 4 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="-bufferevents +ecc nat-pmp selinux stats tor-hardening transparent-proxy threads upnp web"
+IUSE="-bufferevents +ecc nat-pmp selinux stats tor-hardening transparent-proxy threads test upnp web"
 
 DEPEND="dev-libs/openssl
 	sys-libs/zlib
@@ -65,6 +65,8 @@ src_test() {
 }
 
 src_install() {
+	readme.gentoo_create_doc
+
 	newconfd "${FILESDIR}"/tor.confd tor
 	newinitd "${FILESDIR}"/tor.initd-r6 tor
 	systemd_dounit "${FILESDIR}/${PN}.service"
@@ -83,14 +85,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
+	readme.gentoo_pkg_postinst
 }
diff --git a/net-misc/tor/tor-0.2.5.1_alpha.ebuild b/net-misc/tor/tor-0.2.5.1_alpha.ebuild
deleted file mode 100644
index 831601fc27a5..000000000000
--- a/net-misc/tor/tor-0.2.5.1_alpha.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.5.1_alpha.ebuild,v 1.1 2013/10/02 10:15:52 blueness Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic versionator
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="-bufferevents +ecc nat-pmp selinux stats tor-hardening transparent-proxy threads upnp web"
-
-DEPEND="dev-libs/openssl
-	sys-libs/zlib
-	dev-libs/libevent
-	bufferevents? ( dev-libs/libevent[ssl] )
-	nat-pmp? ( net-libs/libnatpmp )
-	upnp? ( net-libs/miniupnpc )
-	selinux? ( sec-policy/selinux-tor )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.patch
-}
-
-src_configure() {
-	# Upstream isn't sure of all the user provided CFLAGS that
-	# will break tor, but does recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-	econf \
-		--disable-buf-freelists \
-		--enable-asciidoc \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable stats instrument-downloads) \
-		$(use_enable bufferevents) \
-		$(use_enable ecc curve25519) \
-		$(use_enable nat-pmp) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable threads) \
-		$(use_enable upnp) \
-		$(use_enable web tor2web-mode) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r6 tor
-
-	emake DESTDIR="${D}" install
-
-	keepdir /var/lib/tor
-
-	dodoc README ChangeLog ReleaseNotes doc/HACKING
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}