Add checkpath for /var/run, fix python code (#315115), EAPI 5-port, replace dosed with sed.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xA5880072BBB51E42

4 files changed, 128 insertions, 11 deletions

diff --git a/net-im/pyicq-t/ChangeLog b/net-im/pyicq-t/ChangeLog
index f8e76dd96ca6..566df6cc0d31 100644
--- a/net-im/pyicq-t/ChangeLog
+++ b/net-im/pyicq-t/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/pyicq-t
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pyicq-t/ChangeLog,v 1.21 2011/08/21 17:41:16 hanno Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/pyicq-t/ChangeLog,v 1.22 2013/03/18 15:55:08 hanno Exp $
+
+*pyicq-t-0.8.1.5-r1 (18 Mar 2013)
+
+  18 Mar 2013; Hanno Boeck <hanno@gentoo.org> +pyicq-t-0.8.1.5-r1.ebuild,
+  +files/pyicq-t-0.8-initd-r1:
+  Add checkpath for /var/run, fix python code (#315115), EAPI 5-port, replace
+  dosed with sed.
 
   21 Aug 2011; Hanno Boeck <hanno@gentoo.org> files/pyicq-t-0.8-initd:
   Avoid warnings with baselayout 2 / openrc / start-stop-daemon, --chuid is
diff --git a/net-im/pyicq-t/Manifest b/net-im/pyicq-t/Manifest
index 345d5a855e24..2b0a6d58561c 100644
--- a/net-im/pyicq-t/Manifest
+++ b/net-im/pyicq-t/Manifest
@@ -2,19 +2,27 @@
 Hash: SHA256
 
 AUX pyicq-t-0.8-initd 674 SHA256 f23340e8d839d28d729ee422ae545c7bb463adf2a50f867b0147982d68a3ab57 SHA512 3d798e95b83a8a54b8579304ec8826c96b5abf518c0f34b25c064f5a2b40d90c5c85f50c9bab5bfbf690007bfe99ea08777141c36064cb071e7ed5b571e92b25 WHIRLPOOL 9250f7b2bfb1ddea06c32b82bbb6a38bf9612c451c9f6d086c7a658952d039ca46a776bc83842f666c8674d9acd570d64fbdd65e9fbba886f2bbba233bae7e27
+AUX pyicq-t-0.8-initd-r1 720 SHA256 1110c247f66197357953b8e7f31a1e086f39edeeaba458305de197c8f6568713 SHA512 66e74f0de3f0ffb3ff0c9ed6c5126bd91b5bc9f02b6622531d9a441b0b97ac21c8efc5acec68be0c673471643c8492fc52398da92d01c42c9ee0d179a7732db3 WHIRLPOOL b97ed412d2d141e2d0cf658109dfca6b58a7e72838f03669379a6551bad9b2ad61f7b7de2fa6f786b7617f18755a3e42d65334498adbc6c59226b3f9d4d714c4
 AUX pyicq-t-0.8.1.5-python26-warnings.diff 3485 SHA256 6e5eff6faf6e87535401a4c697a4d23f35270ecfda1ac56ab73c491cc7baa34a SHA512 8b7cb353ff2c6259525909b62a6d552116339fe8489d747f7310fa9013011b6028c0f0dc165307ff5b9fe9da9517852c3e4158eb6f05a51f987e9cf2a969b949 WHIRLPOOL 387207927e4c0a68f0adeaf7cc3c8201aa0c21e4481e87ad776c7c9f2b45cfb0f7f190e2557f8c7a1f55960dc3831fca2e17109314605ca997da6d66e750f855
-DIST pyicqt-0.8.1.5.tar.gz 183865 SHA256 15ffa7b7d8f2d749492eec3b87bf64f8a429452282ca14e36ba5aee45b5322df
+DIST pyicqt-0.8.1.5.tar.gz 183865 SHA256 15ffa7b7d8f2d749492eec3b87bf64f8a429452282ca14e36ba5aee45b5322df SHA512 5b83adf86746c2af60bed2759c7d4e3a3839bea532e0882a6dc087aee5e0afa1320c6d2d2296a667ec45c5b36be879034f079fd30cef924e8db5f66a2f1d3fde WHIRLPOOL 91a51c81d32bc688d4ffb6f4623ae1efe7e5dc5d524b7fd2f519720dc81078d6547ea64a5311bcfcfae0ad77f8fe7ab933f5b63e3f2887fe4671c71b2a6848d9
+EBUILD pyicq-t-0.8.1.5-r1.ebuild 2294 SHA256 aac9fd2d4e7a3ad224a1ff2ff88e8fbd4f4a074fcbc8bc56eac3ed9b6ecadd7b SHA512 6bac835895676eae155e39dc462b26b510cc2c277baf84e3fec8860e78bff4c72b923901771dd2156b208656e9ee0b943a946ce0096215721531c28810e7baaa WHIRLPOOL 0329b4d15736c27581b896cb318ca299cfa80e3f4dd304e7f1dc9b6d65225634dc059e56812d40a61949537ab2f9a4bdfe536a631cd78b6f97dce10435837c92
 EBUILD pyicq-t-0.8.1.5.ebuild 2075 SHA256 eafcd0a5d7bf7d1131a1c0981693ae718b608758a2cd4b336928827d79fd5281 SHA512 3697cf9faa8981ce478fc4fdb0176ea9a943ec5c9bafb45d19f12d18da4e39882be36c3ecae3e7f8ab4ef2ccc8e2835c2e638f2a6bebc600b862d51ada4e5c6c WHIRLPOOL 630ccc44fbf6e3d46cef57f3738d7aef6d9410022dca1def84ae6f6e299207333de1aba33d849d21493a1b7e68f599c48b15fa625e04ace70110bb98a7d99143
-MISC ChangeLog 3632 SHA256 0a50fbcb69a931404764ef77340ea5a0590f2498fd58ec50d680591921f63d55 SHA512 1d9c6d56ce034a249d2610c773276a157a9e3e86b081d8d3b416545a37abd24cebc7d6ee0d88d4eaf73782d4c90dc61ddfd6f726d04fb24815abc73cd50cdf44 WHIRLPOOL ae7971c8600bb47044d65e7d6a2e78858bb889cf535ec49c1f5e9ae8baf27556e19ca11c6aa9922d814b46416a001f5cb27496622378210fe75efdcfef52cf55
+MISC ChangeLog 3869 SHA256 9175daae3c133419a2d21231d642e68fd472169aa25e8c0e96bdb0ab62e5a71a SHA512 6e8168ce3b539a9931df4cbe9a635bd602b8389b0c53c6a8933dc9bffd5047a7ac97c852d6ed17b2f75e8075ba160b2e2282a3464b81b0d2d4bdaab3cc56de02 WHIRLPOOL dbd7f06dfab9c0214f7cb608656af19be6e90912caa64e385d43b356a0b27d7f81ab0d02aff4ca0ada8e822f8022091a3f0a3341d122d82a474ce3ea8f61dcca
 MISC metadata.xml 412 SHA256 ffea6006aefb0ca439a16fca2a9d9099293ba3c2e3e9eb2edfc5281197691674 SHA512 ae521283b485f07979b7349b7a7683ec53cc9a9e277242df77f0ccc459230b38e20898fc0e031550090dd79c7d5f5759fa96d1fab1fa2ec0af0b291dd719c5ed WHIRLPOOL 1924e0c2155d97142f1f347de412226f1180640c6726e7976499590c9ede6ceb0c5c347bf6ddb4d3879fcf93ef43323eee7f2677b3d185365678d88349a7c61b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQADETAAoJEO+t9ga+3I3axdgH/2KRerc4/aIoXqZ7KmowMNkL
-LCyuzP5mndJzsgPj2+7i6/UANSht1gNJnLqq9vHy3sd5pAiW0+/h97cKQ2t/E3bL
-YbzblPxjeNtc+qpaefJ9Z/UqyG//5LB1Y7+SFHlf+iwQyojNH3Ht5+eMoCQoIKTs
-XQJ+Wz/vt5NFtkhl+3rERUAhsD6WK4/ni9qk0FF4kfV8Od0jZOBt9MKJRuWQBnni
-NTcXGj8B+mFJm9RRvyaTivIwFxW2Injjm2DE2AG6TVdxo+DYX9DIsVm8SBd5UQfv
-tyFFww1SGL4/nzEnnHerj93Rb8QpdRuaFTP4PW8zKfKIJPrLyio7J44+DiLyii0=
-=i4lH
+iQIcBAEBCAAGBQJRRzjZAAoJEKWIAHK7tR5C7CYQAJpGk+AOhTL3VGw8FiJyrKdr
+fGP6RxZ7+/VzHmgUIYlXL8FXg4wk9KWokXXqEBh2XqrBpV4yPSCH3IlEjB5jRtmC
+fOoQeMIMzqJ+I919tIdU0SppEORITHrufw0irf7MggcrZ4YGzDU7kH0y/4OkmcUx
+IkkrX3tgxOyoxZY7a2j0Jm2lF/fJghSsaEXxFwD/zLxeQ19PWaidQO1pMecxDavR
+74M//WekcVhjrVzBH51EtFysWg0BRRj2fiP9to+JFeTHye8eNmmiNPNR862lRREW
+gPuuqBKPY0f0ncQmDfYJsFJ2qdY92S+S4gFVfv2+f+G6uD+hzsc5ReK8PqPES1o/
+VwXbooyhSaA6jKJxZ0nJl27bHjOml7Dh3tlQmTIRUrqOqLxwUBDORIPyapavAiBi
+HjtmAkuB/za0tZsvmotZP79IHLmmnInygd0qW25eo57P4/mbfUNbXVq6sPS8j2+s
+8J2kmjsDFuaBhoBmm6DNPdS6k5YN2lAFeIqNC2f7TnRubJcj94+TbsGIcLpLRvwq
+TfiQ1aJDegolMooVpSbukCkVFucSwoypJrOuT8D/esajMQooeHPOnRohMzvssXw7
+gwgiqcj/sMC36vvJyAwiO4c84Z/hMpcbk/OghMF81Kwazq9FL1RWtnB6E/w7ZsiU
+wjxsf/qQ8g+/8V7VnbfK
+=7xt6
 -----END PGP SIGNATURE-----
diff --git a/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1 b/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1
new file mode 100644
index 000000000000..bd099b501340
--- /dev/null
+++ b/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1,v 1.1 2013/03/18 15:55:08 hanno Exp $
+
+depend() {
+	need net
+	use jabber-server
+}
+
+start() {
+	ebegin "Starting ICQ Jabber Transport"
+	checkpath -q -d -m 0755 -o jabber:jabber /var/run/jabber/
+	start-stop-daemon --start --pidfile /var/run/jabber/pyicq-t.pid -u jabber -g jabber \
+		--exec INSPATH/pyicq-t.py -- \
+		-b -c /etc/jabber/pyicq-t.xml -l /var/log/jabber/pyicq-t.log
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ICQ Jabber Transport"
+	start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pyicq-t.pid
+	eend $?
+}
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r1.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r1.ebuild
new file mode 100644
index 000000000000..449fe251ac75
--- /dev/null
+++ b/net-im/pyicq-t/pyicq-t-0.8.1.5-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/pyicq-t/pyicq-t-0.8.1.5-r1.ebuild,v 1.1 2013/03/18 15:55:08 hanno Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2"
+inherit eutils python
+
+MY_P="${P/pyicq-t/pyicqt}"
+
+DESCRIPTION="Python based jabber transport for ICQ"
+HOMEPAGE="http://code.google.com/p/pyicqt/"
+SRC_URI="http://pyicqt.googlecode.com/files/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="webinterface"
+
+DEPEND="net-im/jabber-base"
+RDEPEND="${DEPEND}
+	>=dev-python/twisted-2.2.0
+	>=dev-python/twisted-words-0.1.0
+	>=dev-python/twisted-web-0.5.0
+	webinterface? ( >=dev-python/nevow-0.4.1 )
+	>=dev-python/imaging-1.1"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-python26-warnings.diff"
+}
+
+src_install() {
+	local inspath
+
+	inspath=$(python_get_sitedir)/${PN}
+	insinto ${inspath}
+	doins -r data src tools
+	newins PyICQt.py ${PN}.py
+
+	insinto /etc/jabber
+	newins config_example.xml ${PN}.xml
+	fperms 600 /etc/jabber/${PN}.xml
+	fowners jabber:jabber /etc/jabber/${PN}.xml
+	fperms 755 "$(python_get_sitedir)/${PN}/pyicq-t.py"
+	sed -i \
+		-e "s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \
+		-e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
+		"${ED}/etc/jabber/${PN}.xml"
+
+	newinitd "${FILESDIR}/${PN}-0.8-initd-r1" ${PN}
+	sed -i -e "s:INSPATH:${inspath}:" "${ED}/etc/init.d/${PN}"
+	python_convert_shebangs ${PYTHON_ABI} "${ED}$(python_get_sitedir)/${PN}/pyicq-t.py"
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+
+	elog "A sample configuration file has been installed in /etc/jabber/${PN}.xml."
+	elog "Please edit it and the configuration of your Jabber server to match."
+
+	ewarn "If you are storing user accounts in MySQL and are upgrading from a "
+	ewarn "version older than 0.8.1, then you will need to run the following "
+	ewarn "command to create some new tables:"
+	ewarn "	 mysql -u user_name -p pyicqt < $(python_get_sitedir)/${PN}/tools/db-setup.mysql"
+
+	elog  "These instructions along with a list of new config variables are "
+	elog  "available at: http://code.google.com/p/pyicqt/wiki/Upgrade"
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}