From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D86ED1381F3 for ; Wed, 22 May 2013 21:56:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08DA8E0875; Wed, 22 May 2013 21:56:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 79B8DE0875 for ; Wed, 22 May 2013 21:56:24 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 60EC033E1D7 for ; Wed, 22 May 2013 21:56:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EFF7AE544B for ; Wed, 22 May 2013 21:56:21 +0000 (UTC) From: "Vadim A. Misbakh-Soloviov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Vadim A. Misbakh-Soloviov" Message-ID: <1369259760.4d9f60d2fb26eb73eb2fdf22b4350cab78bed121.mva@gentoo> Subject: [gentoo-commits] proj/lua:master commit in: net-im/prosody/ X-VCS-Repository: proj/lua X-VCS-Files: net-im/prosody/prosody-9999.ebuild X-VCS-Directories: net-im/prosody/ X-VCS-Committer: mva X-VCS-Committer-Name: Vadim A. Misbakh-Soloviov X-VCS-Revision: 4d9f60d2fb26eb73eb2fdf22b4350cab78bed121 X-VCS-Branch: master Date: Wed, 22 May 2013 21:56:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1857929b-f849-491b-8ce6-03f5f6494337 X-Archives-Hash: 32ef64b0e8b9bff05baef6d79ff73423 commit: 4d9f60d2fb26eb73eb2fdf22b4350cab78bed121 Author: Vadim A. Misbakh-Soloviov mva name> AuthorDate: Wed May 22 21:56:00 2013 +0000 Commit: Vadim A. Misbakh-Soloviov mva name> CommitDate: Wed May 22 21:56:00 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=4d9f60d2 [net-im/prosody] prosody ebuild fixes Signed-off-by: Vadim A. Misbakh-Soloviov mva.name> --- net-im/prosody/prosody-9999.ebuild | 68 +++++++++++++++++++++-------------- 1 files changed, 41 insertions(+), 27 deletions(-) diff --git a/net-im/prosody/prosody-9999.ebuild b/net-im/prosody/prosody-9999.ebuild index 9e6181c..db7b560 100644 --- a/net-im/prosody/prosody-9999.ebuild +++ b/net-im/prosody/prosody-9999.ebuild @@ -6,7 +6,6 @@ EAPI="5" inherit eutils multilib toolchain-funcs versionator mercurial -MY_PV=$(replace_version_separator 3 '') DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua." HOMEPAGE="http://prosody.im/" EHG_REPO_URI="http://hg.prosody.im/trunk" @@ -14,30 +13,38 @@ EHG_REPO_URI="http://hg.prosody.im/trunk" LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="+libevent mysql postgres sqlite +ssl +zlib +luajit ipv6 migration" - -DEPEND=" virtual/lua - net-im/jabber-base - luajit? ( dev-lang/luajit:2 ) - >=net-dns/libidn-1.1 - >=dev-libs/openssl-0.9.8" -RDEPEND="${DEPEND} - dev-lua/luasocket - ipv6? ( =dev-lua/luasocket-9999 ) - ssl? ( dev-lua/luasec ) - dev-lua/luaexpat - dev-lua/luafilesystem - mysql? ( >=dev-lua/luadbi-0.5[mysql] ) - postgres? ( >=dev-lua/luadbi-0.5[postgres] ) - sqlite? ( >=dev-lua/luadbi-0.5[sqlite] ) - libevent? ( dev-lua/luaevent ) - zlib? ( dev-lua/lua-zlib )" - -S="${WORKDIR}/${PN}-${MY_PV}" +IUSE="doc +libevent mysql postgres sqlite +ssl +zlib luajit ipv6 migration" + +DEPEND=" + || ( dev-lang/luajit:2 =dev-lang/lua-5.1* ) + net-im/jabber-base + luajit? ( dev-lang/luajit:2 ) + >=net-dns/libidn-1.1 + >=dev-libs/openssl-0.9.8 +" + +RDEPEND=" + ${DEPEND} + dev-lua/luasocket + ipv6? ( =dev-lua/luasocket-9999 ) + ssl? ( =dev-lua/luasec-9999 ) + dev-lua/luaexpat + dev-lua/luafilesystem + mysql? ( >=dev-lua/luadbi-0.5[mysql] ) + postgres? ( >=dev-lua/luadbi-0.5[postgres] ) + sqlite? ( >=dev-lua/luadbi-0.5[sqlite] ) + libevent? ( dev-lua/luaevent ) + zlib? ( dev-lua/lua-zlib ) +" + +S="${WORKDIR}/${P}" JABBER_ETC="/etc/jabber" JABBER_SPOOL="/var/spool/jabber" + +DOCS=( -r doc/ HACKERS AUTHORS ) + src_prepare() { epatch "${FILESDIR}/${PN}-0.8.0-cfg.lua.patch" sed -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" -i Makefile @@ -46,13 +53,16 @@ src_prepare() { sed -e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!" -i Makefile sed -e 's!\(os.execute(\)\(CFG_SOURCEDIR.."/../../bin/prosody"\)\();\)!\1"/usr/bin/prosody"\3!' -i util/prosodyctl.lua sed -e 's!\(desired_user = .* or "\)\(prosody\)\(";\)!\1jabber\3!' -i prosodyctl - use luajit && sed -e "s!\(/usr/bin/env\) lua!\1 luajit!" -i prosody -i prosodyctl } src_configure() { - use luajit && \ - myconf="--with-lua-include=$($(tc-getPKG_CONFIG) --variable includedir luajit)" || \ - myconf="--with-lua-include=$($(tc-getPKG_CONFIG) --variable includedir lua)" + local lua=lua; + + use luajit && { + myconf="--lua-suffix=jit" + lua=luajit; + } + # the configure script is handcrafted (and yells at unknown options) # hence do not use 'econf' ./configure --prefix="/usr" \ @@ -61,8 +71,10 @@ src_configure() { --datadir="${JABBER_SPOOL}" \ --with-lua-lib=/usr/$(get_libdir) \ --c-compiler="$(tc-getCC)" --linker="$(tc-getCC)" \ - --cflags="${CFLAGS} -Wall -fPIC" \ + --cflags="${CFLAGS} -Wall -fPIC -D_GNU_SOURCE" \ --ldflags="${LDFLAGS} -shared" \ + --runwith="${lua}" \ + --with-lua-include="$($(tc-getPKG_CONFIG) --variable includedir ${lua})" \ --require-config "${myconf}" || die "configure failed" } @@ -75,10 +87,12 @@ src_compile() { } src_install() { - DESTDIR="${D}" emake install || die "make failed" + default +# DESTDIR="${D}" emake install || die "make failed" newinitd "${FILESDIR}/${PN}".initd "${PN}" insinto /etc/logrotate.d newins "${FILESDIR}/${PN}".logrotate "${PN}" + use migration && ( cd "${S}/tools/migration" DESTDIR="${D}" emake install || die "migrator install failed"