pymsn-t: various fixex, cleanup

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

6 files changed, 132 insertions, 18 deletions

diff --git a/net-im/pymsn-t/ChangeLog b/net-im/pymsn-t/ChangeLog
index 7857cd9aadcf..13a1fded6bf7 100644
--- a/net-im/pymsn-t/ChangeLog
+++ b/net-im/pymsn-t/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/pymsn-t
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/ChangeLog,v 1.27 2013/08/03 09:45:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/ChangeLog,v 1.28 2013/09/14 23:05:48 hanno Exp $
+
+*pymsn-t-0.11.3-r4 (14 Sep 2013)
+
+  14 Sep 2013; <hanno@gentoo.org> +pymsn-t-0.11.3-r4.ebuild,
+  +files/pymsn-t-0.11.3-imaging-pillow.patch,
+  +files/pymsn-t-0.11.3-twisted13.patch, +files/pymsn-t-initd-r1:
+  Cleanup, new URL, port to new python eclass, fix for twisted 13.x, fix
+  deprecated PIL imports.
 
   03 Aug 2013; Michał Górny <mgorny@gentoo.org> pymsn-t-0.11.3-r3.ebuild:
   Move dev-python/twisted to dev-python/twisted-core.
diff --git a/net-im/pymsn-t/Manifest b/net-im/pymsn-t/Manifest
index d6d5615d432f..cd38861e86cd 100644
--- a/net-im/pymsn-t/Manifest
+++ b/net-im/pymsn-t/Manifest
@@ -2,31 +2,33 @@
 Hash: SHA256
 
 AUX pymsn-t-0.11.3-delete-reactor.patch 361 SHA256 d989d06d9e94f1a2786dfa51e1cf715e4dc0db95583b08ce606b555aef017bae SHA512 5d94633a614138d760bea4447038d99e7177eb96d44d00b2a496c0773dace54780eb0050b9f179bb5039cbf8b26be67462ac5acd631aac856f4e88393ac40755 WHIRLPOOL 7f326b8e2fd0379144b4d44a2d0fd5b6fd7b2ead06da22726c17d1b93336d4d914835fe7c12e754475f9847891b2d91a7db16f32cf1ccc0eb4362e54b2bffbe1
+AUX pymsn-t-0.11.3-imaging-pillow.patch 322 SHA256 5be9c203e946908f16aa4121a72f985f8126098ace01e9e07a8d5feb078922bd SHA512 cac1e792d3c1048fd1c25a7963e653dcd4d5924fb1aba7e6132e79fb3d9ea909efde64f1b1bd835103511ce54bd655ae47ea4ad5e4eac3374db5b7a2c97df47e WHIRLPOOL 88189289c6a1f44e75e65b5dc0d9938155e70626cacc1002f9fa9d76f22cff127a539e3f540806811ba1f45c948c440eedcb584912032eaf09551541fb797890
 AUX pymsn-t-0.11.3-protocol-version.patch 609 SHA256 008aedc95f1c2020a156d941c74784ca1385f12426342885fa7ff8474365b5a3 SHA512 ea5b4956d4b848f8d637b36069e2bec0b6bfdba94aabcaecf83388d2806ec740b789440f00dff93e3b091379c8bf3953268f4fd94a86c211bb48a4fa2fd9174e WHIRLPOOL 6cdb67433e196201db21877b0c3431fc97feaf61f61e3491df6986fe3467d657c5da8bfdb51cdf81429b6fb21e18dc833984e8d74c6382d5a69033e8a51a6270
 AUX pymsn-t-0.11.3-remove-pid.patch 1173 SHA256 b4a09f2af01f752a2703d14204cb954a0641afedb1be391f1b9f6f980b234845 SHA512 b151e827b62e49b4d91966a2019d26cad8076a335dd263a3bb00f13b8bfb4bddcf9c5f7d0683d14a967e67f469ad2ff540b10c2c1ffc4f8ebef94a4feb26e0d5 WHIRLPOOL 56a1c85f9d78e3171484a17de8eb0e2151e42aecb43f282c8c097f09912ceaecb3b99bc3ef9776409b798a27ba09c85ab9b0237b2494a51c1ca90f6edf710e16
