From eb3957d1d1331b17551faf92b522f2ff375f16a3 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Wed, 7 Jun 2023 21:39:22 +0100 Subject: net-im/jabberd2: fix warnings --- net-im/jabberd2/jabberd2-2.7.0.ebuild | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'net-im') diff --git a/net-im/jabberd2/jabberd2-2.7.0.ebuild b/net-im/jabberd2/jabberd2-2.7.0.ebuild index beba91ac..ef2804cf 100644 --- a/net-im/jabberd2/jabberd2-2.7.0.ebuild +++ b/net-im/jabberd2/jabberd2-2.7.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools db-use eutils flag-o-matic pam systemd +inherit autotools db-use flag-o-matic pam systemd DESCRIPTION="Open Source Jabber Server" HOMEPAGE="http://jabberd2.org" @@ -14,12 +14,13 @@ SLOT="0" KEYWORDS="amd64" IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl test websocket zlib" REQUIRED_USE="memdebug? ( debug )" +RESTRICT="!test? ( test )" -DEPEND=" +DEPEND="virtual/libcrypt dev-libs/expat net-libs/udns net-dns/libidn - virtual/gsasl + net-misc/gsasl:= berkdb? ( >=sys-libs/db-4.1.25:= ) ldap? ( net-nds/openldap ) mysql? ( @@ -133,7 +134,7 @@ src_install() { # Fix systemd unit files installation path, bug #626026 emake systemddir="$(systemd_get_systemunitdir)" DESTDIR="${D}" install einstalldocs - prune_libtool_files --modules + find "${ED}" -name '*.la' -delete || die keepdir /var/spool/jabber/{fs,db} fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \ @@ -144,7 +145,7 @@ src_install() { # avoid file collision with x11-misc/screen-message wrt #453994 for i in router sm c2s s2s ; do einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}" - mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die + mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/jabberd2-${i} || die done newinitd "${FILESDIR}/${PN}-2.5.0.init" jabberd @@ -158,7 +159,7 @@ src_install() { tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl} # remove useless upstart files wrt #498900 - rm -rf "${ED%/}"/usr/etc + rm -rf "${ED}"/usr/etc } pkg_postinst() { -- cgit v1.2.3