Add optional zlib dep (bug 360683).

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

4 files changed, 83 insertions, 6 deletions

diff --git a/net-im/prosody/ChangeLog b/net-im/prosody/ChangeLog
index 06dbf0afe1fb..5668bc1bd155 100644
--- a/net-im/prosody/ChangeLog
+++ b/net-im/prosody/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/prosody
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.11 2011/04/08 17:43:04 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.12 2011/05/02 16:55:02 djc Exp $
+
+*prosody-0.8.0-r1 (02 May 2011)
+
+  02 May 2011; Dirkjan Ochtman <djc@gentoo.org> +prosody-0.8.0-r1.ebuild:
+  Add optional dependency on lua-zlib, for XMPP compression (bug 360683).
 
   08 Apr 2011; Dirkjan Ochtman <djc@gentoo.org> -prosody-0.6.2.ebuild,
   -files/prosody-0.6.2-cfg.lua.patch:
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 558c2e168d8d..7c1b551a0566 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -7,13 +7,14 @@ AUX prosody.initd 1148 RMD160 54de6d4b97600024cfd8624fa10240a1e0a430e8 SHA1 c75e
 DIST prosody-0.7.0.tar.gz 177412 RMD160 2e40b4f807b6120971c611f52d4df3264a82cbb9 SHA1 3f3a6c4f262a062a9c027cc843cd6827104fb8ba SHA256 a8b826805dd55282706c5683c2028899b3721eb0f84d3e35c0509a6c1bc32390
 DIST prosody-0.8.0.tar.gz 210945 RMD160 98817b1f40c6fd9ab402b70f73dae308e5990cdc SHA1 f20baab36bd2570825a24f49e0643cb9c2a65541 SHA256 0b9e39a6b555b4c848af288f27107e99b1480d9733556a2c9b3a9f249eba602d
 EBUILD prosody-0.7.0.ebuild 1876 RMD160 f8631649cb4227091f2841c89e1b74ca3ab4e5be SHA1 a9d0d51c9a07873d68dcfeaf7531df9589fa8830 SHA256 9de2b14209f491bb06b7bcc022b4769b1c2307fdbf4a2803e00a1293047f4282
+EBUILD prosody-0.8.0-r1.ebuild 2140 RMD160 f54b4f389c80b5a2dd011d65efca27ac6a09556e SHA1 95d5bbdcd7c681f77812d05f5028eaf0489df551 SHA256 20416c80dd14398f39f099bbb3f8326e6b460954dea3bc57ac50c810d1062cb6
 EBUILD prosody-0.8.0.ebuild 2103 RMD160 23b7a1912460520ef6fd35bec89723d7faddb963 SHA1 faa48a9d42ea84b778c4f3c93c8c4477cd2dead9 SHA256 e3738e1bc1507af7fbd375b4c01008153c61471015fe9f51bd0b6b99c34df944
-MISC ChangeLog 1842 RMD160 4031ca3ab657178a26616abaf074ff4daebfb9fd SHA1 663c912ee2d5137c1f6f394e8ab126c3b3689c91 SHA256 195c0560e59dace24aa6d9472431560e644d36f4640892a23fdf065b8a9b19da
-MISC metadata.xml 459 RMD160 22b5d27eab97180c5c5a68cf67979798a43c8d61 SHA1 2ce0f8789f38b4c075f35f7e89b6d89882fc69a9 SHA256 86ce1010600ab9a824c65c4ce39442ab59e2a39f8f2a40ce3967150b52e9d991
+MISC ChangeLog 2024 RMD160 9f7c7c19b15ceba1548e7cf14cdc37684eb7c2f5 SHA1 d05688debf99d44ab4b016b8ea8d823fc55aa502 SHA256 8534ba3a08d3538be60970107e31818de88d9ebe47e36fff82db64c319967661
+MISC metadata.xml 546 RMD160 047c855b9bf7a123aa9d005e7a78578fcd1201f6 SHA1 b619715c7a84415364db26824148076e6ccffec8 SHA256 09271ce5d626aa36c205cdda6ba157d7c5f9e0719d537e94b9ba3714bb11fd10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2fSTEACgkQxeMuLWsGW/t7sgCeLr5plhgODvvcTfOmir5U0vRZ
-Az4An2d0EYG14PBwh32Qf9drMStSrZBv
-=pn7o
+iEYEARECAAYFAk2+4e8ACgkQxeMuLWsGW/t45gCcCzkP+WL82c3x3loYRIydm1P8
+mhwAoLl9F5ght62rWMjRyaTz1uklA6ug
+=KbX8
 -----END PGP SIGNATURE-----
diff --git a/net-im/prosody/metadata.xml b/net-im/prosody/metadata.xml
index 9794ef0bd411..21dd9ae1deee 100644
--- a/net-im/prosody/metadata.xml
+++ b/net-im/prosody/metadata.xml
@@ -11,5 +11,6 @@
   <use>
     <flag name="libevent">Use libevent for event handling</flag>
     <flag name="sql">Require dev-lua/luadbi for SQL storage plugins</flag>
+    <flag name="zlib">Support for compressing XMPP streams with mod_compression</flag>
   </use>
 </pkgmetadata>
diff --git a/net-im/prosody/prosody-0.8.0-r1.ebuild b/net-im/prosody/prosody-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..4d45ee607ce8
--- /dev/null
+++ b/net-im/prosody/prosody-0.8.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.0-r1.ebuild,v 1.1 2011/05/02 16:55:02 djc Exp $
+
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs versionator
+
+MY_PV=$(replace_version_separator 3 '')
+DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua."
+HOMEPAGE="http://prosody.im/"
+SRC_URI="http://prosody.im/downloads/source/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libevent ssl sql 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/luasocket
+		ssl? ( dev-lua/luasec )
+		dev-lua/luaexpat
+		dev-lua/luafilesystem
+		sql? ( >=dev-lua/luadbi-0.5 )
+		libevent? ( dev-lua/luaevent )
+		zlib? ( dev-lua/lua-zlib )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+JABBER_ETC="/etc/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-${PV}-cfg.lua.patch"
+	sed -i "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" Makefile
+	sed -i "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" Makefile
+	sed -i "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!" Makefile
+	sed -i "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!" Makefile
+}
+
+src_configure() {
+	# the configure script is handcrafted (and yells at unknown options)
+	# hence do not use 'econf'
+	./configure --prefix="/usr" \
+		--sysconfdir="${JABBER_ETC}" \
+		--datadir="${JABBER_SPOOL}" \
+		--with-lua-lib=/usr/$(get_libdir)/lua \
+		--c-compiler="$(tc-getCC)" --linker="$(tc-getCC)" \
+		--cflags="${CFLAGS} -Wall -fPIC" \
+		--ldflags="${LDFLAGS} -shared" \
+		--require-config || die "configure failed"
+}
+
+src_install() {
+	DESTDIR="${D}" emake install || die "make failed"
+	newinitd "${FILESDIR}/${PN}".initd ${PN}
+}
+
+src_test() {
+	cd tests
+	./run_tests.sh
+}
+
+pkg_postinst() {
+	elog "Please note that the module 'console' has been renamed to 'admin_telnet'."
+}