fixed pkg_install in absence of pam USE-flag

Signed-off-by: Michael Krelin <hacker@klever.net>

2 files changed, 7 insertions, 5 deletions

diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 6c94774..39ed68c 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,24 +1,24 @@
 AUX jabberd-2.1.11.init 1404 RMD160 d93784cc30f573f20cd411a1a18578db46121b26 SHA1 ce0e735adbf539c809568aa2c1d3ee49f565600c SHA256 e9d004e8d83cc59f964b49c44aaf64445593ba8157d4b51df83e5e50f4625094
 MD5 eacd752c3b8eb5f2d4914ca8b3580893 files/jabberd-2.1.11.init 1404
 RMD160 d93784cc30f573f20cd411a1a18578db46121b26 files/jabberd-2.1.11.init 1404
 SHA256 e9d004e8d83cc59f964b49c44aaf64445593ba8157d4b51df83e5e50f4625094 files/jabberd-2.1.11.init 1404
 AUX jabberd-2.1.11.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
 MD5 ab77cef855566260d6a779d8d77bc78c files/jabberd-2.1.11.pamd 158
 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 files/jabberd-2.1.11.pamd 158
 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b files/jabberd-2.1.11.pamd 158
 DIST jabberd-2.1.11.tar.bz2 1034039 RMD160 540f9f510351c369938005acb7013ea41d77f5b8 SHA1 528df89fd1fc638590811bb4f14b2d0d8a498a56 SHA256 e99a70102896ce28e5e427234ddaa852aacd8a38700264741a40f5781919bea8
-EBUILD jabberd-2.1.11.ebuild 2675 RMD160 19e6aa86491d5ea21a858b1028d523107c497fa2 SHA1 98a8577ed9b6a4beef05d3e0635a09eb03cd4e91 SHA256 c74804e1955e58c5359dbba72afa5ce065ba4fce4ebc6b178b57c0b3f5449c26
-MD5 d94132822cf3296f897f2c708e7d3ccc jabberd-2.1.11.ebuild 2675
-RMD160 19e6aa86491d5ea21a858b1028d523107c497fa2 jabberd-2.1.11.ebuild 2675
-SHA256 c74804e1955e58c5359dbba72afa5ce065ba4fce4ebc6b178b57c0b3f5449c26 jabberd-2.1.11.ebuild 2675
+EBUILD jabberd-2.1.11.ebuild 2688 RMD160 f7166de5a66dc79a885c2f2cd610af45502ec2b2 SHA1 6d72283c1aa82882d2705f75b0b1f04c68ab06c0 SHA256 dacb39449544c1a991ab627bdcd6781bc08d171083c9b2a42b398e780c38214e
+MD5 0a085e6e7ae3903b388c469fe60092af jabberd-2.1.11.ebuild 2688
+RMD160 f7166de5a66dc79a885c2f2cd610af45502ec2b2 jabberd-2.1.11.ebuild 2688
+SHA256 dacb39449544c1a991ab627bdcd6781bc08d171083c9b2a42b398e780c38214e jabberd-2.1.11.ebuild 2688
 MISC ChangeLog 15464 RMD160 bac8facc410dced776f4b5d9f0c4b051100f9409 SHA1 2ed0d2fa838de3b4e1d720f577116af6eba842ec SHA256 7ea8ffdf9c099ca3fc43ccb381100ce6b519de8f6bb582305535491373fb8830
 MD5 e71dbcd3a38fc84fc22dac39a6019359 ChangeLog 15464
 RMD160 bac8facc410dced776f4b5d9f0c4b051100f9409 ChangeLog 15464
 SHA256 7ea8ffdf9c099ca3fc43ccb381100ce6b519de8f6bb582305535491373fb8830 ChangeLog 15464
 MISC metadata.xml 399 RMD160 e223c713f74619996bc47a70298aa535f6addf09 SHA1 dc9bc290a5ed00f7101aabd3a40b346112eb40eb SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377
 MD5 be8887bde84aab1d4ff9d5a0f5d50141 metadata.xml 399
 RMD160 e223c713f74619996bc47a70298aa535f6addf09 metadata.xml 399
 SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377 metadata.xml 399
 MD5 c07f7b9a6581fa2f5ea895378ce7f7de files/digest-jabberd-2.1.11 250
 RMD160 cb7aaed13753b29cc9f5a1bce8487647ae3a39f2 files/digest-jabberd-2.1.11 250
 SHA256 6d1563e8ca5a90c87768d01e273bfd6cfbe11c93ff70249fb71eeb074b090a39 files/digest-jabberd-2.1.11 250
