Version bump and cleanup of old versions

5 files changed, 11 insertions, 165 deletions

diff --git a/net-im/prosody/ChangeLog b/net-im/prosody/ChangeLog
index cdeb7cc38605..8a9570b477f7 100644
--- a/net-im/prosody/ChangeLog
+++ b/net-im/prosody/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/prosody
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.37 2014/08/05 18:34:13 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.38 2014/10/13 17:30:50 klausman Exp $
+
+*prosody-0.9.5 (13 Oct 2014)
+
+  13 Oct 2014; Tobias Klausmann <klausman@gentoo.org> -prosody-0.9.1-r1.ebuild,
+  -prosody-0.9.2.ebuild, -prosody-0.9.3.ebuild, +prosody-0.9.5.ebuild:
+  Version bump and cleanup of old versions
 
   05 Aug 2014; Manuel Rüger <mrueg@gentoo.org> prosody-0.8.2-r1.ebuild,
   prosody-0.8.2.ebuild, prosody-0.9.1-r1.ebuild, prosody-0.9.2.ebuild,
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index b131822210a8..bcaece235022 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -5,15 +5,11 @@ AUX prosody.initd.old 1212 SHA256 21bdef7e4346f35bff02463f75d102cd2023636a677958
 AUX prosody.service 237 SHA256 ad776a978a6f3b7f1b4075637f7d0ec1eb2e25fbc4245a2a8e13357e2e1bd960 SHA512 2802d8802f5c9bac780752e6fbd54f6b4227b425a9be1f5af1c068f60f5dec180d6d4d926dadaae95df8877fa7db97eca0d8f1786009f5e24e8ae2edf0ddabaf WHIRLPOOL b6dd33c626c65918e590f4a245eed46691ad3468afae8b7508ca5e019d0850678a10b7adbbc093cb84d40121f912d9a195c29fe36a7c4aeb81d5a3c8abce35de
 AUX prosody.tmpfilesd 38 SHA256 58af4b6cd2555f26ee6dd7abe9452933d46dc0f8aa1491fd170499c40da017a5 SHA512 a3e067a905b3f0221077fee7d2acb709082e464892981fac316e5fde204150ab922e76ead75881c0f1aa925219d62b966756f75dc68406d8af27f7cd883dd4bc WHIRLPOOL c097006046add8f8e29960e70f81e8bbe54521aaa35f885d8bb915467b1ffc95ecfe893562e3a0e37c327cce4d47ca12ff8c8bf3cdea9df65dd640b578edb006
 DIST prosody-0.8.2.tar.gz 212170 SHA256 d0315150f8487fc960adf56ce057985428679975f9c6f3fcf424832d24eaae60 SHA512 7540d5ff36508158e45804ceb7db3148a6cdb90c7db6946af625d0ab9cbee96385e3c0387ea099446a7bfa11d582546060cf1e882ce08c8be5b165c277bedf6e WHIRLPOOL 5c63e36408483910810a04ad51565528948fec73dde3755c409e8263b86d6d9c3e1b142da5f7167a355624c98b6a3bbde3dac81cab0713335a62305696eac991
-DIST prosody-0.9.1.tar.gz 265755 SHA256 6cdea6fd6027bec621f7995709ca825a29aa5e066b321bfbb7785925c9f32cd5 SHA512 dbd0d8476f0abb4030f8c1ac68786cde2dd68bc2e6602ba8ea27b7d23f2010f963dd3ff50e0a6e7780bddfba014c7bbd1fa0c607d070d979131c15431e04c3fa WHIRLPOOL b07ff97008207a24e00ed051f6c7bab77200b8ae6c4b2cec95cdca25c1227600075e7cd240ed57f7cb07764239e72d545002e976c794f9434d13b0597d35ad61
-DIST prosody-0.9.2.tar.gz 264196 SHA256 a2df64d23b7853a9f03126750d33b98193c93b8331b2622d9ebf1fe54f8feb2d SHA512 05d6af08a51d2c347344d6f08e0d582bb7710129c3c7dd5576906bc5a5d7b9631ced390d1b4cca6a6723153d185a8a560f45be2c9af11fe6e974b83f1403953a WHIRLPOOL 05e796ff61449b6942077d5cef35bb7bbd8128b5cc498e85f7ea8e5475058d71fc4c7739482966ded8956873a5fb890ce65eaf367089565a5edbab7760d40f99
-DIST prosody-0.9.3.tar.gz 264318 SHA256 22d2427fae4858d15b4f695348fb7781e4c65c04a24171837985024e76799ea0 SHA512 ebe3bb246bcaf3ac4ec49cdf9e5c301efdcf8e464b8b4c9e68c7d2dbc37233964341d54b33fbb6154a7d2f59338f75056cdd1af162fb86f4f400f7f384c021b4 WHIRLPOOL 89752171fecf4880d2e8a34455df99055a4425da5d4a2109ad0921d7947a3903631f2695c13d4deca54e5fc7799944684e8529db0b88ead789bef03473ca8344
 DIST prosody-0.9.4.tar.gz 265898 SHA256 be87cf31901a25477869b4ebd52e298f63a5effacae526911a0be876cc82e1c6 SHA512 9bba454caf50ed590dc18febd1a739f35e850805ac19e9a2e822ce3b39306a4f6d67162a49b11baa7e4f575b19e954dfd91f984780a724f6e0c69202947ca94c WHIRLPOOL 0fea677b105c0b8fd849bd05cd71b702355c87d9375990e6884230f8bbb3d577a8dc68b7c829d9a9a917ef249882cb4cf740953f7db1eba59e7f3e4cabfe8291
