From ebb29e9179ffe07939bdf12578ca7b8b7a4d640e Mon Sep 17 00:00:00 2001 From: Tobias Klausmann Date: Mon, 9 Oct 2017 15:44:13 +0200 Subject: net-im/prosody: Fix broken bitops dep for v0.10.0 Package-Manager: Portage-2.3.11, Repoman-2.3.3 --- net-im/prosody/metadata.xml | 1 - net-im/prosody/prosody-0.10.0-r1.ebuild | 83 +++++++++++++++++++++++++++++++++ net-im/prosody/prosody-0.10.0.ebuild | 83 --------------------------------- 3 files changed, 83 insertions(+), 84 deletions(-) create mode 100644 net-im/prosody/prosody-0.10.0-r1.ebuild delete mode 100644 net-im/prosody/prosody-0.10.0.ebuild diff --git a/net-im/prosody/metadata.xml b/net-im/prosody/metadata.xml index faabc3d40f1b..fa12c884ddaf 100644 --- a/net-im/prosody/metadata.xml +++ b/net-im/prosody/metadata.xml @@ -14,6 +14,5 @@ Use libevent for event handling Support for compressing XMPP streams with mod_compression Use LuaJIT instead of vanilla Lua - Add websocket support diff --git a/net-im/prosody/prosody-0.10.0-r1.ebuild b/net-im/prosody/prosody-0.10.0-r1.ebuild new file mode 100644 index 000000000000..d93d0e7b645a --- /dev/null +++ b/net-im/prosody/prosody-0.10.0-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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 libressl" + +DEPEND="net-im/jabber-base + dev-lua/LuaBitOp + !jit? ( >=dev-lang/lua-5.1:0 ) + jit? ( dev-lang/luajit:2 ) + >=net-dns/libidn-1.1 + !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )" +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.10.0-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="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/lib64" \ + --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)" || 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 +} diff --git a/net-im/prosody/prosody-0.10.0.ebuild b/net-im/prosody/prosody-0.10.0.ebuild deleted file mode 100644 index d701c6edb154..000000000000 --- a/net-im/prosody/prosody-0.10.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 libressl websocket" - -DEPEND="net-im/jabber-base - websocket? ( dev-lua/LuaBitOp ) - !jit? ( >=dev-lang/lua-5.1:0 ) - jit? ( dev-lang/luajit:2 ) - >=net-dns/libidn-1.1 - !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )" -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.10.0-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="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/lib64" \ - --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)" || 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 -} -- cgit v1.2.3-18-g5258