diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-05-17 15:14:43 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-05-17 15:14:43 +0000 |
commit | 52e35de64f06d22632d8df69a88dc0adab4ea88e (patch) | |
tree | 6673019b2a0b602a88cb8641eb16c9770ebd69c4 /dev-lang/python | |
parent | Delete older ebuilds. (diff) | |
download | historical-52e35de64f06d22632d8df69a88dc0adab4ea88e.tar.gz historical-52e35de64f06d22632d8df69a88dc0adab4ea88e.tar.bz2 historical-52e35de64f06d22632d8df69a88dc0adab4ea88e.zip |
Use target pydoc script in pydoc init.d script (bug #361867).
Package-Manager: portage-2.2.0_alpha33_p36/cvs/Linux x86_64
Diffstat (limited to 'dev-lang/python')
-rw-r--r-- | dev-lang/python/ChangeLog | 8 | ||||
-rw-r--r-- | dev-lang/python/Manifest | 41 | ||||
-rwxr-xr-x | dev-lang/python/files/pydoc.init | 11 | ||||
-rw-r--r-- | dev-lang/python/python-2.4.6.ebuild | 5 | ||||
-rw-r--r-- | dev-lang/python/python-2.5.4-r4.ebuild | 5 | ||||
-rw-r--r-- | dev-lang/python/python-2.6.5-r3.ebuild | 5 | ||||
-rw-r--r-- | dev-lang/python/python-2.6.6-r2.ebuild | 5 | ||||
-rw-r--r-- | dev-lang/python/python-2.7.1-r1.ebuild | 5 | ||||
-rw-r--r-- | dev-lang/python/python-3.1.3-r1.ebuild | 5 | ||||
-rw-r--r-- | dev-lang/python/python-3.2.ebuild | 5 |
10 files changed, 57 insertions, 38 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 8b8602202513..0992bb79336d 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/python # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.534 2011/04/22 18:18:09 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.535 2011/05/17 15:14:43 arfrever Exp $ + + 17 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.5-r3.ebuild, + python-2.6.6-r2.ebuild, python-2.7.1-r1.ebuild, python-3.1.3-r1.ebuild, + python-3.2.ebuild, files/pydoc.init: + Use target pydoc script in pydoc init.d script (bug #361867). 22 Apr 2011; Raúl Porcel <armin76@gentoo.org> python-2.7.1-r1.ebuild: alpha/ia64/m68k/s390/sh stable wrt #358717 diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 2456a8ef83c8..b7500bb7dc03 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -2,7 +2,7 @@ Hash: SHA1 AUX pydoc.conf 330 RMD160 0cd619ec251597e0fcadc05bfd249915e73baa17 SHA1 a56100d45378c554b9822f6ed512a6cb7841ef50 SHA256 a45ebba2de5f2b0e963db4101507203d095c5ff667ae5002c4897a9c87786fa1 -AUX pydoc.init 666 RMD160 11caf3a78bce4cdaebacaf21eaf26cc1ce30282e SHA1 88c5cb6d5bf737c74e1be93118cf157630af9ad7 SHA256 0d25c71232b74adb87dc709cc7cd8f8b13c452c0fe82fa33808f907f7a96d628 +AUX pydoc.init 679 RMD160 79ccfb6179974f4a4f35238c122b9640753e7e43 SHA1 e7bb706ae4ef94d28874677c4f92b82d08d7999a SHA256 8f6c1753a28462fa61d22a927debed7ec3994b3617d728932357e739ede6516f AUX python-2.4.4-test-cross.patch 977 RMD160 8fdcd45dc202993988f7a1c2b3d918068883b99e SHA1 96f25777150ba05765282a43f08da6b6fab3cb73 SHA256 ff2a131776d560d188ec5069e17fea3eb09c26fdd02124ae5ff34d791c9fd9f6 AUX python-2.5-cross-printf.patch 903 RMD160 8dc0ee148120aaf7667624bdb5574bb6af5d2a00 SHA1 596e05be8cde43e4cdd87c8ed06ebb40828f7cea SHA256 1e91e5123d74d89aa8fc9dc60d98516b785f851e43da9b634ae535130e24e780 AUX python-2.6-chflags-cross.patch 1716 RMD160 b0ec772a41a24d51f4c7430b19bcc6251cd6be87 SHA1 4745cd53cef503c41c50573ad97f40eb89fd4bcd SHA256 7c36689db47720052069725036983c2fb6959f425e3777aae55976b2788d463f @@ -13,33 +13,38 @@ DIST Python-2.5.4.tar.bz2 9821313 RMD160 3a76c83464c3b1c38a60351ab054e33ac719566 DIST Python-2.6.5.tar.bz2 11095581 RMD160 909c6a13749396f2b19fed51821d3e2577b2833b SHA1 24c94f5428a8c94c9d0b316e3019fee721fdb5d1 SHA256 62da62eb685621ede2be1275f11b89fa0e0be578db8daa5320d0a7855c0a9ebc DIST Python-2.6.6.tar.bz2 11080872 RMD160 2d63f4f0ad3c124a8e62215ca94bd0231350e912 SHA1 a1daf2c2c7cffe0939c015260447572fe75c7e50 SHA256 134c5e0736bae2e5570d0b915693374f11108ded63c35a23a35d282737d2ce83 DIST Python-2.7.1.tar.bz2 11722546 RMD160 3ce59305f6cd3fb320a53771d0ea01ec0687005f SHA1 fbe1894322ff91b80726e269c97454f4129fc2a3 SHA256 80e387bcf57eae8ce26726753584fd63e060ec11682d1145af921e85fd612292 -DIST Python-3.1.2.tar.bz2 9719769 RMD160 94b75a68c9d9f1c0206f112cae6eb9db79bda901 SHA1 eecbddf020a1400f3201f049caa3be7e9d403d0c SHA256 23a43b5ffffd6b86adebac805c8230d7ad490009e08b8d02806d90c8f01bee28 DIST Python-3.1.3.tar.bz2 9875464 RMD160 730f3b8eb1a41f1b7c469fc81be734bb802cb9f9 SHA1 aeadf1eb7f450aab77a8972c042bc5f49bcf2288 SHA256 77f6f41a51be4ca85d83670405c8281dd1237bb00d8be8a7560cb3ccdf5558cb DIST Python-3.2.tar.xz 8877208 RMD160 25e958dbb17223d6c2060520e0921e6d9c9f7906 SHA1 55a3a9d39f31563370d0c494373bb6d38e4d1a00 SHA256 38a3de4ed38e92e1c3dd81e230caf6569d41bf8df6537d099541a6d3dca1b132 DIST python-gentoo-patches-2.4.6.tar.bz2 10983 RMD160 c06dc76edec86d708a0c0e37126ae50f49f61bd3 SHA1 bbc04083fe74cff8c723c5c3cab70b1b814c987f SHA256 0508a66408f218c655823303833599344d2edeec1ffc683c6ada3fc33731590d DIST python-gentoo-patches-2.5.4-r3.tar.bz2 19473 RMD160 c3a807693103f9e26c3cce4add5a1f3d975ef216 SHA1 c6170894865ee8aac8c813916c21a0d0458691bc SHA256 03f5bdb0a4ac8eb498a90c5cd444a5c76ed7e79bff5e8dca00efe77cf80c6391 DIST python-gentoo-patches-2.6.5-r5.tar.bz2 1482491 RMD160 a7978912b8598a589a82746642fa5b676369c599 SHA1 26c983e79ac32b63a3bc6e411d96b9233524733b SHA256 6cb8cf0e1418cad035a243c08dfeee2e9395397dda74ada49667b3eba63bb76c -DIST python-gentoo-patches-2.6.6-r1.tar.bz2 15729 RMD160 9f0e1f5ead8b1ff1a3a3aedf2fb70d10fe4c6c3b SHA1 2a1fd29501c0f5a424e670e5d6a60c67007f23e7 SHA256 17d7fd6c4de686d41403322bc26bd306607f03843c4f9ab6365a985ded4f4ebb DIST python-gentoo-patches-2.6.6-r2.tar.bz2 16277 RMD160 432a63f7313e98a99cd300ee3c1f905d343c401e SHA1 30f5ba4e5eb25833331f193966c3e00be4470cf9 SHA256 2754d2aa27086efccc2de73442cf0022f3f9768431b10ff72c9181c4ddd95428 DIST python-gentoo-patches-2.7.1-r1.tar.bz2 13384 RMD160 d79de2520244a8b9c5de61c9bc591a4e538a7736 SHA1 72a0b75ab891ee20041a65dc2642ee6cf40642be SHA256 cc9b4239a3276c6fd447e3bb3ab8a2f94fbc49e08bb5b20ba5f05b4becda2bf8 -DIST python-gentoo-patches-3.1.2-r6.tar.bz2 1285912 RMD160 a525679255b2dcb0a65d00792a8c247742e94923 SHA1 7ab91a40074f33b08b805b2cce54dc32c1f596b1 SHA256 45a4368f537b2d92ead296dd600207313a20a8027dcaeaa2a0c71dcf8ecb9899 DIST python-gentoo-patches-3.1.3-r1.tar.bz2 13730 RMD160 73f922d850e464e589c7a3cfb8f755d36167d156 SHA1 9228b63c980b80dd7e8dd9e0276c29af18692e33 SHA256 f23056436b298ed0ff9823b52902aaaa63eae0c4585a4a19e47571685127631e DIST python-gentoo-patches-3.2.tar.bz2 11826 RMD160 8d450939f3f2f7f5c779b8701097fcf92909c36b SHA1 bdc922a4b94bbb616dbf702e913f74984ad8bda5 SHA256 43799206ed8c81936e3b3e68e8c562334b346652d30383c5b7b93fe9741ad0db -EBUILD python-2.4.6.ebuild 9220 RMD160 1d8d11abfdec1a1fe9aa1f2a156e88aa5b2ccd8c SHA1 ff3519d9e343158b3c28798c92cc6b9cff6e1677 SHA256 059c2c520a908888f8073d9cdd955138c119232969018b07bdb5f7df0e496927 -EBUILD python-2.5.4-r4.ebuild 9570 RMD160 2728a627e55360fefeabd135740e64214522f94a SHA1 00d1bf2ae833c7936ab6b55b3850d17e0a69b4b1 SHA256 4b2dc5a62b416f13d207994066faba6d32727dba731cb5cee2c88e82b0098f7b -EBUILD python-2.6.5-r3.ebuild 9366 RMD160 3a22472409d3121e56b833d5ddb506fe3a5466d3 SHA1 4028e186dda3236c4d3d64afdd420397f03bb6b6 SHA256 5524ed7a4caf7146caecf506e5548557dcb35b2cd37ad4abc833fac64b3c9cac -EBUILD python-2.6.6-r1.ebuild 9547 RMD160 c0d9b794307c5cfd9f4196afc0a2c7f1c8afffdf SHA1 d910e739e5480f1628bd94bf85e4ac150fe87b7d SHA256 9f82696fd40b199b8e2851c98eae667f0691ad88a0743bfa472ff94c401aed85 -EBUILD python-2.6.6-r2.ebuild 10456 RMD160 02a12fb212d839c28a6ff3fd3f81e5cfc14156e4 SHA1 7717ff2bda22ce5ad461b7ea9a3f9c7824215c22 SHA256 1b9d4499b96cbdf103b28d45ffca871494c5d587810eda87bfe910fe0248773e -EBUILD python-2.7.1-r1.ebuild 11030 RMD160 e787947401e4ab6648897cbdb2fd3a3658b24000 SHA1 9e28380991d7d0baad54169cbcd273544bafaf08 SHA256 f70d95436d44828984d600f1b854e4710f065234d7fb1b6a6552e7f77eeaa836 -EBUILD python-3.1.2-r4.ebuild 9457 RMD160 ce8a7df4650c8474c79e5d53dc4c0fff729584b6 SHA1 925922c06f195615f6ed82d593004a0a341188a7 SHA256 230aca0a26b610ff572a25ae3abc1ec7bbddc7a4997df7811b1b35afb09a611f -EBUILD python-3.1.3-r1.ebuild 9704 RMD160 c5fa27effa63b0eaf876e3222d26c4532c7191b5 SHA1 fce5eea37742e59a3c9087a22764607fe5780c19 SHA256 00cf56abd74cc3acf869cb86c7b9fe78f9286518cc09c1b63b97e86f83d8f125 -EBUILD python-3.2.ebuild 10030 RMD160 932fe44751adb15bf1999b21930107c9fb048676 SHA1 e6815b73b6d50a350c62d5bc265559f3884151d0 SHA256 98fb0d66cce65f7f4a13973b7c6281ace75ceb3c6831e3a108e804c63d4ae9e5 -MISC ChangeLog 95086 RMD160 f3fa6db0baa51acfe385725e0643a0c04aa2c7a7 SHA1 8aa67decac02db447c51390b85ff22c5e11a5444 SHA256 b41a241e351121c87d38826e205087f3c45845e30a9db7a8d8711a08a88967c8 +EBUILD python-2.4.6.ebuild 9314 RMD160 de356959ee97e81f345a595066d6400c7a505461 SHA1 b4c771a3876343087928d8d7a786fe017ea40189 SHA256 f36f2dc2cc7fee7fdc03338c9b1a98134e326cb7149eab030eb7632bf64f80a7 +EBUILD python-2.5.4-r4.ebuild 9664 RMD160 6da8e6907b3c0675a560952cc45372ec56f419fd SHA1 7d43770dbeabbd0a19bc006bd2bf5187bf84ca68 SHA256 fda530914fba4f8bb4010e6b84c3feee3bf9d5654a808e66c7541038c1d972a2 +EBUILD python-2.6.5-r3.ebuild 9460 RMD160 97f44070c60fb4ca097ece0132adc845616f4595 SHA1 7ccce712ce3c94ced869d84cafe30adbbce4c6aa SHA256 5612199d7112e2d7e59f00981dbdf038d57d8abda2b373ca56aa158bf14e6f1b +EBUILD python-2.6.6-r2.ebuild 10546 RMD160 48acd2266821d2475a87e60ceb327910f55c3637 SHA1 31bd4e799a77eee7d27f9ce2bad8f7a2656f8021 SHA256 806e1514641dc2a60ce3e0a959bf126501bb763895873c01f8f51494326b9a6c +EBUILD python-2.7.1-r1.ebuild 11120 RMD160 31a17a4a78201fc4991453d4790acb90e0ffe7b2 SHA1 83aeceed035031758547a668ca9543e94d1cc2f5 SHA256 097372f26e0410438e1f511b6c13678ed16ae68b3d0779a1f848630813ca2dcf +EBUILD python-3.1.3-r1.ebuild 9798 RMD160 20b97be4899f2adba70e79d24134d11e31d1c513 SHA1 b61c32e968662d7c2984221ea48146b020d56498 SHA256 a2680419e5280a2e354a4491bd8a95094675473cf31ae8a7c07f6847fcb16703 +EBUILD python-3.2.ebuild 10124 RMD160 cb6ab202ac3be39cb7ef8d28cc7b8b7203358d2d SHA1 56ae059afb4685c316847c32eff1a8a2769e02ab SHA256 66509e8c80ab3d2e1a004d311fdf097b6eff21c1a9d659e0c31df73f6c135ebc +MISC ChangeLog 95409 RMD160 13ceae8b7654dd5db4a59b84c2ba9cb080bfc27c SHA1 35f4739397915d3fab61ba7c3cbda5f6cce3cca2 SHA256 517e8c1c7dfc8a024ba338a48bc973849b12e5d50918c0af4f3c68a7e32ff45b MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2xxmcACgkQuQc30/atMkCQMACgwEldZNNJrrCSapNfrShi5KGG -3I4AnRpwTG2F0WF96vfByKjDS/olCeY+ -=pPY+ +iQIcBAEBAgAGBQJN0pD+AAoJEE70JXb4HvNVQ3wP/2ohuTnNbsITtzLH+FBr2wY4 +yI3K9EbzkCLxJaieLIVKE4/eu1G5ojpannkVT6UImc3qhmrmEKI+AMA+By4zr3O9 +fdrbHYC6PbnmZ7vzJGB9h0k/OaHyQyGtGABKxx43GFWZ++RRtMWx7Gf6ZgdOx/Zx +u03Zec9t+6LdZ7fQnaRZB9LVPg4/DnEAPE+oStjpTCDXzM5/yAd5F/lcwctd14td +KJAC+j2Km04rtp35xAIB1rbh+gxooGMD3IgoMmz7fmAna6SxJwp1iVXMFYucVs/5 +aEyIJvl3bNeF7A12Go/4HuMzKBF7J/4Aq/IAY5Wk0TvGpmkEAwc3V9CCrd0zBD2C +7//9Re3u2UOz6fJj9ImPnpdHXVhYSNY51ZMOlLD1o6FjUhLQsmk1BwuMcpDOqSqR +naVDMBzcWXnAsES9h07V5fQQjvXD8YiZhpHg9Iu62TxG1m2anaJK5SQF/U+Exifq +ivSzhp2gVrkwXijBE07Gpk+kiEnrtpcOEaqU9aj7+tjgyMY1IlMnG5jW3K75RCGi +WGlP4DvlyW2qs1vZQuiGtaqAZIJiC+rwYhAhRAddpKe+zdKgKZkujWgnKFIAbsTm +h/9SQxmtlWK8Z6PuGAPour47tgr07o4NdSe1Y1EowOUJOI8l3kQwGYwdXxh1tCVh +rIMDWaVfdpJTNc1buUgC +=EYh0 -----END PGP SIGNATURE----- diff --git a/dev-lang/python/files/pydoc.init b/dev-lang/python/files/pydoc.init index 19b63e31dff3..f67371d8d9a8 100755 --- a/dev-lang/python/files/pydoc.init +++ b/dev-lang/python/files/pydoc.init @@ -1,21 +1,22 @@ #!/sbin/runscript -# Copyright 1999-2008 Gentoo Technologies, Inc. +# Copyright 1999-2011 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.2 2008/06/30 15:10:28 hawking Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.init,v 1.3 2011/05/17 15:14:43 arfrever Exp $ depend() { need net } start() { - if [ -z $PYDOC_PORT ] ; then + if [ -z "${PYDOC_PORT}" ]; then eerror "Port not set" return 1 fi - ebegin "Starting pydoc server on port $PYDOC_PORT" + + ebegin "Starting pydoc server on port ${PYDOC_PORT}" start-stop-daemon --start --background --make-pidfile \ --pidfile /var/run/pydoc.pid \ - --startas /usr/bin/pydoc -- -p $PYDOC_PORT + --startas /usr/bin/@PYDOC@ -- -p "${PYDOC_PORT}" eend $? } diff --git a/dev-lang/python/python-2.4.6.ebuild b/dev-lang/python/python-2.4.6.ebuild index a8ecdc02c493..bce28db5be9f 100644 --- a/dev-lang/python/python-2.4.6.ebuild +++ b/dev-lang/python/python-2.4.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.46 2011/04/05 06:01:55 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.47 2011/05/17 15:14:43 arfrever Exp $ EAPI="1" @@ -255,8 +255,9 @@ src_install() { doins -r "${S}/Tools" || die "doins failed" fi - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" + sed -e "s:@PYDOC@:pydoc${SLOT}:" -i "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" } pkg_preinst() { diff --git a/dev-lang/python/python-2.5.4-r4.ebuild b/dev-lang/python/python-2.5.4-r4.ebuild index 23b0bc9f1934..88b3f866eb84 100644 --- a/dev-lang/python/python-2.5.4-r4.ebuild +++ b/dev-lang/python/python-2.5.4-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.28 2011/04/05 06:01:55 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.29 2011/05/17 15:14:43 arfrever Exp $ EAPI="1" @@ -270,8 +270,9 @@ src_install() { doins -r "${S}/Tools" || die "doins failed" fi - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" + sed -e "s:@PYDOC@:pydoc${SLOT}:" -i "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" } pkg_preinst() { diff --git a/dev-lang/python/python-2.6.5-r3.ebuild b/dev-lang/python/python-2.6.5-r3.ebuild index d50b60fbe754..a10641524b21 100644 --- a/dev-lang/python/python-2.6.5-r3.ebuild +++ b/dev-lang/python/python-2.6.5-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r3.ebuild,v 1.13 2011/04/05 06:01:55 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r3.ebuild,v 1.14 2011/05/17 15:14:43 arfrever Exp $ EAPI="2" @@ -259,8 +259,9 @@ src_install() { doins -r "${S}/Tools" || die "doins failed" fi - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" + sed -e "s:@PYDOC@:pydoc${SLOT}:" -i "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" # Do not install empty directory. rmdir "${ED}$(python_get_libdir)/lib-old" diff --git a/dev-lang/python/python-2.6.6-r2.ebuild b/dev-lang/python/python-2.6.6-r2.ebuild index 0985977fe614..3da872fdeec1 100644 --- a/dev-lang/python/python-2.6.6-r2.ebuild +++ b/dev-lang/python/python-2.6.6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r2.ebuild,v 1.9 2011/04/13 15:09:24 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r2.ebuild,v 1.10 2011/05/17 15:14:43 arfrever Exp $ EAPI="2" WANT_AUTOMAKE="none" @@ -290,8 +290,9 @@ src_install() { doins -r "${S}/Tools" || die "doins failed" fi - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" + sed -e "s:@PYDOC@:pydoc${SLOT}:" -i "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" # Do not install empty directory. rmdir "${ED}$(python_get_libdir)/lib-old" diff --git a/dev-lang/python/python-2.7.1-r1.ebuild b/dev-lang/python/python-2.7.1-r1.ebuild index 02bb7b163281..dddafe504735 100644 --- a/dev-lang/python/python-2.7.1-r1.ebuild +++ b/dev-lang/python/python-2.7.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.1-r1.ebuild,v 1.11 2011/04/22 18:18:09 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.1-r1.ebuild,v 1.12 2011/05/17 15:14:43 arfrever Exp $ EAPI="2" WANT_AUTOMAKE="none" @@ -312,8 +312,9 @@ src_install() { doins -r "${S}/Tools" || die "doins failed" fi - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" + sed -e "s:@PYDOC@:pydoc${SLOT}:" -i "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" # Do not install empty directory. rmdir "${ED}$(python_get_libdir)/lib-old" diff --git a/dev-lang/python/python-3.1.3-r1.ebuild b/dev-lang/python/python-3.1.3-r1.ebuild index 7dedceade501..bd27fe0b051f 100644 --- a/dev-lang/python/python-3.1.3-r1.ebuild +++ b/dev-lang/python/python-3.1.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.3-r1.ebuild,v 1.7 2011/04/05 06:01:55 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.3-r1.ebuild,v 1.8 2011/05/17 15:14:43 arfrever Exp $ EAPI="3" WANT_AUTOMAKE="none" @@ -283,8 +283,9 @@ src_install() { doins -r "${S}/Tools" || die "doins failed" fi - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" + sed -e "s:@PYDOC@:pydoc${SLOT}:" -i "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" } pkg_preinst() { diff --git a/dev-lang/python/python-3.2.ebuild b/dev-lang/python/python-3.2.ebuild index 8380ebab5e99..cfc7f70cbaf4 100644 --- a/dev-lang/python/python-3.2.ebuild +++ b/dev-lang/python/python-3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.ebuild,v 1.3 2011/04/05 06:01:55 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.ebuild,v 1.4 2011/05/17 15:14:43 arfrever Exp $ EAPI="3" WANT_AUTOMAKE="none" @@ -291,8 +291,9 @@ src_install() { doins -r "${S}/Tools" || die "doins failed" fi - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" + newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" + sed -e "s:@PYDOC@:pydoc${SLOT}:" -i "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" } pkg_preinst() { |