diff --git a/net-im/jabberd/jabberd-2.1.11.ebuild b/net-im/jabberd/jabberd-2.1.11.ebuild
index fc4afd4..c4b19cb 100644
--- a/net-im/jabberd/jabberd-2.1.11.ebuild
+++ b/net-im/jabberd/jabberd-2.1.11.ebuild
@@ -1,97 +1,99 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 inherit pam eutils
 
 DESCRIPTION="Open Source Jabber Server"
 HOMEPAGE="http://jabberd2.xiaoka.com/"
 SRC_URI="http://ftp.xiaoka.com/${PN}2/releases/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="debug memdebug ldap mysql pam pipe postgres sqlite ssl berkdb anon fs"
 
 RDEPEND=">=net-im/jabber-base-0.01
         ssl? ( >=dev-libs/openssl-0.9.6b )
         idn? ( net-dns/libidn )
         ldap? ( net-nds/openldap )
         berkdb? ( >=sys-libs/db-4.1.25 )
         mysql? ( virtual/mysql )
         postgres? ( virtual/postgresql-libs )
         sqlite? ( =dev-db/sqlite-3* )
         dev-libs/expat
         dev-libs/cyrus-sasl"
 DEPEND="${RDEPEND}"
 
 src_compile() {
 
         if use memdebug && ! use debug ; then
                 ewarn '"memdebug" requires "debug"'
         fi
 
         # gsasl backend is disabled due to the lack of proper gsasl in the tree
         # TODO: rework postgres part in configure.ac
         # TODO: conditionally add extra include path for db_includedir from
         # db-use.eclass
         econf \
                 --localstatedir=/var \
                 --sysconfdir=/etc/jabber \
                 $(use_enable debug) \
                 $(use_enable memdebug nad-debug) $(use_enable memdebug pool-debug) \
                 --enable-sasl=cyrus \
                 $(use_enable ssl) \
                 $(use_enable mysql) \
                 $(use_enable postgres pgsql) \
                 $(use_enable sqlite) \
                 $(use_enable berkdb db) \
                 $(use_enable ldap) \
                 $(use_enable pam) \
                 $(use_enable pipe) \
                 $(use_enable anon) \
                 $(use_enable fs) \
                 || die "econf failed"
         emake || die "make failed"
 
 }
 
 src_install() {
 
         make DESTDIR="${D}" install || die "make install failed"
 
         fowners jabber:jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
         fperms 750 /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
 
         newinitd "${FILESDIR}/jabberd-${PV}.init" jabberd || die "newinitd failed"
-        use pam && newpamd "${FILESDIR}/jabberd-${PV}.pamd" jabberd || die "newpamd failed"
+        if use pam ; then
+         newpamd "${FILESDIR}/jabberd-${PV}.pamd" jabberd || die "newpamd failed"
+        fi
 
         dodoc AUTHORS BUGS NEWS PROTOCOL README UPGRADE
         docinto tools
         for i in db-* migrate.pl pipe-auth.pl; do
                 dodoc tools/${i}
         done
 
         cd "${D}/etc/jabber/"
         sed -i \
                 -e 's,/var/jabberd/pid/,/var/run/jabber/,g' \
                 -e 's,/var/jabberd/log/,/var/log/jabber/,g' \
                 -e 's,/var/jabberd/db,/var/spool/jabber/,g' \
                 *.xml *.xml.dist || die "sed failed"
         use berkdb && sed -i \
                 -e 's,<module>mysql</module>,<module>db</module>,' \
                 c2s.xml*
 
 }
 
 pkg_postinst() {
         if use pam ; then
                 echo
                 ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
                 ewarn 'be in the form of "contactname@jabberdomain".  This behavior'
                 ewarn 'is likely to change in future versions of jabberd-2. It may'
                 ewarn 'be advisable to avoid PAM authentication for the time being.'
                 echo
                 ebeep
         fi
 }