diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2008-03-27 14:08:42 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2008-03-27 14:08:42 +0000 |
| commit | 5f2100bb9a039687e80431f6beacd1fef9f25bdb (patch) | |
| tree | a236f470a878da86cde950cc17a57377c89694e5 /app-office | |
| parent | Sparc stable, Bug #215011. (diff) | |
| download | gentoo-2-5f2100bb9a039687e80431f6beacd1fef9f25bdb.tar.gz gentoo-2-5f2100bb9a039687e80431f6beacd1fef9f25bdb.tar.bz2 gentoo-2-5f2100bb9a039687e80431f6beacd1fef9f25bdb.zip | |
Only check for pam in sys-apps/shadow if pam-use-flag is set, see bug #215055
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.4.0.ebuild | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index bb4a0ac5302a..c8f293d03e5e 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.380 2008/03/27 09:14:09 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.381 2008/03/27 14:08:42 suka Exp $ + + 27 Mar 2008; Andreas Proschofsky <suka@gentoo.org> + openoffice-2.4.0.ebuild: + Only check for pam in sys-apps/shadow if pam-use-flag is set, see bug + #215055 27 Mar 2008; Andreas Proschofsky <suka@gentoo.org> openoffice-2.4.0.ebuild: diff --git a/app-office/openoffice/openoffice-2.4.0.ebuild b/app-office/openoffice/openoffice-2.4.0.ebuild index 970b1db9c073..9cbabc694658 100644 --- a/app-office/openoffice/openoffice-2.4.0.ebuild +++ b/app-office/openoffice/openoffice-2.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.2 2008/03/27 09:14:09 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.3 2008/03/27 14:08:42 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -183,10 +183,12 @@ pkg_setup() { die fi - if ! built_with_use sys-apps/shadow pam; then - eerror " shadow needs to be built with pam-support. " - eerror " rebuild it accordingly or remove the pam use-flag " - die + if use pam; then + if ! built_with_use sys-apps/shadow pam; then + eerror " shadow needs to be built with pam-support. " + eerror " rebuild it accordingly or remove the pam use-flag " + die + fi fi java-pkg-opt-2_pkg_setup |