+DIST prosody-0.9.5.tar.gz 266335 SHA256 76fc61a02781c901efeddc5341bea339dd4350dee8ceb73c8ed28dee75ab9bbd SHA512 8774b4ce6b3505da8459edf52bd82dd78a132799986734da858a3c8ad9af043c493fd53ff1b46bdd60d296b5722ed174d8f89bb48a1f8934836e222147e58d43 WHIRLPOOL f8ac8c3a265534c8c061567b478071b90fa8505fdae9bf45e418573b9d65baac42327dc0cbbb76b17a3be266750318969e538e1f7e628c28505ceb803ef7a897
 EBUILD prosody-0.8.2-r1.ebuild 2476 SHA256 2a88a3ff47ef877ad819efd56d4567d22d34e4b73f932d5f47cae82f7ff9e971 SHA512 9d13a2fbdd20253a919ba73cbd38d6ed1cc42de88bfe3f97c81c26334f6600c9f0cf26d5927144c8bf886767f34187bbf4d0edbf56934c5ac573159dd7ef17a0 WHIRLPOOL 3de944f3fa9328fc4b34aa771e04666043a90c35436c5b04b12dd2e6af6a06b3f79062a62351309f41630c50e55022410dddb667ba305cff52a7eb9b1353d4ed
 EBUILD prosody-0.8.2.ebuild 2257 SHA256 f347a0a0abd06c34ba14bba5cb312288b6178fd269d6d3f66d89fec89e7d4aab SHA512 e738b6a19c8bcf5859834967cdf6957517c47e45608a2d37dbc543b2bd4504cd5eb14a7bd85f44d75c95d59f0127229044ab9ad091be489b583da47d5c3dbdd9 WHIRLPOOL 1156154ba6034775c08bc3f3be6ef7b631a600ef801392cf2d66ba822872ace723a576118b9dc67640c6a7b05e2b6add468828b6407456f269d25ad578620525
-EBUILD prosody-0.9.1-r1.ebuild 2229 SHA256 f6c3f4c71778da62b1a21120b9dcc2aa02dcc85953e07d16807976877ad2647c SHA512 837d48017ca9548f3265bb407a9ff20c4ab23fbfb450d2bb52d34640716fe3b8308393057881cb88d493ea09aabfeb50b5dd562d731fc21ec2f1ae1dea4afe41 WHIRLPOOL 5993c93cbefb5887a5ec779259f554d6761263e94d087d2864685864bea0b1193bfe5ddbb7240913cc757b34d293a6b08f3d3d2c039f337566c838b9efee7d93
-EBUILD prosody-0.9.2.ebuild 2364 SHA256 7f8bd26e9e09fa47cea28b7bc7093d75d3705636b3d04cd5fb5a6db5afa2e0e4 SHA512 77fc435a497e539b248e451ff204eba884a23c4b2b15a09f500bd615586c662d90914511b37ccae27765b08c04b330257a2cc19b21bdc57b359bcfa5168705dd WHIRLPOOL bf0cee4a32b86e3d3f1cc043a64868b4c7faf91eb3a75260e651149a7085e2e1d2fc570dcb1e4f1265837628ff195e56762b2bd6ef53ea67f47fc3b754cc605f
-EBUILD prosody-0.9.3.ebuild 2364 SHA256 9d2dbf07135af1c760decb3a9f29ba02bf3fd8781fd7489d2c8a79e6390767f4 SHA512 cd9530dea31434cfc44c945212b2dc4a23031f55bd545ab87af6b764533ea94717db1c7242f5a35fcca62df0521afbb0be52cb1bc5308ff8e9dd8e6f8e4ee0c0 WHIRLPOOL cb2e3d42c3fc638a36ea84a506f3d008cfe6a89b123e0b961a9b0ca6d3fe360e60c5fd2988da143203ec5e852efeae482cdb7d3f2c8e4bfe1757d11daac0519d
 EBUILD prosody-0.9.4.ebuild 2372 SHA256 5e2316797f7c68e8eafc63f36d347396a63ac5b15039b9fdd05929d7d905d2ef SHA512 e21158cd6c0d4580f4125c60db5eea3888bdbd326d27f7c4cdd94b71fce48de1e68ff58b6fdc0138e15d250a1274d9b024cdbd60148a4736d5fe121b216f6f5d WHIRLPOOL 5c9ad41046ad5b0fba96ba0eb1a6b2eb95bfcbd0334360cfad6f4812f9c03c06e0ebc6bee377a71cf3cfa0e51f9ca443e25d8e8191fe5f6bb83a65422aecf100