+AUX pymsn-t-0.11.3-twisted13.patch 352 SHA256 81058d7be7116ff7fff6ec86eecbb30132b6b34bbc647e6e0147185365fb0fde SHA512 78be5c3af94d197d442182452fe34ef7f31828cd1eb158846296a6a7837971998e9bb470d8a5c51081ce00b66a0fa003bcbd273c8ddd80cd560022f8c6f8b7f0 WHIRLPOOL 6970c624b3699ce213564dc0e5e620df092b151cf99fc9f340e103e65df370088d7af8a16cc0bc30c8fde9238515b44bb6d72fe20a458c013067bd7a70792a14
 AUX pymsn-t-0.11.3-unexpected-xfr.patch 1984 SHA256 0407e9e69684275b11d404e77e9b70e694e461d4c9891ee3c7d79717999a84e9 SHA512 5ab2b6a577ff835338724add6befb4394a2f85ba521a3dad543d501980ef3b7cb1a930a966b2b898166e7473972da624d683072f2e3f687991e07ebaa4157195 WHIRLPOOL c9323c1c51776e4e0d8fc6b18d635c693ee0a7825bb624d0d41532819862a1553501655360b682ac1c0b4eb1004cc5564b7267f4cb4435f0fc7db8c81a2268e6
 AUX pymsn-t-0.11.3-use-non-deprecated-hashlib.patch 4605 SHA256 12004937d29e090e147ddd8f7aa5ae7e615a5df27c4db6a7b28824859937dd27 SHA512 7ec0f9f4c111ab2a43b9bf4ad1a5cb1b07174d0e3063cdbe86961a72a535c231d5f3f972b43e492afa8ebc7af32d27884d40a39a8a227187f3bf5cadb17272b6 WHIRLPOOL f51aad356f9350bfb47ec88b4447c63345d0ff01ae91ab587182bec60398e1b26bbb3e6cdf6b90036dea620fabc4a732de4408bb16c0cdd80c6197667a1e56b8
 AUX pymsn-t-initd 670 SHA256 557dc37a1c51b03188623e3b4fd0329eea87ee4428bb397439359656daa3d431 SHA512 683089271c42556db2e2b817ad469a1a4b1ebd687279233178f28f56c542f00a4679fd8cd9430664c9bdd2e670e4f86f5682a6cf7621a31b773254043c6e8f27 WHIRLPOOL acdda704c13bb71fecd97f4e49ce242f285c269a7ff9ad590a4b3157a4739420985e44824a31ed345a0a3bc6d41b27d6a25883c1ff730c4d26caacfd8896fb3c
+AUX pymsn-t-initd-r1 716 SHA256 c1bc1f8144c07d3b12e91aeb25d4914ebfd779843ae5f7d821486e573b6119ec SHA512 bdb877a87b31908ecc0e1efcda3996874f1c589fdc441a433b3f7bd5449e20a8456b342e969fefd175db7095234c2189836a95917fc983359aa0bbbdae2b9396 WHIRLPOOL 388d2ed2767c3d8c4f33ed0e1623ad53772629007eac1d49d617f3cb2db2fd9920d4f83da2d6494a6826a39ccaeabffa4554c69b466a0376756295c3cf93b2dd
 DIST pymsnt-0.11.3.tar.gz 162549 SHA256 777195feb6a70b683d691c54269099d319747fad7195cca36d86df366360ce2c SHA512 57ed58c51ddaceb877e22c0703f59299fd1e75add6de9b6d937025a12f9ea669c24c8de70a5995500101a0537dd3549676df475d87df63ec29d6c773a2a31563 WHIRLPOOL f5af4d65f6e8d193ecef07739c29b30e841f4f7fb32c972a9c58e6550700da3c0ae3fdfa3bb9d077e7369b05f0582ab305f76c593c6457d43fa5455caa7386bb
 EBUILD pymsn-t-0.11.3-r3.ebuild 2076 SHA256 8dad9f301ee8b698382d71d912c01f24035cdfe6235ea881cb36a2b0e05ffddd SHA512 0bd5ab469f2c8477ecda81410e15d4805e3dee8fadd81cc1452b211b6468e628033a47be400fefa4926ce60cc9fd70b417f20626bb397a3883dead129e5923e2 WHIRLPOOL 198a48f8b9fe4243056264c7af82a14c1cb468f8026696e114a5a0f0587a4d635d37eed0cdf4a055b9fdfe9778f65f5211fb43e6a88bdbca3232780340670198
