Version bump to 0.9.7, bug 525782

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xCE5D54E8

3 files changed, 98 insertions, 6 deletions

diff --git a/net-im/prosody/ChangeLog b/net-im/prosody/ChangeLog
index 47292d68fc75..6d42be97ec16 100644
--- a/net-im/prosody/ChangeLog
+++ b/net-im/prosody/ChangeLog
@@ -1,6 +1,11 @@
 # 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.43 2014/11/14 21:25:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.44 2014/12/11 10:01:09 klausman Exp $
+
+*prosody-0.9.7 (11 Dec 2014)
+
+  11 Dec 2014; Tobias Klausmann <klausman@gentoo.org> +prosody-0.9.7.ebuild:
+  Version bump to 0.9.7, bug 525782
 
   14 Nov 2014; Markus Meier <maekke@gentoo.org> prosody-0.9.4.ebuild:
   arm stable, bug #511532
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 8e399b0143d5..691178c2f396 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -11,17 +11,21 @@ AUX prosody.tmpfilesd 38 SHA256 58af4b6cd2555f26ee6dd7abe9452933d46dc0f8aa1491fd
 DIST prosody-0.8.2.tar.gz 212170 SHA256 d0315150f8487fc960adf56ce057985428679975f9c6f3fcf424832d24eaae60 SHA512 7540d5ff36508158e45804ceb7db3148a6cdb90c7db6946af625d0ab9cbee96385e3c0387ea099446a7bfa11d582546060cf1e882ce08c8be5b165c277bedf6e WHIRLPOOL 5c63e36408483910810a04ad51565528948fec73dde3755c409e8263b86d6d9c3e1b142da5f7167a355624c98b6a3bbde3dac81cab0713335a62305696eac991
 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
+DIST prosody-0.9.7.tar.gz 266638 SHA256 dd4b99b39976442055898c933c013598e558beed11d7795d76ffc0f1a87e2e00 SHA512 fc1f0855e7af2132058af493bb9af20f9f1aa3051e6d8550ba9942264d85dc6840085b17e2a0226d4015745407f445c691455d998c4a43a3a9aa2d036a01ce9e WHIRLPOOL 5de40437be364856acbcaa2553aa54119bd46ed0afda9127211ff65ad9b4acea8b7a447452c7555ecfb9a58266cca319ecc2eb2a4959cb4e2390dc99dcf20b82
 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.4.ebuild 2371 SHA256 a316f74d2f2c8361cea2ac15cc1589f9d6cb5cb16ec529e3d719f9e13744e58f SHA512 0273f443ceca6c3dfc73703f691534417fec92e4923dbd980d11fdc89f0d4eaaa4ce5f044474dede935f486bcdb443248c4f76c5d1811abbd418caa0a0231e8a WHIRLPOOL 726a04ddbf147b599ff1e3f6537574fce59d7bae5c0b7a13671827a52f8d2e2603f1716b4a1abae0d33efb831c87e5c19a5f77384ae0e1774b142b246e476cf2
 EBUILD prosody-0.9.5-r2.ebuild 2498 SHA256 668f0d4f4e7c68d49265913544f8994af0fc92e25e7d393f3038cf27548628a5 SHA512 47afc488cbcce0d6b499064c34305e187ae4a96c8b684aadc4db6a37867c7572d5f1db2f7d080cf361eae903856e55bb203c0c4f2c8dcb355b8fa7a40d10a53d WHIRLPOOL 86dac4d4bbeaa9416226fe09f0fe82d6f55ac3a63657794af81356c906f68c862c97cdeb4c1b45fb550e91346cf0c895220787b089741cd9239cfb0142fcff69
 EBUILD prosody-0.9.5.ebuild 2375 SHA256 44a62c0f040cc2e042dab15227f733a63f0d9482e4327a99474d6a2f815580a0 SHA512 02d4165006ca05bf5b10f1aa43fed1b20d8044230867c4111058aea68c71bff195e7b9d815b7c282d342bad134d80a54278fea6faca0fc9d2dd72db6d2227ae5 WHIRLPOOL f5746712d6429cc6579530d537e68807e7a5b7f63135442f10b2a413c3e8024aec81e1f02da76c5d4c14c45695a70a5c9a284e3365d0f0647a815f3aba8344b3
