Remove net dependency from pydoc init scripts (fixes bug 439662)

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x30380381

3 files changed, 21 insertions, 22 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 49bb3d5c69cd..2dea1438637b 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.789 2014/10/12 09:00:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.790 2014/10/12 12:37:07 djc Exp $
+
+  12 Oct 2014; Dirkjan Ochtman <djc@gentoo.org> files/pydoc.init:
+  Remove net dependency from pydoc init scripts (fixes bug 439662)
 
   12 Oct 2014; Agostino Sarubbo <ago@gentoo.org> python-3.4.1.ebuild:
   Stable for x86, wrt bug #522322
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 449d052d8e39..2c179a154cf5 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -4,7 +4,7 @@ Hash: SHA256
 AUX CVE-2013-4238_py27.patch 11591 SHA256 050cc2d4b9d588f2587010a30819591e02130fde90594782993a39c945c1559b SHA512 f9b1d0573bc7175b8fe6bdd8b6777a376cd717a594a14a6ddb334e0107596b0fbfbfe8a0c1743a0da54ce8ac8905cb7385aa2ae26698272f679763542c13e7e2 WHIRLPOOL bbf89edb2e3620aae3f54e80feba98d75fa566594b2e71e88b75c22036201a2692a77daf56080f4413612edf159f4282f5494a0a5dd11b350bcde248ef51f139
 AUX CVE-2013-4238_py33.patch 11437 SHA256 e4f78490fc247df9d1133dc9f2deec47b1c582c4af1c8e93bd503d889c9eb716 SHA512 d1f1b64c46056f178b89abfe61c7c653afc0ed67cf9a8ef8c981d1cf6a1c389cb20bd354cac3a30c1241e6fe24a49e165527571276c1f8afb55989f5f069ba00 WHIRLPOOL e5889b6be0a2db7ec45ff8cbe9fa8481c6c69b25091b62635d2ff595ef5d0b1136485f7adb04f4c0c97402edfd9d915d4fd05e2b6bf1942497d81de1b1cefdce
 AUX pydoc.conf 279 SHA256 6437e85d16d34efaf2665b3cabb0707392e6dee3df04989d3fcac63fd22997e8 SHA512 2d552b6262fa4c7cd75f45d93b8a2657eb9154decbc08f9b73d2e67e1d84367b498f8556fbba20f7b57414281cfd673fff607da3c688c1d6bb9842e92cf0c32a WHIRLPOOL 1ba44797765939d7c0bcbecb08cb6201eeff9b134d4d3caef9339729dcad9f258e20b16db5f369f49b378df3c91e530115dbce5ce3595d71cd325a48793ac814
-AUX pydoc.init 741 SHA256 913be80dea585dd161d2fd439f56a358f148853d8305cb0dbf113c91eb1643f5 SHA512 9806c6ecf55f51b74b7cf4088c22043838cee8e8192b0bd33289c80ca86f96469bcef7ad110f654505109aa325fcfcc4e54e9494c8dccef13447d12c89f00152 WHIRLPOOL 73d5e45039bc054ed5217503b0ef3d96fc8701e2c0a69342118c0e5a89949a5afb2228827e97a654868f916620578a4a8fd2fba2dc60c6850c3f61affc0dfa28
+AUX pydoc.init 711 SHA256 bf42ce358c4505bb9c9923758cf7c237113b5465778fe8d0d9781625586003fd SHA512 328597e0f7594dcc1d929dcf15feb39e08a0f85067b226140219c03c2f0a0a5fa9518f26d52723aeb77e36eb5e46d54b5ee4ddbcfc52aa81540a738c49c03b73 WHIRLPOOL 846c7d90fc4b7b74d65c6019ea8e7c9f0d2efb0b6cad5b91d53b5b7bda509f3b625fb30eb27ea59cacf6233378d800c35375108762ba82fb4c2155f2dbf08f13
 AUX python-2.7-issue16248.patch 735 SHA256 ed137a0ab513e6d9c910e37f637aef2d58fb730070e447572f39d46d9cc99568 SHA512 da00f8571741d4cfb529b9db875b5d831d5d8e43fdc464bc43adee046f208165ab6b13d671bc90be988b1099afeac4fc0e7ba7fa473ff74a9ec7731da89e11a9 WHIRLPOOL ad770b848666efb5cc3b8c07a530f2a9aaca683f4b447c2d835e39be59a5dde35a28ab8cdb278ecf456e15e57b7401ff83fb04ac71bd8d80abc19d45beb84d62
 AUX python-2.7-issue18851.patch 11805 SHA256 4ecff8db20cdc4d9b0692a126859c318a9ba20bf1eff6e633c964871b2410d66 SHA512 b1eeec1451d011f37c65676819bf8391b9657d93a0b9f03d0db09956ef052fa3f2d922d1d5fc3c69567f549aa86f65a06670dcf3ead8300c0ac97651f9a503cd WHIRLPOOL b4b51d590175959df1f8373ff86343618b4474ea9afc2ef9360c680c986f30fa8f432eeb076de676cb87052cc6453a2b613dfaab51ab1ec5945a7c7c496a4f9f
 AUX python-2.7.5-library-path.patch 991 SHA256 ff7a4a1846ebcadc2dbf979ea619072caac22e47909fe188fc4b6becce6ea2eb SHA512 74916d541eb38c526dc1243fe5e5a9de3a7875f02c53e5f49e60182ba042de2f15514364e7fbd821146dcf92db2bba88d8a9f46d4c71237b73fd39cbabf93d85 WHIRLPOOL 62bb1c85941ccaac7ca6f6fb2d93dc27f206cf9f815b90ef1f89748dfdd1d38deda9f6bf7eb2ce9fd8635d1a77576819192e8049ec5de52fdeb9f981dfb32f9f
