Cleanup old. Add missing die. Fixes bug #471542.

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

7 files changed, 10 insertions, 213 deletions

diff --git a/net-im/pyicq-t/ChangeLog b/net-im/pyicq-t/ChangeLog
index 43ae4e5f2614..7c0a54a12bfc 100644
--- a/net-im/pyicq-t/ChangeLog
+++ b/net-im/pyicq-t/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/pyicq-t
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pyicq-t/ChangeLog,v 1.32 2014/11/23 16:46:54 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pyicq-t/ChangeLog,v 1.33 2014/11/23 16:48:33 mrueg Exp $
+
+  23 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -files/pyicq-t-0.8-initd,
+  -pyicq-t-0.8.1.5-r1.ebuild, -pyicq-t-0.8.1.5-r2.ebuild,
+  -pyicq-t-0.8.1.5-r3.ebuild, pyicq-t-0.8.1.5-r4.ebuild:
+  Cleanup old. Add missing die. Fixes bug #471542.
 
   23 Nov 2014; Manuel Rüger <mrueg@gentoo.org> pyicq-t-0.8.1.5-r4.ebuild:
   Mark stable on x86. Based on build testing by Myckel Habets.
diff --git a/net-im/pyicq-t/Manifest b/net-im/pyicq-t/Manifest
index d1235c7dc82b..4d064c066a54 100644
--- a/net-im/pyicq-t/Manifest
+++ b/net-im/pyicq-t/Manifest
@@ -1,12 +1,8 @@
-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-pillow-imaging.patch 1236 SHA256 cab74a08da743737a7ee5956e74eb3e40a279bb83d74729d59689c03ccc5d645 SHA512 e7e454493286e02e525cdc6d8b63fbb102eca0f242f046ec30f7541ff1a9579b43bad2250d34a7049d06c9958e4d93304d5f873b84cf2af6fbcaef726a8a5d5b WHIRLPOOL 3378a5dbc1b7502caa65c6e026a37427f32ca8ddffe924aa831c9f51f321605fcee01053a23cdab63ec8840eac5b09d80a3ab88f99e6e1bae656f3c25ff228ac
 AUX pyicq-t-0.8.1.5-python26-warnings.diff 3485 SHA256 6e5eff6faf6e87535401a4c697a4d23f35270ecfda1ac56ab73c491cc7baa34a SHA512 8b7cb353ff2c6259525909b62a6d552116339fe8489d747f7310fa9013011b6028c0f0dc165307ff5b9fe9da9517852c3e4158eb6f05a51f987e9cf2a969b949 WHIRLPOOL 387207927e4c0a68f0adeaf7cc3c8201aa0c21e4481e87ad776c7c9f2b45cfb0f7f190e2557f8c7a1f55960dc3831fca2e17109314605ca997da6d66e750f855
 AUX pyicq-t.service 223 SHA256 aef74fac046f4d9ba0beb84d9c8ac7cfcb69baadf7792707e9f7d53756aa826a SHA512 e1df68340f54bc6568308fefcc723323358c27b143cd3258f451ebf06e5f6ac0a7b66d7567543212e5924144164e0d9a2121fb96fa2721b234399a19127850c6 WHIRLPOOL 75ce17d110fa7084e323551eb4819f9407db11dae2a54e0d838447ddcedf7178189c27b46c859cda71a0b5e80dbae28bfb14bc5c9a32ca9ce1d8f538d3077c20
 DIST pyicqt-0.8.1.5.tar.gz 183865 SHA256 15ffa7b7d8f2d749492eec3b87bf64f8a429452282ca14e36ba5aee45b5322df SHA512 5b83adf86746c2af60bed2759c7d4e3a3839bea532e0882a6dc087aee5e0afa1320c6d2d2296a667ec45c5b36be879034f079fd30cef924e8db5f66a2f1d3fde WHIRLPOOL 91a51c81d32bc688d4ffb6f4623ae1efe7e5dc5d524b7fd2f519720dc81078d6547ea64a5311bcfcfae0ad77f8fe7ab933f5b63e3f2887fe4671c71b2a6848d9