-MISC ChangeLog 5453 SHA256 96bbe5bd6e39c20764d9094f87cbacef94b48baa7971f39b2dbb317adb9e1129 SHA512 f175591d735560f37ba0d311b859b92e41c0efe67cadefba72d0f66512ab7b31c393af5df67cf31fa4724c939f987b947a91d7c1fda5e51b1e1538392a414cbe WHIRLPOOL 91e7e994694b52475ba5d13917fe16874e83274f80a0229d2ffaa5878929ebe228af4984dbc70210a82e691f70a7170c38d18669c043c460f0154b0f98e9bb50
+EBUILD pymsn-t-0.11.3-r4.ebuild 1932 SHA256 38fbf76dd9d41a0d04759f6d3335cc79e57ba2a4aea1e111f3c87e90bcb4c886 SHA512 745b2295b452c24815c53cfdba8d5b902941a31acc20931b3bc9a9f27a3b47769007a5f489a2998078cc214873e65df4167a8c65d4e8ed9bb46829d624e48bf7 WHIRLPOOL 02b25de351dddcca4f9b9dd3c0060f951740b8e333390334c32758e618691c1e8ae10cfb16e4a95ca772d8c5d30e0f8b019e1f2f033a84ed640c13a596d1b01c
+MISC ChangeLog 5759 SHA256 04cb0632dcbaec091521cf4178a0056a0bc7917cc6f9f24ee1487833ae414188 SHA512 731e320bc13706ffa883cf67961741a8ec22c9a73cb2007c79817c9665008c11062cf1bd19c18e3936b52ee57ddf4b6d4ce70b7e2a20944b06b53c0ca0cfc0f6 WHIRLPOOL 668b441e298c66d23194628b8339d73ba9f12e6c2739868e79f426c8dda1622db63f1c6285d36ac0749b292bec06007d8b2ecdfdfd211cb5cebf1adbf443f6b2
 MISC metadata.xml 233 SHA256 06ee3fd43c4bea5d5528843a5a6fedaeea4ad97807b81ea46c4ba57b8f54b6d0 SHA512 5df742525093b710948af605715ac9388b02568dce7b9ed08e0e1dc6da07201f02e7669760bae395a4caafa7a5f41cfb826a3062ed0ee6132dd13727fcaf7764 WHIRLPOOL d699a25e0e2ff171780e0028d8db48b20d65a7ca59cf9927aca54ff12c099b57c0cec2768ae5d827a2ff332b98d699285cec62c283297f6a10aabfe1ed88d998
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJR/NGmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDgz8P/1yifaBjhqF9OT57CbfjwcSh
-0BeQeKmazFFFm3GU53WSlenPJL8u8n6cRnEnWOcPg9oeRS7IHzU5mOzvFJbBBQak
-9QNGmSDE+Bzp6Ol8JIObOHuUDDNAT6T2xAapcgnPrvVdKa2lvLzLnRRdt3x3tw2Y
-OgEZHaGzZVRZHXaeEq/BfCIEVwXZrCLal/uvqOZW7mhIHMcitubbQvjSdI/Qkb3V
-RX5vkObrvHDEAV4+P3QnuiMlPOTTrNtbmhqInolLMmLUV2LIQPjtXd/Utr6H/F4c
-EXR7irvdvs42La1UagH2m/nsprfT26o4LyByi730a4CGIihaHUs9W/z8fcOEVAHJ
-blZEF027MAeCUGEa/pp7iiyPKzawTcWFzQQyqXkeMqdNx6kONTifsxDFeV3tL9hT
-H2DIeXccDDAJ5cm9IxE6RQpRmJ0gFy0vu0W44TCGTbUyyPiwzloUUKPLeCrM5/q0
-Sa6GYTu08qPeEMJiANQRbqgRP9uQcJftJkmhH7ZyERhXokzEI26ggafuVpkYkuiy
-wu/A0qzydzS4G0oh3DSSAy3QWm6Y9ZDS9qv4IloKKCVnF/9s0X9bYlhETTf68hG5
-WLcSr0YL5EQge1QMWKU0upS5TttYonn9l240huvo13egmw4LJzUOMJDjsDCd/+TF
-+zeSErC3UMe1h7ko8Xne
-=jCCy
+iQIcBAEBCAAGBQJSNOvHAAoJEKWIAHK7tR5CXGIP/2dMHjONIxPb7IORSrsDcQux
+embI8W3khT9nUXcumEk82pOTsEZ/8luBLombbLbHMIQKE9oEzoyc8q9F4r5dE/4E
+cAkTx9mXeTFFrgh7yv6Q+Xja5QtuicP/0yL2XKUcET/7/sYMPXk0Of/WBN/okn4n
+2ChUClvH565lg6Nb7eYPeVS10GEB0SsW1OFwHLaerUZcX3LpwxfGjEhpZOf+fN8a
+XB4QwfZ8udNGCj5OVWBghPChuUWbCGIbLxgnFhIPhEMd6OrAxxMRHHFXHzrPdpJc
+Xx+KQaj03M+NstdMaSlicexgbLtGOpSTRbY2cbOk+XOX0pT83qY/HIv8tRkt7NIw
+Vxw+a13qlqlJe7eQBQhOaqm01XQaFC6xjo9pSbiUGq/FpUfxfNFQwKQHz/+2A6SX
+BpsDwyUSir8r0qbBXDADGNhv6sYTr7iHMU1Ab5oQeGqWuscnHyeZqltjZQpD4+a4
+cKm3H4yZcqJM12JlzdB/tDR9+aBLqQ4PzQkpC+flC+zCT6nocFKzK3CjYlbx+eRQ
+Kg5xONyLmQvOfiqHcmXP9yUAewFlM2EBV8alA//IjqX3EHb9EyX30/cxl6piDk1F
+l1aGHw8gMsiK60facyHghm4M85nKFqqgzP5dIXys9G3C79Odit1hwpB1CLiy7eXr
+CwdJU5h7O3Y59MI7aZLq
+=pYrY
 -----END PGP SIGNATURE-----
