Mark stable on x86. Based on build testing by Myckel Habets. Add missing die. Cleanup old. Fixes bug #471544

Package-Manager: portage-2.2.14/cvs/Linux x86_64

5 files changed, 12 insertions, 122 deletions

diff --git a/net-im/pyaim-t/ChangeLog b/net-im/pyaim-t/ChangeLog
index c3b40e73046f..bec016f7aa32 100644
--- a/net-im/pyaim-t/ChangeLog
+++ b/net-im/pyaim-t/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/pyaim-t
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pyaim-t/ChangeLog,v 1.19 2014/11/23 16:28:10 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pyaim-t/ChangeLog,v 1.20 2014/11/23 16:51:53 mrueg Exp $
+
+  23 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -files/pyaim-t-0.8-initd,
+  -pyaim-t-0.8.0.1.ebuild, pyaim-t-0.8.0.1-r1.ebuild:
+  Mark stable on x86. Based on build testing by Myckel Habets. Add missing die.
+  Cleanup old. Fixes bug #471544
 
   23 Nov 2014; Chema Alonso <nimiux@gentoo.org> pyaim-t-0.8.0.1-r1.ebuild:
   Stable for amd64 wrt bug #471544
diff --git a/net-im/pyaim-t/Manifest b/net-im/pyaim-t/Manifest
index b16ea2d47aa3..0ece199c9019 100644
--- a/net-im/pyaim-t/Manifest
+++ b/net-im/pyaim-t/Manifest
@@ -1,29 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX pyaim-t-0.8-initd 674 SHA256 c8fdeb7cd44a50ee3c1bf471524cc14e1ca232ac2365784ffcf01aeb45c68d7b SHA512 68ba31fd9ebfccd1f54911aad530a9559e8afd6293a0b8fb0bc5545968549bafa48bac38aa233550bddda07898268c7df75fd169318e75bdf8d4a0aab2d25f8e WHIRLPOOL 308159c5de9f1a85aea641d520bcf21407e725d7595685e9c1874ac1f588c7ea60ef7598e627de9e6469c0ef6cc761ac90505650671ad20cd3de51c02807d695
 AUX pyaim-t-0.8-initd-r1 720 SHA256 66b5f32309c8756c6ceca8463857689cf4f0e5559fa41e5235b7589a62ea4513 SHA512 0a674e73ec1a2626dd3e98f89c7888b4f16ca7adcf6ef6ea2f9acb9e65e72dc5c0d0b3f3f2aec3c4be40c7c8823c22d10fb314f0efe70a35586d25e6d2ce2172 WHIRLPOOL 0d00acef32c5ebfc44b2fa29d99cc2dde1493a7531aeb9cf7f4c172a95d4b6b35d699050dd7881f99484513883e33baf9fddb34e095cace9e63ec83cec13c031
 AUX pyaim-t-0.8.0.1-pillow-imaging.patch 1236 SHA256 a40c1f221a0bec925392750087f1fb9977636467981b9592465947bc06759f70 SHA512 d013553eb5771b104e8b62eebe838199cbaa098f62265e27013296faf152c9a5a5f2dd2d972a3152518bd821c5c492ed615749444e76d72948e85554c83b84bd WHIRLPOOL adc1fa83b3dd2ac3a68b93c01fd1ddcf4e81f774c7e43700414f4e7fad5ee37490ef64b729d920199cd9cca05560aacc6d66a0a451a87159ae26fa5b0485c67a
 AUX pyaim-t-0.8.0.1-python26-warnings.patch 3678 SHA256 22ba536c958395cd0fc47a0c9f8590f6a9c9cf3338e6c5cd29a554ee0d8fff37 SHA512 fdf3caf1edbefbec7a1eaa61e25ef2d014be86d17bbfbccd4e85eaea0e2f4d227426820de09573d443c3c9d9588c6b901578f8935c541615bc765b3dd7d73cc4 WHIRLPOOL 65c15b9c395de1a52cb3e427ec0161a72604e3ef0fa0a4097d9a535cb5790b18f2288559d365ea845c1f0f36eb36799d694594d5e0bcdd91caa55636b8543093
 DIST pyaimt-0.8.0.1.tar.gz 143968 SHA256 c9447ff37b4d5d49d9ae9e88e694493cb7449008c882edbb0babf4b4dd5c4bfa SHA512 70d92cb99f36452d95b32bda04ad5f4c74387ab4cc40ed3cd06da58285f4f4b5122aa470e34e4fb1dfedc13ef33feafb3ba6a7036caee9d95edb8969df730540 WHIRLPOOL 337e4ce76c6f8997054d3e93be5d11a94121ca99200a2205fb59cc38595e626e4f2307078a9f7d1a22ec73b40298bf91a430db86cba28e8b2178f4681ff8248f