+EBUILD prosody-0.9.5.ebuild 2372 SHA256 5e2316797f7c68e8eafc63f36d347396a63ac5b15039b9fdd05929d7d905d2ef SHA512 e21158cd6c0d4580f4125c60db5eea3888bdbd326d27f7c4cdd94b71fce48de1e68ff58b6fdc0138e15d250a1274d9b024cdbd60148a4736d5fe121b216f6f5d WHIRLPOOL 5c9ad41046ad5b0fba96ba0eb1a6b2eb95bfcbd0334360cfad6f4812f9c03c06e0ebc6bee377a71cf3cfa0e51f9ca443e25d8e8191fe5f6bb83a65422aecf100
 MISC ChangeLog 5743 SHA256 e288575f0c622131aab2e9f8f8e807e939d9cb7f16c930246cb7c36fa7185751 SHA512 2b56dc107642f7071245f37685306d98a095a9d5e4acf16c6286569fa79dfe672025f758ea1bb185b36215a69462bbe98cae9c4a779e156e32f8a71ba9386e07 WHIRLPOOL 00085150f848459676605913d9e9570ce3e15550771f5a4be9cb9d8fe76b7dcd29ce801cb358e6345d7c3796988af582d9ddab9423a554a2fa70e83b94641bb1
 MISC metadata.xml 582 SHA256 37a85a6873262c05dad46b1e54fcbd99827e443ab79490760355e85935ea0cb5 SHA512 7b724b38a4e4e30e0781b8d5e1778c87de713caf8851cab64eced4c8100b31471a5f8e19428b4c8ab8aec8a99d630ba4cac44ecfba296c9931262328be0f6b66 WHIRLPOOL ddbe571844606be360db32468b1ddebda0917e0488096a67881b4898ff226ca5292e055780aedac4cb5c23fc9f55f7c4e16c5da6fdf02a3f4cb4afac311af64b