-EBUILD pyicq-t-0.8.1.5-r1.ebuild 2297 SHA256 a282c9a8be0db77c51aaa5e045f4916643203569e7c5f39a0aa32670a5939b9e SHA512 08a2757a8cba4be563cba66c29391db660c90285c4a5219598ca3d9f370bc2701d3bc903ad025673dd7f261d4b60b203434e082b0389fa69c9993a8a26c991cb WHIRLPOOL 0ee3a39874b2144159b21b65c7ca83925a0f746793f157c1afc63486587a6141c9ea1b16ee008701b310a55816faeeae4b9a1961458492e71d405b52fec46ed7
-EBUILD pyicq-t-0.8.1.5-r2.ebuild 1649 SHA256 82c417eb27361643ad23eefe56e154c578ec2eb06389b00df9b2458c38af9515 SHA512 27fa64072e6691090917267f3e66058ba4fc9fd1dbc5c5a0b1ab406f9ac6c8197196a1554371174ba39f5d6107ece69a334ba077a7ca0eb2a3146d7a105534ea WHIRLPOOL 53e09c81613f217466d83699afaa583c45d65132898ddf3f3c730109985a6d3682487254d09883eade68ea9c1f009c7f3cd89e5d9dde7bad071e3d85f6a36cb7
-EBUILD pyicq-t-0.8.1.5-r3.ebuild 1644 SHA256 863bf7459f65786ceb97dac327a64ab7c1356bb27aab9cb7698aae3ada85ae08 SHA512 37db979bfdec7eccfef46f148d951961cc987122584fc622e5f41dfb1008b31e726c95d4b5a56e85df8a2e353a29f29f5d3c36cb6e82746555b954cfd99f2d59 WHIRLPOOL de0382044b7337b430f5c47313222af90fc0327e0c4c3475964d7aa47b60fd874f951173a8856cdc49714f2dbf2677e5da3417a9d37319a9da42fe3163bce55c
-EBUILD pyicq-t-0.8.1.5-r4.ebuild 1751 SHA256 3705772e78768d641deebf38638cb3a664916374b088be5273a32741ba14caa3 SHA512 0666f43fd433316f2cd3dd99f66c0aa4e6ee44ffb2cd8e763d30d82493bd48072a36a45525e2b878317da441085d2ba5aa016facdd440fde91b3f06efbc08617 WHIRLPOOL 4c248d507b1e0d3bb5bb5077398911d652243e76ff3feb843e8c29a93034e9e914add07899e4ff5c5d2bc33a7ea3179e914dda784e02e8529304df5b369359e7
-MISC ChangeLog 5348 SHA256 7bde95f221b91dd210776f4451c7074a7287ba687958ec7be4624c8d1759a434 SHA512 ad47616f18a835c64e450731593f422eb013673f65cd182e2c0a91ad0eb96a911933921160d252a8828484b99eb2a555aee8fd09e3fa381474ee48afac79a42b WHIRLPOOL 68c3e717888c697ab772e65db42f68973c618625840ca6806d666725a47bb260fc7bec53965832fce1e2c8a1abc17393bc3789c09bbd30a4a7ac3ca918c113bc
+EBUILD pyicq-t-0.8.1.5-r4.ebuild 1758 SHA256 2ba6b0bf29d32a3cd84967687a5b5c8d9e02f4fa6a445fdee0877586abf4ba91 SHA512 652998c3c1384ab945b6cfcc44632abc56201931182afc8ed9fc052aa8f217421c633e391a173d8b085b1550eed2d2dec522a6abcb6a522f5311f458de907991 WHIRLPOOL 13e4002d5f50bf1c9383f182da5c00b481f7b6c3e14c1b3b053cb1fedd08881a48198705622f1ef6eee1f2c822909b51cb71cb773c03161374be08f7b2d32776
+MISC ChangeLog 5589 SHA256 52878392414a35247aaa496bfe5b334470133c19b54435d37e17e78290a81d78 SHA512 4935cdb375b6f2bd276cd0265148f8b3452d012e7d6b8f23902bf8f29e3c98245f96daec31c70c9aa64bf7d16bdaf42a2b7304b5868212714b4ae4b70ab3bb67 WHIRLPOOL f9f333f940814c61efccdbf002ac2e4c7e95a1d166e3c7fc4d3fc5ebaf0fa6a7e92b5e4ea1f3e44189cadbc2eabbf1f68614dd04c8f206ad511419c92b7cfea7
 MISC metadata.xml 412 SHA256 ffea6006aefb0ca439a16fca2a9d9099293ba3c2e3e9eb2edfc5281197691674 SHA512 ae521283b485f07979b7349b7a7683ec53cc9a9e277242df77f0ccc459230b38e20898fc0e031550090dd79c7d5f5759fa96d1fab1fa2ec0af0b291dd719c5ed WHIRLPOOL 1924e0c2155d97142f1f347de412226f1180640c6726e7976499590c9ede6ceb0c5c347bf6ddb4d3879fcf93ef43323eee7f2677b3d185365678d88349a7c61b