-EBUILD pyaim-t-0.8.0.1-r1.ebuild 1638 SHA256 4fd01b96b10123780b0403e94a1b4e9c60133aec64aea3a410ea149da77fd2a8 SHA512 12aaaf20bc4dcd420e320864aa28bd299c8dc8bb74a13d5255fadcfe351e2c2dba6fb1e402a4234b71c3ca088914f3bc316c79623230fcd6ecf5edc3c7f26b5c WHIRLPOOL 9a0e3135d7bada5a60648996ed33aa755784398697d7794bb1b0c90bccb9e7d5410846dc9fd5bab7834ecfd0aee85211153a3ec5472683a483c1d82f06ca25a3
-EBUILD pyaim-t-0.8.0.1.ebuild 1722 SHA256 ab5c7503ea36b37925ac5af1e37025afc1e3890f80f835cd5b67efa2a028682b SHA512 d1443061155e38322b53ef467cbcdf95b8765d0c301de8e6a98cfc1e5447b7a5ee6c19649311d2a9773b0970b2fc166ceff0dca3fe9ac91e98068e7116b4fd74 WHIRLPOOL a5d362ee1a2b46ccccd5eb66b60cc3e8fc365e9b16b842d93cca8230a416f9b7d7232edc95421aff8595e1db9dcca85d0996af56ae238d32e6ecd8334cfb28d3
-MISC ChangeLog 3174 SHA256 354586bd573ca327d8de37cb1229c655d0f36b08aa6e15c75cf501f7118ab978 SHA512 939260dae9ebc7c05597ec5c6d28e1093371eea4cfcd02043f9998a0b0f76a6111ba7720c97f3889054659e3db9ee4b65e4b0e315ec4cd32dd636711f63349c6 WHIRLPOOL 680441621ea325011c6b431f8d60ee952ad982a10b45d4b05e10048ae32cb9f6f24921c218ee713158db8b97626d43e6859041bd7e5b801a62b98a3d6f34d358
+EBUILD pyaim-t-0.8.0.1-r1.ebuild 1650 SHA256 1f45727e6a729bdb1bb38ca7704227ae9e5c54aae2d27740005908cae61fd2d4 SHA512 940e426093035a801744f0aa1d449025a1178a574d8745d143242129dd527b220c2d82618a565de6c46c8c5d359e2b742d31fbe4b40fe1d34f35d5230c0a17b4 WHIRLPOOL 4c0b2b920c464afc50631fb4a7ffdf6779397bd8c4d79f9e5e040e95430d0a15f5c2a8dbe52ce79acd1aef7c51d8cc7202424f5cdc0b20b5ca042356548499e8
+MISC ChangeLog 3415 SHA256 69d0afe760f9aeca3da4efaa6f4f9e2dac5b806d6da91609b9e92bb6662e8c56 SHA512 267d64daee3f47ce39aa10dd244fa460aecf7be6d91a427e3b50a084c33260793dcff7215adc93708b0e0b8bf2dd974abbfba759f06188520285c51ceb7743b9 WHIRLPOOL 58ccc1c20109fa3158062f0d8d7e05638781fcf035337455a7bd7bde0d38fb75dfda4651ee3f6c6bbe31df4b013383827470812ffbcc05d2e945d948bf89e683
 MISC metadata.xml 580 SHA256 40569b730120c91e8c9869880af5bf4c74325eb578558227c315965467af21be SHA512 39c6e355a983d77c3c5a3b441665ba6cc0632a64b2a138667899da244aa3837ff437da9a33e45a5b82780361046c690dbe5397e4e4d91bcd6efd40d91092c09e WHIRLPOOL d85bc4e8019391336ec9d161a234f645302b056bb1dd9a3ec31c4df6d6227e8c9a8f69efa287e385d4df01c2278959580aed533700a3f70f03930a910571ce1e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUcguNAAoJEH/rgyzyU9sVOMEP/i2rGFlkBvtjETP+Y7zj10DX