@@ -36,23 +36,23 @@ EBUILD python-3.2.5-r6.ebuild 11164 SHA256 7fbf0853d0e5449659340216a0c2d49e6e808
 EBUILD python-3.3.5-r1.ebuild 9523 SHA256 27d6d0444e6b948b49e5438f53aaa0796a9c785096ea63cbe9b4788745077cb1 SHA512 edacf0952c26ca36e754c03a292068554bf1a77c0dab7317eaf0f92ec6fd7e5784072f74d446723d12897d6b464fb275d6884474e9e47d11ed50665873fd154f WHIRLPOOL 34e35e62843e9d2d770fccf9439c23ffbda15bebc9dcb6d2665a46d7f6f27f6b5522483faf74657b4c311b310d3c45ded9d9a60ea9c5b8c1588fc9512f5d9066
 EBUILD python-3.4.0.ebuild 9308 SHA256 4af07645d7b8ab88742c10332fd1e16649c25abfb38638db3060ae087c9f1876 SHA512 a6c94c99a019f9bf68f69ec3ebea041a42cd833a1a7e1fe63bcc4756cd81184e895ccd120ba2d8adfd8158428a82e660132f6e5fdab70592c19eedad9557b366 WHIRLPOOL c6bfda5a4022ee5fb901ba376299b3c809b78a40a917feea5acf29e241c70e71d3fc801ee34b2a6d187257886f7aeb5ef77213d4403ad83185763e0c8ac13ef9
 EBUILD python-3.4.1.ebuild 9235 SHA256 030f2e5b39180afa742ccec4d09ce374d32c30e9e96e8effa94c5269e01e0521 SHA512 1c79f202f31c1041fe685f6f7d9f570e612272b9b4a0ffee687240a7730134b66eb40ae620e6c9b9a33fa870b03083af5459442b9a4e8b7e1bf0a1c63b658c9d WHIRLPOOL 2f28b48824952aafe2bd5d8775b9b8f4d25b932be2509621b82a473fc6d6218fafea14f800f7c2069dab34fa3ce382e4904a62a2434709f09eb62c780b21998f
-MISC ChangeLog 36755 SHA256 0ea62bd1fb9bb897494d91c3aac44888d3bcb7023cc70cec031bffeb201ec65b SHA512 caef4f976905bedaf555a34badb7ab1081eea16002aae5dbdafbd37d19d9021db0239a2ef6d9d82cd238a35ec62857f41d8d250d4c22b94297b94903c19ebdcd WHIRLPOOL c33f637d54158778b2fa9edc310a159f800bb77a1192d2985739f7a45534f15187b4e681cd08fda79270575f4ecc1571319ecab651ae026cca1577ed47d8e7a1
+MISC ChangeLog 36889 SHA256 1e7cdceaaa572c9f91fefbcd62ea4f16ed14789557c8ea8747cf9978ce6fe528 SHA512 fe6650ed18ba6c38747c20480e65e3de1b8c4f6cceb9019f0749828d1a4dd8766ab3fc31ac194affb7fd54693f03c3bc2b72810633f5600aca4bfa314642e0aa WHIRLPOOL 68e56220135ed1792bb0fc4f15e6a166a6f7589f91a412116dd826ef79f50583bbb0e6ae4931a6d4b06b4c4c1dc981de3bb3681a8742482a980e3ddd50143a53
 MISC ChangeLog-2011 100599 SHA256 23129cb47321b2a6b1cb9323f1815d0cd11d6f30c3893908ed51575c270a0cc8 SHA512 4181ba9d965139ba58218da5b960c87b7a611b27606a1ab1ce1b4c3c9255b4e0e2947307cbfffc531f0f8b6b545ee11e083fcb29dc7b2b7ba31c6bb40b8ab128 WHIRLPOOL 4ceebb6a6ed58b906d3a7331795748ac6e4fe2e1401bcccae9024a8e81e2c444aebc5fec610398cfe6002354ad3b10487484598da5091867874727f07e239c56
 MISC metadata.xml 661 SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 SHA512 871989a29417ce20d95da950fa385f1a958139de7b1567beb9cda28a1217901243cd9d25235fe3c7b0e43a82176d72286e31e4e97310b26488d2a3252ef3a8a0 WHIRLPOOL b694b1b4270ba15640d04a3b0b26a08575ea4afc9be256717f7f3b1768d75da9f71ceca6afd2f69971906227d5ba42263d2df2fc9387441aa240222d39fd094e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUOkMmAAoJELp701BxlEWf6oQP/iYCd618U262jwwTdtcIpqO7
