From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B235138334 for ; Thu, 17 Jan 2019 14:19:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13251E0A65; Thu, 17 Jan 2019 14:19:17 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C855EE0A65 for ; Thu, 17 Jan 2019 14:19:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 62E98335CD2 for ; Thu, 17 Jan 2019 14:19:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ADA1750C for ; Thu, 17 Jan 2019 14:19:12 +0000 (UTC) From: "Tobias Klausmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tobias Klausmann" Message-ID: <1547734730.2ba6fa209d05f5abc3c18017654e295e8a05fdf0.klausman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/prosody/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/prosody/Manifest net-im/prosody/prosody-0.10.2.ebuild net-im/prosody/prosody-0.11.0-r1.ebuild net-im/prosody/prosody-0.11.2.ebuild X-VCS-Directories: net-im/prosody/ X-VCS-Committer: klausman X-VCS-Committer-Name: Tobias Klausmann X-VCS-Revision: 2ba6fa209d05f5abc3c18017654e295e8a05fdf0 X-VCS-Branch: master Date: Thu, 17 Jan 2019 14:19:12 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b3ed6361-0dd6-4017-a939-6b7be491d03e X-Archives-Hash: 011b0d9015dff109b9528ae474170ecc commit: 2ba6fa209d05f5abc3c18017654e295e8a05fdf0 Author: Tobias Klausmann gentoo org> AuthorDate: Thu Jan 17 14:18:50 2019 +0000 Commit: Tobias Klausmann gentoo org> CommitDate: Thu Jan 17 14:18:50 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba6fa20 net-im/prosody: Add v0.11.2 and clean up older versions Note that 0.9 will stay around for a while, due to Lua compatibility. Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Tobias Klausmann gentoo.org> net-im/prosody/Manifest | 3 +- net-im/prosody/prosody-0.10.2.ebuild | 83 ---------------------- ...sody-0.11.0-r1.ebuild => prosody-0.11.2.ebuild} | 12 ++-- 3 files changed, 9 insertions(+), 89 deletions(-) diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest index 98b2a1896d0..048bc0cc99b 100644 --- a/net-im/prosody/Manifest +++ b/net-im/prosody/Manifest @@ -1,4 +1,3 @@ -DIST prosody-0.10.2.tar.gz 331874 BLAKE2B 0e0af95a9168810263e6f60b825393d1088f69dba1faabf6c0c9dda3ef6b039a92f7edb9643cb9a60a3131a64038de5c3598f7076837b58ad196ac03fa98bfc4 SHA512 9fc05e34b45b0c16835ba94a73532fb3b4ee335f27d56bb9260e1b3e22614f89f44eb5d04b4e90d016db0b5bee6f5c7e7d099e1defb027e6823ee7667c1fe28f -DIST prosody-0.11.0.tar.gz 418710 BLAKE2B 2a9af1edbd77d3ef8f629ed5855a6638929bd0476d5245c0ef3ec6e2d840fda3a8b733bcfe35b7603057caa23576e0ec344d244d0c1678e28aa41badb75b6170 SHA512 292f555a25108716cd3ceb8ab39210bcb7f2fd113bd844092a51f68127e59b64ec76045740fd93edca8be2c1711a5fbab0f51a285f3ab78d36423a897ea667bf DIST prosody-0.11.1.tar.gz 418780 BLAKE2B 0fa45b71bb7eeaa60385683427c9547af3e014faa97dec409cc19e48bfd1b91fec7eb001fb14a86c9f3ce2c653ece2fdb113bba860cdc500cb164dd7749af6cc SHA512 6e25d2365d40582f57799bb08bf2673ba43270e8bcca5c5b785381380db55ec3ea6ab771fb9bd228bf265a564bb017dbfeae81713abd2de35a92704f8b8004ef +DIST prosody-0.11.2.tar.gz 420689 BLAKE2B 3abdab188f66d4eccb21d0981b57d5015605a1257074bbd67098a8624f40a11960fb65a7f56a7d1421a23bfffdb34635eeac5d013c4b7d7d957c51cdff2276c1 SHA512 22e55a551a40c92f38a1ed1de5fdcad574d699d58c2e27f93c3d465b55487b8e923c2ba088daf93c7140cbafb0d429687e0b662c8bb1c1aba4b79ac1ea271cd1 DIST prosody-0.9.14.tar.gz 268253 BLAKE2B 0ae62ca3c8eb89feb34f1f67aa3d14aa1e6bf02cf10ff90a43fd7de8bd257d70508e36b10b3f159040c1fa5dcfb6ad8018e3411a5d6042992f71f643a13c11d4 SHA512 30116ebc20c719d88bae7f2f44c129604ec4477004581c3556ff548c75ee026a83dc519701a61a8c3f547776ba74c571e38c3e1e5240da9148dad35a5d1f67e3 diff --git a/net-im/prosody/prosody-0.10.2.ebuild b/net-im/prosody/prosody-0.10.2.ebuild deleted file mode 100644 index de5ae8dcbe8..00000000000 --- a/net-im/prosody/prosody-0.10.2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2018 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.11.0-r1.ebuild b/net-im/prosody/prosody-0.11.2.ebuild similarity index 91% rename from net-im/prosody/prosody-0.11.0-r1.ebuild rename to net-im/prosody/prosody-0.11.2.ebuild index eccd2e1da7b..00c0da2b978 100644 --- a/net-im/prosody/prosody-0.11.0-r1.ebuild +++ b/net-im/prosody/prosody-0.11.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,15 +14,19 @@ SRC_URI="https://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" +IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl test" -DEPEND="net-im/jabber-base +BASE_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} + +DEPEND="${BASE_DEPEND} + test? ( dev-lua/busted )" + +RDEPEND="${BASE_DEPEND} >=dev-lua/luaexpat-1.3.0 dev-lua/luafilesystem ipv6? ( >=dev-lua/luasocket-3 )