Fix multilib-strict failure of 0.9.1, thanks to mrueg@ for the patch

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

3 files changed, 86 insertions, 5 deletions

diff --git a/net-im/prosody/ChangeLog b/net-im/prosody/ChangeLog
index 57f29ccb4067..50a32c0245f7 100644
--- a/net-im/prosody/ChangeLog
+++ b/net-im/prosody/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/prosody
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.28 2013/09/16 16:41:37 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.29 2013/09/16 21:54:02 klausman Exp $
+
+*prosody-0.9.1-r1 (16 Sep 2013)
+
+  16 Sep 2013; Tobias Klausmann <klausman@gentoo.org> +prosody-0.9.1-r1.ebuild:
+  Fix multilib-strict failure of 0.9.1, thanks to mrueg@ for the patch
 
   16 Sep 2013; Tobias Klausmann <klausman@gentoo.org> prosody-0.9.1.ebuild:
   Rekeyword prosody-0.9.1 and make luasocket dep USE-conditional
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index edf6ca8f98bb..d3e6b2945f28 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -11,13 +11,14 @@ DIST prosody-0.9.1.tar.gz 265755 SHA256 6cdea6fd6027bec621f7995709ca825a29aa5e06
 EBUILD prosody-0.8.1.ebuild 2259 SHA256 da20797786878fe3c0f23fb8a51bfa100457e9a66956bfc570c9593cea370d3e SHA512 75a042dd41aea1cb710880b3d53934a5d53cce7dd95762c7821fbcfb8af15d41b19ef5670a8eb7b753a08cfe7a3677cf8f7b3ea55cc4862b7fb93e4df035c9ce WHIRLPOOL 46b074b9d85cdd7dd027e7824d453ef725f1ada81a75a3cd7ff673d94a6f10d9ecb6e5486cda423522ce678f59294712b82b084b81506684cf09a9868f23139b
 EBUILD prosody-0.8.2-r1.ebuild 2476 SHA256 0be928ec2e09aa1a7d0f0a09785036423cd055b9eba088700de499d14b8e8889 SHA512 0fb865a018d7d9147f54c8807f4be41a915548990456e548703e2356c00e515e793fc79bee0e367c4daedf41da84ec3653a195de983dc2efc119bac33746e984 WHIRLPOOL 1f36be7df4db1af88166d2ff93941e0ac46e093f39a1b864f87ab90ae06f63539880f4d1498c7c5d34f876bcd879bd92291db2b9e3f0cf90626adeff436b4c7d
 EBUILD prosody-0.8.2.ebuild 2252 SHA256 8922f551a4e3266e2bca385e40bb29b337f04b1c1fef84a6acfda6e5d9ed2f84 SHA512 0f6f4404b5e5935ab7acbd04bf47afc7bb5e18a73c41e4a9d5cfacf6826604413615e87a8bfb337f0fce591414e6b76170bd830aae44ba0d99963ea90690639f WHIRLPOOL ca7cc48e9aed487293012b71ba61e2c5c69f3026694f10919a1ed1658529d38290c81d4443dcc67ed3b052cb17b737b70a4bbabc194b90e5150de21df3c1f36b
+EBUILD prosody-0.9.1-r1.ebuild 2213 SHA256 3fdbcb11bc7e640a57210f612a98f7abcd11bb7fda87927ecc4ec38fec34fbf9 SHA512 e79d48fc3be634566cb3feaf50334507a53c1db103bdde3afa74ea74d0b8b5e0a2eef651ab9c3eb9c3ea3b374edc880cfb99ef7d13dfd2307c4a5843a3249041 WHIRLPOOL dcbb089c38b01aa5bb74bf95313537bff1832a88f047d34e019a36a6f49432febd889acf98b2fd517464c12dea53c072ea5fbdefe44e87d2d18e06a6aeb0e398
 EBUILD prosody-0.9.1.ebuild 1788 SHA256 772e1f67ba8c9804d2141e289328817f33a0253a68e6b93198a08b596def9b40 SHA512 62b5153a812fde2f76a80c71285f9d1a332ff8d2a50c3fc3850894ed199c4a5a5f2c4e1a0130691d333cb075b814b2ae304aa4e70917eff6e7f2c9976b360ff0 WHIRLPOOL 4ea0a3ad63a7bba358fd86d8e3fa7fa0f3063f8358c54057fe7c50c11eecf9abe72aa4d2ad27fd8a30cfbf436e5fb2eead76d85ab860cba64efad226c4b27576
-MISC ChangeLog 4203 SHA256 d2c756a60bb9845b363a555f78e1ac984fbf4f0d6578784a03eda74f9e676b73 SHA512 63a67ad764c05b12e17d21a55e65589b57cd70646d239906e7706d4fad1422f98cf20c0e66d5dd295b1154a45845f3f9ca09bbf23b9803d821bee98a1ecc61b8 WHIRLPOOL 6216be8e73039f48c87e63bf104800ae91295cc35a202cd314598c883039d6ea7ed747c39364912db7febda0fdfeebd7a581c6ea23caa5d3cf4b82b77ae3f1a4
+MISC ChangeLog 4388 SHA256 f07d753cac054ec2981eec3e90d376ae1c52ac8549088b6653ea75565a3bba61 SHA512 e298f01ae7978bd0a849b5b4c4508139ce5dafdb405744cb58c7acc70f153ffb634125d293ec3cebd43389e3e7d590a4650e2f2b31a6983462ee48b7337717f8 WHIRLPOOL 54f95915d5c3fd7a3ddb1ce759352c14ad204758878755145ccddb229079056b7975621d2b00e1c8cacf11d61adffa31e62938acb302b7f0c0b8c7c4a161d9ab
 MISC metadata.xml 453 SHA256 4ad3fa548a9b4ff3681b0e44f2bf912046cc629ee9d7ce0d97c69b30c7f05888 SHA512 aa72df7798f7182948d1e7c9f816d165c646a89fcfa046d4adc2c84fc10b0f5aad05801a326966dcd58daea7805d0ad5f8d633706fa79201f91808e41f3368c7 WHIRLPOOL dce4ed00e7c81372cd451fa1530d378b980f7400d559cf60e6e7d77076b261cc1f0b93a3eeb377ba549c5d45ece20e46f5e5a29b6d4419c453ad18f3cb99e2d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlI3NMcACgkQA+4Doc5dVOjJTACfa++CteFc6ZZLi5lPPpkLRzrL
-7FkAoJavhCCAziy9erBiHDMvj2CwIwg7
-=1TvP
+iEYEAREIAAYFAlI3fgEACgkQA+4Doc5dVOj9pQCfTMWbudkFkxtSlCtF3qHypnwF
+XeMAn1MmUz1PSE/NHi9Mf46F7EKLJyuD
+=X3m7
 -----END PGP SIGNATURE-----
diff --git a/net-im/prosody/prosody-0.9.1-r1.ebuild b/net-im/prosody/prosody-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..17ea0002a5e2
--- /dev/null
+++ b/net-im/prosody/prosody-0.9.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2013 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.1 2013/09/16 21:54:02 klausman 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"
+
+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 ${PN}
+}
+
+src_test() {
+	cd tests || die
+	./run_tests.sh || die
+}