-Y0vudmn9997CJkhdUT8rc3ImWgpLdnDOPmXXI+Qiu26xkCqooFq4UEV1XBcrqThq
-08hd7H7RXnryh3qyJHwFvOmZgPqglv2T7GvQv2PKoGmHBa1usVxI/5oIOv7WEKno
-ggwN6Jxfy42fKGejdJKA/b9R658Tc2tiCwEuQaPbAIxmjEi31vC/RKBf/qCcAuB7
-B1Wb6z16p+CSNzx/uA8qPx63nCayA3Id8M+DnxfhZnGa6coIqn+ubwmbduDRry0M
-3zGBCJybvzJarMgAlgZP7aCuU3h3Fe3Kq+hk976AXA6MM7leu+ZZ+qeMS13PzAFR
-ZHjBOJGhQecodritMb2QKuG5gzGlSwKLTEYfiFufcxrHGLoH9PYckhzcsizL5tTn
-U3Dhx/RU15nv0K8dbHnihc5oOitl4xEFDbPa2fyPhh6VYgT0+ScEYXg9QY6tzecg
-qHEFYk6kxpUXS3E4vHg1/BAwdihpZcMDohdgsB7EQnugKT58kROGRhJ0vVoxtElc
-Ts4+C8iCivkmhRCDZsEjN4XBQlV79DQ37H+ZjPdQKoITf38oUuWZaPR7l4mKqy9b
-ao2iKgG6xMoTOCOIIRZ1ust6W4BE9Qs9BOIwLPIjOXmDGZ4k5XcEbizxiRBGitfX
-e1hPSwyUhHfabUoRtZzc
-=p6hP
------END PGP SIGNATURE-----
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8-initd b/net-im/pyaim-t/files/pyaim-t-0.8-initd
deleted file mode 100644
index 1e944c22e5fb..000000000000
--- a/net-im/pyaim-t/files/pyaim-t-0.8-initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pyaim-t/files/pyaim-t-0.8-initd,v 1.2 2011/08/24 18:41:53 hanno Exp $
-
-depend() {
-	need net
-	use jabber-server
-}
-
-start() {
-	ebegin "Starting AIM Jabber Transport"
-	start-stop-daemon --start --pidfile /var/run/jabber/pyaim-t.pid -u jabber -g jabber \
-		--exec /usr/bin/python INSPATH/pyaim-t.py -- \
-		-b -c /etc/jabber/pyaim-t.xml -l /var/log/jabber/pyaim-t.log
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping AIM Jabber Transport"
-	start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pyaim-t.pid
-	eend $?
-}
diff --git a/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild b/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
index 3dbbb254487e..a88d517f316d 100644
--- a/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
+++ b/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild,v 1.3 2014/11/23 16:28:10 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild,v 1.4 2014/11/23 16:51:53 mrueg Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="webinterface"
 
 DEPEND="net-im/jabber-base"
@@ -43,9 +43,9 @@ src_install() {
 	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"
+		"${ED}/etc/jabber/${PN}.xml" || die
 
 	newinitd "${FILESDIR}/${PN}-0.8-initd-r1" ${PN}
-	sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" "${ED}/etc/init.d/${PN}"
+	sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" "${ED}/etc/init.d/${PN}" || die
 	python_fix_shebang "${D}$(python_get_sitedir)/${PN}"
 }
diff --git a/net-im/pyaim-t/pyaim-t-0.8.0.1.ebuild b/net-im/pyaim-t/pyaim-t-0.8.0.1.ebuild
deleted file mode 100644
index 263d9688f0c0..000000000000
--- a/net-im/pyaim-t/pyaim-t-0.8.0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pyaim-t/pyaim-t-0.8.0.1.ebuild,v 1.6 2014/08/05 18:34:18 mrueg Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit eutils python
-
-MY_P="pyaimt-${PV}"
-DESCRIPTION="Python based jabber transport for AIM"
-HOMEPAGE="http://code.google.com/p/pyaimt/"
-SRC_URI="http://pyaimt.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-core-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.patch"
-}
-
-src_install() {
-	local inspath
-
-	inspath=$(python_get_sitedir)/${PN}
-	insinto ${inspath}
-	doins -r data src tools
-	newins PyAIMt.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
-	dosed \
-		"s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \
-		/etc/jabber/${PN}.xml
-	dosed \
-		"s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
-		/etc/jabber/${PN}.xml
-
-	newinitd "${FILESDIR}/${PN}-0.8-initd" ${PN}
-	dosed "s:INSPATH:${inspath}:" /etc/init.d/${PN}
-}
-
-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."
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}