-MISC ChangeLog 6793 SHA256 a5399011a7563dbcb8db5ff73e3938d9c4caaa6507b969de4e57dad8c34be894 SHA512 22f4353fde3645c805becfa74ca416f2c448933a22626a597ad94cc35219b1ddab5455be8567d7e620b1aaf503e410be04e4178b07a9ce10ea49d9b675d35c19 WHIRLPOOL 0b194c6be965042e7795c058b320794bd23bd136d14c73d486629a0680b78a076ecebadd9df97bd8e2822e8b11a4114e8db02cbe2c1e0cb63d64847015bf82b5
+EBUILD prosody-0.9.7.ebuild 2495 SHA256 c4a108c158d15e4d8de7e4b059265170fd9eb3901c62838e69533df64d94c10f SHA512 a9ff37af9d4f552d873b342cbc528cb648223bce5365f9b74019b4b155b9920a2b693cbdaf5974e2da1202b391d019f5f9d6a4d6015523bbaf0022fb6c01a9b6 WHIRLPOOL 1ff7d062dc00229969d1a03299a61791b9b315bfbdc8a64e0f56b90f7544fc455c375311d831e4fe64fbea2a1417e090195a322b630201ef76a811a3a40880b2
+MISC ChangeLog 6939 SHA256 2a084f6b55dee3ac9dbd9419f17c73419522831d0a086acf05144ce934bfcad9 SHA512 6895d615e78052025cfe5feed8a920467cfe280c1460db757accab4d35fc4612a925ec0d485eb9a39427225cfa727fcb6018170f1a40e25bd1279cca3878994c WHIRLPOOL 4e73b1bf66d7eda9ce3f42a3b075a72bc834669c877a669422907756cbb75b29807fddfcfb123010468e9f9b57b1cec877e1ae1e2e86fec4671b57b5de525884
 MISC metadata.xml 582 SHA256 37a85a6873262c05dad46b1e54fcbd99827e443ab79490760355e85935ea0cb5 SHA512 7b724b38a4e4e30e0781b8d5e1778c87de713caf8851cab64eced4c8100b31471a5f8e19428b4c8ab8aec8a99d630ba4cac44ecfba296c9931262328be0f6b66 WHIRLPOOL ddbe571844606be360db32468b1ddebda0917e0488096a67881b4898ff226ca5292e055780aedac4cb5c23fc9f55f7c4e16c5da6fdf02a3f4cb4afac311af64b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlRmc04ACgkQkKaRLQcq0GIsBACgtZIqPd5ZVi5cSkGiFwF+rH4v
-9IoAoIVZjpgAqHcMFd5GqDZXbx0sshoN
-=7bh1
+iKYEAREIAGYFAlSJa2xfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
+RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOh1lACfbWSK4YAPg8B+Sad1vW70YFIa
+KyoAnA+pGhZlHyuIpz4yyopMMWfnI8Mb
+=5qAQ
 -----END PGP SIGNATURE-----
diff --git a/net-im/prosody/prosody-0.9.7.ebuild b/net-im/prosody/prosody-0.9.7.ebuild
new file mode 100644
index 000000000000..51c76f1c63a1
--- /dev/null
+++ b/net-im/prosody/prosody-0.9.7.ebuild
@@ -0,0 +1,83 @@
+# 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.7.ebuild,v 1.1 2014/12/11 10:01:09 klausman Exp $
+
+EAPI=5
+
+inherit flag-o-matic multilib systemd 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-1.3.0
+		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
+	systemd_dounit "${FILESDIR}/${PN}".service
+	systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
+}
+
+src_test() {
+	cd tests || die
+	./run_tests.sh || die
+}