diff --git a/net-im/pymsn-t/files/pymsn-t-0.11.3-imaging-pillow.patch b/net-im/pymsn-t/files/pymsn-t-0.11.3-imaging-pillow.patch
new file mode 100644
index 000000000000..7d17dae04f21
--- /dev/null
+++ b/net-im/pymsn-t/files/pymsn-t-0.11.3-imaging-pillow.patch
@@ -0,0 +1,12 @@
+diff -Naur pymsnt-0.11.3/src/utils.py pymsnt-0.11.3-1/src/utils.py
+--- pymsnt-0.11.3/src/utils.py	2008-02-08 14:55:07.000000000 +0100
++++ pymsnt-0.11.3-1/src/utils.py	2013-09-15 00:27:56.815633838 +0200
+@@ -25,7 +25,7 @@
+ 
+ 
+ try:
+-	import Image
++	from PIL import Image
+ 	import StringIO
+ 	
+ 	def convertToPNG(imageData):
diff --git a/net-im/pymsn-t/files/pymsn-t-0.11.3-twisted13.patch b/net-im/pymsn-t/files/pymsn-t-0.11.3-twisted13.patch
new file mode 100644
index 000000000000..aab9bad77b72
--- /dev/null
+++ b/net-im/pymsn-t/files/pymsn-t-0.11.3-twisted13.patch
@@ -0,0 +1,11 @@
+--- pymsnt-0.11.3/src/main.py	2008-02-08 14:55:07.000000000 +0100
++++ pymsnt-0.11.3-1/src/main.py	2013-09-15 00:57:20.297587280 +0200
+@@ -328,7 +328,7 @@
+ 		
+ 		# Daemonise the process and write the PID file
+ 		if config.background and os.name == "posix":
+-			twistd.daemonize()
++			twistd.daemonize(reactor,os)
+ 		if config.pid:
+ 			self.writePID()
+ 
diff --git a/net-im/pymsn-t/files/pymsn-t-initd-r1 b/net-im/pymsn-t/files/pymsn-t-initd-r1
new file mode 100644
index 000000000000..d7ba09a634ba
--- /dev/null
+++ b/net-im/pymsn-t/files/pymsn-t-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/pymsn-t/files/pymsn-t-initd-r1,v 1.1 2013/09/14 23:05:48 hanno Exp $
+
+depend() {
+	need net
+	use jabber-server
+}
+
+start() {
+	ebegin "Starting MSN Jabber Transport"
+	checkpath -q -d -m 0755 -o jabber:jabber /var/run/jabber/
+	start-stop-daemon --start --pidfile /var/run/jabber/pymsn-t.pid -u jabber -g jabber \
+		--exec INSPATH/pymsn-t.py -- \
+		-b -c /etc/jabber/pymsn-t.xml -l /var/log/jabber/pymsn-t.log
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping MSN Jabber Transport"
+	start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pymsn-t.pid
+	eend $?
+}
diff --git a/net-im/pymsn-t/pymsn-t-0.11.3-r4.ebuild b/net-im/pymsn-t/pymsn-t-0.11.3-r4.ebuild
new file mode 100644
index 000000000000..11ca5092637a
--- /dev/null
+++ b/net-im/pymsn-t/pymsn-t-0.11.3-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/pymsn-t-0.11.3-r4.ebuild,v 1.1 2013/09/14 23:05:48 hanno Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit eutils python-single-r1
+
+MY_P="${P/pymsn-t/pymsnt}"
+DESCRIPTION="Python based jabber transport for MSN"
+HOMEPAGE="http://delx.net.au/projects/pymsnt/"
+SRC_URI="http://delx.net.au/projects/pymsnt/tarballs/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="net-im/jabber-base"
+RDEPEND="${DEPEND}
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-words[${PYTHON_USEDEP}]
+	dev-python/twisted-web[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-protocol-version.patch"
+	epatch "${FILESDIR}/${P}-unexpected-xfr.patch"
+	epatch "${FILESDIR}/${P}-remove-pid.patch"
+	epatch "${FILESDIR}/${P}-delete-reactor.patch"
+	epatch "${FILESDIR}/${P}-use-non-deprecated-hashlib.patch"
+	epatch "${FILESDIR}/${P}-imaging-pillow.patch"
+	epatch "${FILESDIR}/${P}-twisted13.patch"
+}
+
+src_install() {
+	python_moduleinto ${PN}
+	cp PyMSNt.py ${PN}.py
+	python_domodule ${PN}.py data src
+
+	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}/${PN}.py"
+	sed -i \
+		-e "s:<!-- <spooldir>[^\<]*</spooldir> -->:<spooldir>/var/spool/jabber</spooldir>:" \
+		-e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
+		-e "s:<host>[^\<]*</host>:<host>example.org</host>:" \
+		-e "s:<jid>msn</jid>:<jid>msn.example.org</jid>:" \
+		"${ED}/etc/jabber/${PN}.xml"
+
+	newinitd "${FILESDIR}/${PN}-initd-r1" ${PN}
+	sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" "${ED}/etc/init.d/${PN}"
+	python_fix_shebang "${D}$(python_get_sitedir)/${PN}"
+}