Added init.d/conf.d scripts for the integrated pydoc webserver (bug #59903, thanks to compnerd).

Package-Manager: portage-2.1.4.4
RepoMan-Options: --force

6 files changed, 53 insertions, 16 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index a21960228be8..fd563002a011 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.300 2008/02/16 16:27:22 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.301 2008/03/01 13:38:51 dev-zero Exp $
+
+  01 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> +files/pydoc.conf,
+  +files/pydoc.init, python-2.4.4-r9.ebuild, python-2.5.1-r5.ebuild:
+  Added init.d/conf.d scripts for the integrated pydoc webserver (bug #59903,
+  thanks to compnerd).
 
 *python-2.4.4-r9 (16 Feb 2008)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 472e5dc71de9..72d7c7ca3dc1 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,8 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX depreorder-topsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d
 AUX depreorder.py 2235 RMD160 a6da5f336bdf8c370861c7922a5fa79ce4ab89cb SHA1 3b8590d7fbece2367088c646a792a9618d786dec SHA256 93920120e596f34e4222e8686e6283b03cdd517f89f2dba3eda90d79fa016aba
+AUX pydoc.conf 234 RMD160 33e7decd0ca9a9c4a9f94ef9773f7e9c1668b9fb SHA1 fcfc1a47952dd424f4a1187ef8a6ae9ff8d460c8 SHA256 ded00287fe0ab41e02e3dd52b1818aeea669fc3d94d179cda677c064f47b1098
+AUX pydoc.init 569 RMD160 e4d15960cf48009f447055f1012e83dfa2809f3f SHA1 f9129e5d62a72a656581b624fb475678141b96bb SHA256 0aadf5e41cea02d56f37ace173cd28937081d519d367a777cb747a22ab5e1c29
 AUX python-2.4.2-gentoo_obsd-r1.patch 1630 RMD160 77c7c13be17f7dcf1abccab2a0fb5818f4f7c261 SHA1 ba795d0aeba9986ed6077217848fd8ba1eb0d39c SHA256 b96f687a18cdfd75090a7401298568ee5819046a54eb58c1527126dd36596d47
 AUX python-2.4.2-gentoo_obsd.patch 1554 RMD160 c93e34df155440e68e7db283d709c3ef301933d2 SHA1 83ef3e0f43f2d6100d2416f5c47776af5f643fab SHA256 89a870d045246c66a67e7931afd38260c8b1e3d0c8f2db9b73e36cf014e98dee
 AUX python-2.4.4-test-cross.patch 977 RMD160 8fdcd45dc202993988f7a1c2b3d918068883b99e SHA1 96f25777150ba05765282a43f08da6b6fab3cb73 SHA256 ff2a131776d560d188ec5069e17fea3eb09c26fdd02124ae5ff34d791c9fd9f6
@@ -40,17 +39,10 @@ EBUILD python-2.4.4-r5.ebuild 10332 RMD160 b0a00a167b1385aa4b9472e6fa8245aee01a5
 EBUILD python-2.4.4-r6.ebuild 10379 RMD160 23414e397b35039af912849f6a366c16ed092390 SHA1 b1ba0c7cf6d9e2533865b9ee610b324bafbe2aed SHA256 027565f6f2fbf90d38fdc5dc240ebae8e7cba8f44d8307df8c05c0f1b4f70d36
 EBUILD python-2.4.4-r7.ebuild 10471 RMD160 ddb7e39a115126d1679dff5766032f66b4e2e596 SHA1 5d3b1de3f1f2428643361c6890a3c250b0a49c1d SHA256 f88229dbde6d128f8ac4fd7c44aa48157c141ee8b014c096b52d564e9aedb7d8
 EBUILD python-2.4.4-r8.ebuild 10656 RMD160 c8ba17c06ea8053902a3be590951a3da0404e47f SHA1 9c4e3f7d05998f26414e2bc04a4652eda7bdff8c SHA256 c9990f1babde1186d4dca56a1b994739909b411daa237169dbd943b9211c7dac
-EBUILD python-2.4.4-r9.ebuild 10731 RMD160 24825340067c0d3b39d3fe70d48b56578b737014 SHA1 f1dd21bac1acc5b7281f8814bca4a948747e2db7 SHA256 ef30f043c2267a47cf3d65cb1c089daa05df5bd6b5a17b9b02832042de5e95fe
+EBUILD python-2.4.4-r9.ebuild 10817 RMD160 0d1cce5e6e6f99390590398a123d85477f52dd3a SHA1 6298d4fe85676cd58e2ad4666f91ae25c9533264 SHA256 ce6a7f33ee1357eeaa2d689a6434d718c37f7ce3df0d2cefbfc886514389de0c
 EBUILD python-2.5.1-r2.ebuild 10346 RMD160 e04f22c557c3fcb8e79955d39dda26a25e03f73b SHA1 bf59ae8a2b2fa07ce8713ca6c17b3915884f8760 SHA256 cde4a7ed6543798b727283e302653e2d8594d6b7491d52a3581b410ba40ba8bf
 EBUILD python-2.5.1-r3.ebuild 10348 RMD160 b312c9bbd10510721543d51cb9281dc2033845e7 SHA1 569b85a020bade1e35b849802aeeada337c63eee SHA256 6d281ff6cc64c1ccc861be3b6fae6be94c300a23827d7d4e30d91b71fc23dd11
 EBUILD python-2.5.1-r4.ebuild 10476 RMD160 1d74c53b21eb8242659bcf9d528e35401c303ed3 SHA1 a85d737e73d0bd177f69d6871c6d31d276584bc0 SHA256 dedc062353e2c359a3024410f1f86643f405a66bb27da626149bafdd1742c06a
-EBUILD python-2.5.1-r5.ebuild 10661 RMD160 c3171b93576aec797f00aa2927c39cf93660c9cd SHA1 00ec9f340ed64557321b03227ce95d480e57f660 SHA256 cdea8026c100726360e77684a551562e1575a8a1a193ba4d0bb9e40b7f90d962
-MISC ChangeLog 51535 RMD160 4edbf45566545802f75970e1082427f034dd1290 SHA1 6f96f7e3b841202438f78d6ed1a2c7ad0b205d69 SHA256 1ba52f25737259275f9a6e05b8ecf37df7ca4fdc8df465c626905a2f388f6863
+EBUILD python-2.5.1-r5.ebuild 10745 RMD160 a5f15bf2967056e11f8bdacc5fa72629aaffe1f4 SHA1 640cf1e171be8403e96ca3811292ca7dcdc50865 SHA256 188fb0119777bb48270c9a8af0b455d320b2bdf0bff01aa7b56ec37a9118f82a
+MISC ChangeLog 51781 RMD160 b91ee5cac8116d45abfac295930a64d488382789 SHA1 f540bc8a6985e19d87fd6a803a6c0bb4df11077c SHA256 270c5c43433e649f6d80c356217f3e3023827358223c221a450cedff77233f94
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHtw9MNQqtfCuFneMRAorxAJwOsW/lNEgzZka9YgDd601eFSKj5QCfQc+g
-h2rzzpk+ZuHkbMYl8MdUNvQ=
-=rE2j
------END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/pydoc.conf b/dev-lang/python/files/pydoc.conf
new file mode 100644
index 000000000000..ab4a821c8ec2
--- /dev/null
+++ b/dev-lang/python/files/pydoc.conf
@@ -0,0 +1,8 @@
+# /etc/init.d/pydoc.conf
+# $Header: 
+
+# This file contains the configuration information for pydoc's internal
+# webserver.  The variables should be rather self explanatory :-)
+
+# Default port for Python's pydoc server
+PYDOC_PORT=7464
diff --git a/dev-lang/python/files/pydoc.init b/dev-lang/python/files/pydoc.init
new file mode 100755
index 000000000000..8e436db3eec2
--- /dev/null
+++ b/dev-lang/python/files/pydoc.init
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public Licence v2
+# $Header:
+
+depend() {
+	need net
+}
+
+start() {
+	if [ -z $PYDOC_PORT ] ; then
+		eerror "Port not set"
+		return 1
+	fi
+	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
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping pydoc server"
+	start-stop-daemon --stop --quiet --pidfile /var/run/pydoc.pid
+	eend $?
+}
diff --git a/dev-lang/python/python-2.4.4-r9.ebuild b/dev-lang/python/python-2.4.4-r9.ebuild
index 378ca6621e02..e54eae8de881 100644
--- a/dev-lang/python/python-2.4.4-r9.ebuild
+++ b/dev-lang/python/python-2.4.4-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r9.ebuild,v 1.1 2008/02/16 16:27:22 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r9.ebuild,v 1.2 2008/03/01 13:38:51 dev-zero Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -225,6 +225,9 @@ src_install() {
 		mkdir -p "${D}"/usr/share/doc/${P}/examples
 		cp -r "${S}"/Tools "${D}"/usr/share/doc/${P}/examples
 	fi
+
+	newinitd "${FILESDIR}/pydoc.init" pydoc
+	newconfd "${FILESDIR}/pydoc.conf" pydoc
 }
 
 pkg_postrm() {
diff --git a/dev-lang/python/python-2.5.1-r5.ebuild b/dev-lang/python/python-2.5.1-r5.ebuild
index 4f5e9603b6db..7da638edb779 100644
--- a/dev-lang/python/python-2.5.1-r5.ebuild
+++ b/dev-lang/python/python-2.5.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.1-r5.ebuild,v 1.1 2008/01/07 17:40:51 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.1-r5.ebuild,v 1.2 2008/03/01 13:38:51 dev-zero Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -222,6 +222,9 @@ src_install() {
 		mkdir -p "${D}"/usr/share/doc/${P}/examples
 		cp -r "${S}"/Tools "${D}"/usr/share/doc/${P}/examples
 	fi
+
+	newinitd "${FILESDIR}/pydoc.init" pydoc
+	newconfd "${FILESDIR}/pydoc.conf" pydoc
 }
 
 pkg_postrm() {