Improve warning about https://trac.torproject.org/projects/tor/ticket/10259

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

5 files changed, 47 insertions, 25 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index aef2351f4d75..b97edcd08656 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,10 @@
 # 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.392 2013/12/03 23:49:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.393 2013/12/04 14:09:06 blueness Exp $
+
+  04 Dec 2013; Anthony G. Basile <blueness@gentoo.org> tor-0.2.3.25.ebuild,
+  tor-0.2.4.18_rc.ebuild, tor-0.2.5.1_alpha-r2.ebuild:
+  Improve warning about https://trac.torproject.org/projects/tor/ticket/10259
 
   03 Dec 2013; Anthony G. Basile <blueness@gentoo.org>
   -tor-0.2.4.17_rc-r1.ebuild:
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 998ce2dd8a85..c53b8222f970 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -10,25 +10,25 @@ AUX torrc-r1 140 SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf6
 DIST tor-0.2.3.25.tar.gz 3190011 SHA256 bb2d6f1136f33e11d37e6e34184143bf191e59501613daf33ae3d6f78f3176a0 SHA512 c15f9356abc41bd1c663d37e674386debc29b0a5887e1120a0318ffb97ada1a04d57756175f01f13549f179f73916e2af18566575a656154ff71ec050fc99651 WHIRLPOOL 6660f5db69bf89cba17937fc72982f674d70fd64c31647228b15d5f19febcd9e64bf09d94e1681f8a0285f2129dbfe3e77687e4d44f335ca8013e318023f755b
 DIST tor-0.2.4.18-rc.tar.gz 2854762 SHA256 e4e644274e24c2270f638fbcbe1c9167607ec98332a1cef4c3d03f408eb3aef5 SHA512 476947f548c44b6cb53888b3e9f3caa2dd7577cf1098e1a813f7b090c9846f42ff6a25d6a96a6cf8214e3df54ebd8643e67f214829d464ac212187668c5ff937 WHIRLPOOL a95dd41d184bc7b54f651b873e694fafd24a6696a56be16b16e3fd1fcfac4fa325bffcdc899c4c41bc040954bdde61530bc0cf9c7ed82ae78badc141e475e478
 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.18_rc.ebuild 2225 SHA256 6a9caf07d520ccdae66977bcc20b5f33071700eef8b608f3aad292e34cfff79f SHA512 59302f0711116dfd0791b48d9e8164a375b0552e74b1a0b689bb348d2d56b099b3e7adc495e96bfbe429b83607f16e71550566f3f63f8679a07edbf5aa213796 WHIRLPOOL 775bab2e3239821ec3289dd6c45d94d7f996a912bc7d3876edb44373f4dffd425bfafad01fc1b159cdb50410a2954e385479a850a3b883f70fd45887cc1fe403