-TaPmEjUGUM/uJk8Cg8hUMvbM8tz1RJdjKjLCfGnG12MaKoSTIWRLce5+92MD6vSo
-+LbNG+SU5jhkVEr6Gk6b3A7MJ1Ra11SOoelZX1spvmM72CN8kyDeiR1IumEpVmJ2
-unRR/sPO+6yrdxJE8iinkdEZ0Q5Sgeem3L8JjGPog38RbadIgfeGkNZnHn5407C+
-LFuyHFvfAoWSWRkIGPLAzhlPQCqR1IStJpiAyGiYQ7hHKjDwUmy2gM/BqydPkHik
-ybAmM3Rdc1HooXErS9pAifatQnZgfNCybpc4CsIVagPv1oeZaLxJBKiQ4uvtG2El
-SGsxpQ10ecOzj8utxhe/ASYJciI6b8xlZdv+GXJTt466qMYFu8fmMFHJr1d4QrXD
-CcIM/YpcGdmnZcMNbvlAJoxjiKiqppnf42V8f/x63Ze+ddxRFoJ/8CLABf+JFfFp
-3XRh+HfkrQAZQviZp/m0cm+PfgnKZM/dnWcBEUOdCJFoQwzUr65M6XVcXsU9XfQT
-a2RY71K9JdYSZM5uRg1fiaXt0bs59mDwLMCyzQVawDuGuAqxFpZC6kSD8wE7pxpk
-zKraE+7Z4AhV+BS0V3Qoc4sPJpEvuCl1jT7JwE12xB10e3qT+hVa4AGRlniTdrVX
-AxN4E65Qr8U7O9q3KzgT
-=8K4P
+iQIcBAEBCAAGBQJUOnadAAoJEJ+WuSkwOAOBSuoQAK+EFKpGDzN2RCUF0MQY/9NY
+jSurpnl5n9e2tzhDKXmJa1XV5DCoL9Pi9HxxxGEVFoBNcqc4hrZSEunJtd+hjSjq
+8dpxbBJKqVe9dQVIsDf2c6y1mC9BU2ECNB+VwsfHavWZbQ4Lw2Wl3AzCdaBot+i1
+G5bXma3mcEn98KJqG06h4NqTCeG6AxH4hjv9qynnOOefxJyYKzLWvPamyNKlPbtZ
+xbZFj8mhy0Ajcfa+tO2eqZpYbmVsVLc90voMWHMAO8bpzeivfsXMmhCEn+DYkCRt
+IjJ6VMdrEA9STGgvtKTHXwsoWZ3UxvwkFM6zma46xq/SDmRK6fDmwXDQEH2s6e0n
+XGoaBWQND6WpQvXS/0gWgc5OOLgDEIhHnMne9xgd0Waztsn3Prj0SzuB7D2MIVAF
+B8ZytWszKN5xXHtk6qSL341M3O7hidrFtLmtJ5hZ/KiymlycKoEWDUzZb19w1F4y
+g5kM7kYxLGTqSRttFMf0Vk+4yPzbdWtAX9rrMnLAcxwtMkHRUYdDJLFSXiJlr/Jq
+/RsSqiodXINxzYAYptAj8fwD4La5QKJhcCStQT+BGnB9y/Kjrn+0OwfocgtI07dK
+g/Dlu5M7SKr8Htp2CTlTGWms1ia2GsQmABfoNg0Zy9gOnP5mFbje/H+g0BRLwhmT
+uyulFwzhhknkZybUJi/J
+=1RYB
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/pydoc.init b/dev-lang/python/files/pydoc.init
index 0d62dfcf02c3..3f02ae9edab5 100755
--- a/dev-lang/python/files/pydoc.init
+++ b/dev-lang/python/files/pydoc.init
@@ -1,11 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Technologies, Inc.
+# Copyright 1999-2014 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public Licence v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.init,v 1.4 2011/10/27 13:56:55 neurogeek Exp $
-
-depend() {
-	need net
-}
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.init,v 1.5 2014/10/12 12:37:07 djc Exp $
 
 start() {
 	local pydoc_port="${@PYDOC_PORT_VARIABLE@-${PYDOC_PORT}}"