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 3C37E1382C5 for ; Sun, 13 Dec 2020 19:39:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2EC03E0970; Sun, 13 Dec 2020 19:39:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1682BE0970 for ; Sun, 13 Dec 2020 19:39:07 +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 B3DF6341197 for ; Sun, 13 Dec 2020 19:39:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21DC854 for ; Sun, 13 Dec 2020 19:39:04 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1607888337.7a9cccd620f7c0aa0a0f501df1f84fd0c2094af4.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/prosody/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/prosody/prosody-0.11.5-r1.ebuild X-VCS-Directories: net-im/prosody/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 7a9cccd620f7c0aa0a0f501df1f84fd0c2094af4 X-VCS-Branch: master Date: Sun, 13 Dec 2020 19:39:04 +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: bb45a3b5-5d3e-4398-84bd-7f2e6c3e8dbe X-Archives-Hash: 563d80cbafb4fef75c854a43020bd93d commit: 7a9cccd620f7c0aa0a0f501df1f84fd0c2094af4 Author: Conrad Kostecki gentoo org> AuthorDate: Sun Dec 13 19:36:56 2020 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sun Dec 13 19:38:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a9cccd6 net-im/prosody: migrate to tmpfiles eclass Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Conrad Kostecki gentoo.org> net-im/prosody/prosody-0.11.5-r1.ebuild | 50 ++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/net-im/prosody/prosody-0.11.5-r1.ebuild b/net-im/prosody/prosody-0.11.5-r1.ebuild index 6ffc3bd7b48..2e89c9c96e9 100644 --- a/net-im/prosody/prosody-0.11.5-r1.ebuild +++ b/net-im/prosody/prosody-0.11.5-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit multilib systemd toolchain-funcs +inherit multilib systemd tmpfiles toolchain-funcs DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua" HOMEPAGE="https://prosody.im/" @@ -15,28 +15,34 @@ KEYWORDS="amd64 arm x86" IUSE="ipv6 jit libevent libressl mysql postgres sqlite ssl test zlib" RESTRICT="!test? ( test )" -BASE_DEPEND="net-im/jabber-base - dev-lua/LuaBitOp - !jit? ( >=dev-lang/lua-5.1:0 ) - jit? ( dev-lang/luajit:2 ) - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl:= ) - >=net-dns/libidn-1.1:=" +BASE_DEPEND=" + net-im/jabber-base + dev-lua/LuaBitOp + !jit? ( >=dev-lang/lua-5.1:0 ) + jit? ( dev-lang/luajit:2 ) + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl:= ) + >=net-dns/libidn-1.1:= +" -DEPEND="${BASE_DEPEND} - test? ( dev-lua/busted )" +DEPEND=" + ${BASE_DEPEND} + test? ( dev-lua/busted ) +" -RDEPEND="${BASE_DEPEND} - ~dev-lua/luaexpat-1.3.0 - dev-lua/luafilesystem - !ipv6? ( dev-lua/luasocket ) - ipv6? ( >=dev-lua/luasocket-3 ) - 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 )" +RDEPEND=" + ${BASE_DEPEND} + ~dev-lua/luaexpat-1.3.0 + dev-lua/luafilesystem + !ipv6? ( dev-lua/luasocket ) + ipv6? ( >=dev-lua/luasocket-3 ) + 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 ) +" PATCHES=( "${FILESDIR}/${PN}-0.11.2-r1-gentoo.patch" ) @@ -66,7 +72,7 @@ src_configure() { src_install() { emake DESTDIR="${D}" install systemd_dounit "${FILESDIR}/${PN}".service - systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf + newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf newinitd "${FILESDIR}/${PN}".initd-r2 ${PN} keepdir "${JABBER_SPOOL}" }