-EBUILD tor-0.2.5.1_alpha-r2.ebuild 2687 SHA256 c18dcbb69b6db29b57f6426ee940a47be3429ef4518ca19b127393405a025606 SHA512 4e24a516d4e899b724dbd61b3baab0e9c21b387785e6a5696a56cabed8a15d98de1bf7a9ecffeda7d1f742e47c552f0309ef34ff168cae6694c7ef9f619c8432 WHIRLPOOL 52c2de410b5f28182e68fe287a80ea69cbe9866af0524890cca837ec27c4c1827d363dcb47cafcd31f1a3438b9a81903de1cb971101dc6405120f2df8a373f04
-MISC ChangeLog 58982 SHA256 3a5e474e628cea30083c5977b2bccd3c25f3b020e28245f9acb05dd5c0399b36 SHA512 f173e514f0ea1f9ee5f806c5eacd67693c5c3534e687705748eb4dd6fa59c8b207a28c0ece5353bd170d7b97370b8760c32f02872ff064b2d108de72e14d2e66 WHIRLPOOL 121bbb444e9399d93c7eb12a3a6e13bedbcba1ab8c2df5943083803f0030771bcbc3878a2cb967bc737465ab09e2adedc22ace1b2c36d62239b56a0df2bb9820
+EBUILD tor-0.2.3.25.ebuild 2778 SHA256 511b8620265347c02948471496cd83da5e44a2eab78a4ab158b8977021908275 SHA512 50d96475b0247a0405e57baf2af52ada6c04a4a4a67b91f4666382b5f96922e0f96684ca7a202a5bf7e8437791741bed2c6c608565dc3f9d90739d0c54e81ece WHIRLPOOL a577c8c660899b510ffe8e13289b4045cecd2f22b5c4e250780a28499041d926719b6ac6e59cdcfbc3a6d12e9bde3c0dbb5bddfbdad9a444ce5ace61a96bd989
+EBUILD tor-0.2.4.18_rc.ebuild 2605 SHA256 79dbbac40da6cdba4ab1745aee788d1e49298454d9c8a027c761a018a9854ea1 SHA512 0a4349b2e54154351a8ba6bd5b4e63715646323e1c640657e16a9ff7785aa9519a6442e21d9f840595e56c94607b6c90e5d870ab9c28f7be7241e2b4ef1530e7 WHIRLPOOL 06c42c6f619b891d1bbdccf22794bc55e578d43e46fbdf6bc145d074bc4047d429b04f09656d140468f77f8ac851fcd4892e5bfe3670fd9967395f2a2ae57beb
+EBUILD tor-0.2.5.1_alpha-r2.ebuild 2761 SHA256 35ea8ad447329da8640670ce85ea30980ed51dc2621b3aa32aa75b9a7061d60f SHA512 4107b4f2c8c4f75f4b3c6667f6f05f4fad201d7ddb888e3501158fd2b94e62471d0fd1797c0e878c5af8823649e3a79259e7b91dfffbb625f9a1de2079b35a39 WHIRLPOOL 3916eb3d64f96290562bdf178ca1a992632d3c9edbdccf40c356030edb5b6b25723fcee0e6b74cc4c0f9e5e1d490af7ada0dc0108af296eeca9e4f5900d1b16e
+MISC ChangeLog 59192 SHA256 d3929bfc6d7f53626adb8c7c8a429065ffad5657265de5760870b4673ca3112a SHA512 eebb2fcb3a74f0413a5138a20b69a38f8d4ed74b7a8d1f0bde76a840158a53813d80e55db54a31859cd3c8f5e3f6afde1bf3879877bdfb87209e07ace38a204d WHIRLPOOL 79d418d7d6fd69ae3e67449ed6e2db4f59f6b422508d1f1633e8edf2c5e18a2046780c8fc3d44e8cd304419b761815ebcc48b070bea202af81c8c0c877ac855c
 MISC metadata.xml 747 SHA256 e59e5cc5a3a79a74cfbe218bd2378c219edd7b6de840129fba578bfb8b05b163 SHA512 c2bfa165d4057b6a32043e1ad7881d8652db4fc10093f8e0d1403c08966793cf179b288da72a70251282a6f8d0787dfc817c305c520abaf11d65b183f171d6ef WHIRLPOOL 53b8d90806c613c03c3b4a2d0498b4b0a55d7aed01aa0af0cbaa82d79ceccfbc91f0e9328b0a12620472254ce97849d330f090f585498b7fdab5431c3ebc5308
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSnm53AAoJEJOE+m71LUu6+IkP/RU2htaPiLbTjwwyEqUAZzuf
-tlLYP7zde1YJ3Uhg43H8ZtR/K1lYhgls4Jdn5Z/4MkKAb77Jo9zONdFzD75mtLqX
-x1kU1X5beb1scuQ4suqZaqKbRKWh7oFXVf0dU4QOl4/l/f9VIDuKGvHMUm9UeOy4
-TXQ6AWs6ngNM++mUJREU4BQEdsUwW9TcFuHS4CMn76H5Htbr8ccSj4KiV/1IOxL1
-Bqhrf699qdTrCuPhDN1d0NM+CniBapK1PCa3iHlyQQJor3CtUVzc0kQQw2TL4QhZ
-/vRLzauwPSB6zN6lAkQ9/JMco5NOpabdtfL/yr9/NjJW8ao+iOUbdpLPl9l3JG4c
-Jy4GDF/Yuwj3gcpnK6joXWc3lYgoBDR/YsCrwQQi6/BAnQpXkwKn/XGhgbvtUS5S
-hzyTCKwMn+8hr2XLPggk8oksvmp4gpZ+oqIzJK+vgLvDG80mWl/DdjGy348e26eh
-ucTCNXEsPKboeOKe6+cIWaE9/G/g7rIA8I/3szYUqxxsBvy0R/Td/PWJG9roNR91
-K0jD8Lpya6JKnY3/R4XvNryf0M7V8dij3cbMA14XUiL+ZsWcDhXJTvQWsPkwCXvc
-ylavNtAwBUEvgKJMA3DduzlcO1kDh7+Z12tWwmb4WoOj1yE2KAWJxCDQr7m0Ysj0
-hssDwR+mAE8outy2TTAE
-=QzaM
+iQIcBAEBCAAGBQJSnzfVAAoJEJOE+m71LUu6wa8P/jGLqCDnfGNoYNl+0u46+vPl
+Ov0mV9e0uA+eip93bnnipcZIapV6rQ+yfK+N2jdamp0FoSE9JaZsZgsAqUfJwUQH
+8SPRBtgY6bNhS06JdKFRCepmqdh+2TEGXgLAqO8Ng5jIxAJZpqpFiZESgldeYsPJ
+LKa+ekyGv4l7MXtrr08wEX95Rl/h1GtwG5XKokk4w1603UeOWLP7NoI6K5eVEAI4
+MHF23kpaPIMFAoaN2VHymqKHG1rFLsHl4GJDUGGZKUJs9VmsS7v1uKCDPrQpPIKy
+uNiriVXjU4eVZH1L2CV5M9/vH/gQEsLYi/FP9pFYVHqE69p4QSFkYhbp/xCC/Bwa
+OEt3IHszh2dXcOMr4Hrit05Pkzfm4ID4SzX29wxHIohiS9yxIQE7bwGGTw8b8tF5
+gdP6k7a5U/60OuNgdG0X08y8CU8ikG/vr3QHuV+JS5dnuPT06vsqsqIsjwEFxvN4
+u8tkhZmo4vDO0Kvdz7UQO2aarhtcWk8D25k4hERm8Wm8Llf/S6qRFck8SE0Qk2d8
+64snDfFFDjakafYgXpDpH7VK8Pn6Uy7FoY44oQEBHJbMIZF85K+XnZyENsy7jkTg
+UaArZEmsU5XT10OA+q6Ki0j8fmZOTgZPpvyL4ikRJynD3j3thY9wnnKVhYQ0rtH6
+wyyLpbFhabyf+SsHgXwG
+=/jFB
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.3.25.ebuild b/net-misc/tor/tor-0.2.3.25.ebuild
index fa2ea44b817d..2d601bb46d7f 100644
--- a/net-misc/tor/tor-0.2.3.25.ebuild
+++ b/net-misc/tor/tor-0.2.3.25.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.3.25.ebuild,v 1.7 2013/02/28 15:03:37 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.25.ebuild,v 1.8 2013/12/04 14:09:06 blueness Exp $
 
 EAPI="4"
 