diff --git a/net-im/prosody/prosody-0.9.1-r1.ebuild b/net-im/prosody/prosody-0.9.1-r1.ebuild
deleted file mode 100644
index 15e25de4b2b2..000000000000
--- a/net-im/prosody/prosody-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,75 +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/prosody/prosody-0.9.1-r1.ebuild,v 1.4 2014/08/05 18:34:13 mrueg Exp $
-
-EAPI=5
-
-inherit flag-o-matic multilib versionator toolchain-funcs
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
-HOMEPAGE="http://prosody.im/"
-SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ipv6 libevent mysql postgres sqlite ssl zlib"
-
-DEPEND="net-im/jabber-base
-		>=dev-lang/lua-5.1
-		>=net-dns/libidn-1.1
-		>=dev-libs/openssl-0.9.8"
-RDEPEND="${DEPEND}
-		dev-lua/luaexpat
-		dev-lua/luafilesystem
-		ipv6? ( >=dev-lua/luasocket-3 )
-		!ipv6? ( dev-lua/luasocket )
-		libevent? ( >=dev-lua/luaevent-0.4.3 )
-		mysql? ( dev-lua/luadbi[mysql] )
-		postgres? ( dev-lua/luadbi[postgres] )
-		sqlite? ( dev-lua/luadbi[sqlite] )
-		ssl? ( dev-lua/luasec )
-		zlib? ( dev-lua/lua-zlib )"
-
-S=${WORKDIR}/${MY_P}
-
-JABBER_ETC="/etc/jabber"
-JABBER_SPOOL="/var/spool/jabber"
-
-src_prepare() {
-	sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
-		-e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
-		-e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
-		-e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
-		 Makefile || die
-}
-
-src_configure() {
-	# the configure script is handcrafted (and yells at unknown options)
-	# hence do not use 'econf'
-	append-cflags -D_GNU_SOURCE
-	./configure \
-		--ostype=linux \
-		--prefix="/usr" \
-		--sysconfdir="${JABBER_ETC}" \
-		--datadir="${JABBER_SPOOL}" \
-		--with-lua-include=/usr/include \
-		--with-lua-lib=/usr/$(get_libdir)/lua \
-		--cflags="${CFLAGS} -Wall -fPIC" \
-		--ldflags="${LDFLAGS} -shared" \
-		--c-compiler="$(tc-getCC)" \
-		--linker="$(tc-getCC)" \
-		--require-config || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newinitd "${FILESDIR}/${PN}".initd.old ${PN}
-}
-
-src_test() {
-	cd tests || die
-	./run_tests.sh || die
-}
diff --git a/net-im/prosody/prosody-0.9.3.ebuild b/net-im/prosody/prosody-0.9.3.ebuild
deleted file mode 100644
index 4d52c2296e46..000000000000
--- a/net-im/prosody/prosody-0.9.3.ebuild
+++ /dev/null
@@ -1,81 +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/prosody/prosody-0.9.3.ebuild,v 1.2 2014/08/05 18:34:13 mrueg Exp $
-
-EAPI=5
-
-inherit flag-o-matic multilib versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
-HOMEPAGE="http://prosody.im/"
-SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit"
-
-DEPEND="net-im/jabber-base
-		!jit? ( >=dev-lang/lua-5.1 )
-		jit? ( dev-lang/luajit )
-		>=net-dns/libidn-1.1
-		>=dev-libs/openssl-0.9.8"
-RDEPEND="${DEPEND}
-		dev-lua/luaexpat
-		dev-lua/luafilesystem
-		ipv6? ( >=dev-lua/luasocket-3 )
-		!ipv6? ( dev-lua/luasocket )
-		libevent? ( >=dev-lua/luaevent-0.4.3 )
-		mysql? ( dev-lua/luadbi[mysql] )
-		postgres? ( dev-lua/luadbi[postgres] )
-		sqlite? ( dev-lua/luadbi[sqlite] )
-		ssl? ( dev-lua/luasec )
-		zlib? ( dev-lua/lua-zlib )"
-
-S=${WORKDIR}/${MY_P}
-
-JABBER_ETC="/etc/jabber"
-JABBER_SPOOL="/var/spool/jabber"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.9.2-cfg.lua.patch"
-	sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
-		-e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
-		-e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
-		-e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
-		 Makefile || die
-}
-
-src_configure() {
-	# the configure script is handcrafted (and yells at unknown options)
-	# hence do not use 'econf'
-	append-cflags -D_GNU_SOURCE
-	luajit=""
-	if use jit; then
-		luajit="--runwith=luajit"
-	fi
-	./configure \
-		--ostype=linux $luajit \
-		--prefix="/usr" \
-		--sysconfdir="${JABBER_ETC}" \
-		--datadir="${JABBER_SPOOL}" \
-		--with-lua-include=/usr/include \
-		--with-lua-lib=/usr/$(get_libdir)/lua \
-		--cflags="${CFLAGS} -Wall -fPIC" \
-		--ldflags="${LDFLAGS} -shared" \
-		--c-compiler="$(tc-getCC)" \
-		--linker="$(tc-getCC)" \
-		--require-config || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newinitd "${FILESDIR}/${PN}".initd ${PN}
-}
-
-src_test() {
-	cd tests || die
-	./run_tests.sh || die
-}
diff --git a/net-im/prosody/prosody-0.9.2.ebuild b/net-im/prosody/prosody-0.9.5.ebuild
index e6332de4d249..2c758fce9962 100644
--- a/net-im/prosody/prosody-0.9.2.ebuild
+++ b/net-im/prosody/prosody-0.9.5.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/prosody/prosody-0.9.2.ebuild,v 1.2 2014/08/05 18:34:13 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.9.5.ebuild,v 1.1 2014/10/13 17:30:50 klausman Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ DEPEND="net-im/jabber-base
 		>=net-dns/libidn-1.1
 		>=dev-libs/openssl-0.9.8"
 RDEPEND="${DEPEND}
-		dev-lua/luaexpat
+		>=dev-lua/luaexpat-1.3.0
 		dev-lua/luafilesystem
 		ipv6? ( >=dev-lua/luasocket-3 )
 		!ipv6? ( dev-lua/luasocket )