diff --git a/net-im/pyicq-t/files/pyicq-t-0.8-initd b/net-im/pyicq-t/files/pyicq-t-0.8-initd
deleted file mode 100644
index 782b410232a8..000000000000
--- a/net-im/pyicq-t/files/pyicq-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/pyicq-t/files/pyicq-t-0.8-initd,v 1.3 2011/08/21 17:41:16 hanno Exp $
-
-depend() {
-	need net
-	use jabber-server
-}
-
-start() {
-	ebegin "Starting ICQ Jabber Transport"
-	start-stop-daemon --start --pidfile /var/run/jabber/pyicq-t.pid -u jabber -g jabber \
-		--exec /usr/bin/python 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
deleted file mode 100644
index 07102a73a9de..000000000000
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r1.ebuild
+++ /dev/null
@@ -1,78 +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/pyicq-t/pyicq-t-0.8.1.5-r1.ebuild,v 1.5 2014/08/05 18:34:14 mrueg 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-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.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}
-}
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r2.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r2.ebuild
deleted file mode 100644
index 3e99c977fd55..000000000000
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r2.ebuild
+++ /dev/null
@@ -1,52 +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/pyicq-t/pyicq-t-0.8.1.5-r2.ebuild,v 1.2 2014/08/05 18:34:14 mrueg Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit eutils python-single-r1
-
-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-core-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-words-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-web-0.5.0[${PYTHON_USEDEP}]
-	webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] )
-	virtual/python-imaging[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${P}-python26-warnings.diff"
-	"${FILESDIR}/${P}-pillow-imaging.patch"
-)
-
-src_install() {
-	python_moduleinto ${PN}
-	cp PyICQt.py pyicq-t.py || die
-	python_domodule pyicq-t.py data tools 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}/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:$(python_get_sitedir):" "${ED}/etc/init.d/${PN}"
-	python_fix_shebang "${D}$(python_get_sitedir)/${PN}"
-}
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r3.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r3.ebuild
deleted file mode 100644
index 741888a12b5e..000000000000
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r3.ebuild
+++ /dev/null
@@ -1,51 +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/pyicq-t/pyicq-t-0.8.1.5-r3.ebuild,v 1.2 2014/08/05 18:34:14 mrueg Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit eutils python-single-r1
-
-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-core[${PYTHON_USEDEP}]
-	dev-python/twisted-words[${PYTHON_USEDEP}]
-	dev-python/twisted-web[${PYTHON_USEDEP}]
-	webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] )
-	virtual/python-imaging[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-python26-warnings.diff"
-	epatch "${FILESDIR}/${P}-pillow-imaging.patch"
-}
-
-src_install() {
-	python_moduleinto ${PN}
-	cp PyICQt.py ${PN}.py || die
-	python_domodule ${PN}.py data tools 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>:" \
-		"${ED}/etc/jabber/${PN}.xml"
-
-	newinitd "${FILESDIR}/${PN}-0.8-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}"
-}
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild
index ee7b6bbfb2b0..b93a9eee97a7 100644
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild
+++ b/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.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/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild,v 1.3 2014/11/23 16:46:54 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild,v 1.4 2014/11/23 16:48:33 mrueg Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -43,7 +43,7 @@ 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}
 	systemd_dounit "${FILESDIR}/${PN}.service"