-inherit eutils flag-o-matic versionator
+inherit eutils flag-o-matic versionator toolchain-funcs
 
 MY_PV="$(replace_version_separator 4 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -84,4 +84,13 @@ pkg_postinst() {
 	elog
 	elog "to /etc/privoxy/config.  Notice the . at the end!"
 	elog
+
+	if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && $(gcc-micro-version) -ge 1 ]] ; then
+		ewarn "Due to a bug in  >=gcc-4.8.1, compiling ${P} with -Os leads to an infinite"
+		ewarn "loop.  See:"
+		ewarn
+		ewarn "    https://trac.torproject.org/projects/tor/ticket/10259"
+		ewarn "    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59358"
+		ewarn
+	fi
 }
diff --git a/net-misc/tor/tor-0.2.4.18_rc.ebuild b/net-misc/tor/tor-0.2.4.18_rc.ebuild
index 631b95e65bd6..31b371767809 100644
--- a/net-misc/tor/tor-0.2.4.18_rc.ebuild
+++ b/net-misc/tor/tor-0.2.4.18_rc.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.18_rc.ebuild,v 1.1 2013/11/17 16:10:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.4.18_rc.ebuild,v 1.2 2013/12/04 14:09:06 blueness Exp $
 
 EAPI="5"
 
-inherit eutils flag-o-matic readme.gentoo versionator
+inherit eutils flag-o-matic readme.gentoo versionator toolchain-funcs
 
 MY_PV="$(replace_version_separator 4 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -79,4 +79,13 @@ src_install() {
 
 pkg_postinst() {
 	readme.gentoo_pkg_postinst
+
+	if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && $(gcc-micro-version) -ge 1 ]] ; then
+		ewarn "Due to a bug in  >=gcc-4.8.1, compiling ${P} with -Os leads to an infinite"
+		ewarn "loop.  See:"
+		ewarn
+		ewarn "    https://trac.torproject.org/projects/tor/ticket/10259"
+		ewarn "    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59358"
+		ewarn
+	fi
 }
diff --git a/net-misc/tor/tor-0.2.5.1_alpha-r2.ebuild b/net-misc/tor/tor-0.2.5.1_alpha-r2.ebuild
index 65b91d815b50..88abc5839c05 100644
--- a/net-misc/tor/tor-0.2.5.1_alpha-r2.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-r2.ebuild,v 1.2 2013/12/03 22:11:01 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.5.1_alpha-r2.ebuild,v 1.3 2013/12/04 14:09:06 blueness Exp $
 
 EAPI="5"
 
-inherit eutils flag-o-matic readme.gentoo systemd versionator
+inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator
 
 MY_PV="$(replace_version_separator 4 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -87,7 +87,7 @@ src_install() {
 pkg_postinst() {
 	readme.gentoo_pkg_postinst
 
-	if has_version ">=sys-devel/gcc-4.8.1"; then
+	if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && $(gcc-micro-version) -ge 1 ]] ; then
 		ewarn "Due to a bug in  >=gcc-4.8.1, compiling ${P} with -Os leads to an infinite"
 		ewarn "loop.  See:"
 		ewarn