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 | 49f8165562486f00ad3e8c3975da2b2dbf76bcb3 (patch) | |
| tree | 647f44c37d4cf05e3f5fb6b7b71cdc78ee0faab0 /app-office | |
| parent | Sparc stable, Bug #215011. (diff) | |
| download | historical-49f8165562486f00ad3e8c3975da2b2dbf76bcb3.tar.gz historical-49f8165562486f00ad3e8c3975da2b2dbf76bcb3.tar.bz2 historical-49f8165562486f00ad3e8c3975da2b2dbf76bcb3.zip | |
Only check for pam in sys-apps/shadow if pam-use-flag is set, see bug #215055
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice/Manifest | 4 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.4.0.ebuild | 12 |
3 files changed, 15 insertions, 8 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/Manifest b/app-office/openoffice/Manifest index 401afcdda735..d0eb9155d37b 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -30,6 +30,6 @@ DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712 DIST writerfilter.2008-02-29.tar.bz2 745803 RMD160 5f1642ee32757bf235ab8ada9f88023608dbf0e6 SHA1 398ebd9a18af5ae4a08305443cd4b16036ad1a37 SHA256 be55befd2694a8f5871a96cf7d33919dece8b890a081d7da493c6889db27dd94 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e EBUILD openoffice-2.3.1-r1.ebuild 12385 RMD160 15cc21255d3cedf5b16019faf8dcd7d52055b8a9 SHA1 f74bec8f21572caa6eded91662b6c977f2223539 SHA256 e3b877db697ac97d8e1dc12291deab4b25c97343ed8041a30b1b4f8bb322da92 -EBUILD openoffice-2.4.0.ebuild 12375 RMD160 d0309a4a0d3686881f7f037c1877fb07e6e01adb SHA1 b1d051c937601b544ff835bf865839c0e317f2a4 SHA256 3b0f12d448ced58e4e981255ef28344742748c11a022f438358dc8293da7d9ff -MISC ChangeLog 79193 RMD160 2308a1c26cab6ae82aa41c01ba58c718db958607 SHA1 ebe61f31fa8af53d981f9c0ede0a77d93b6d6b50 SHA256 99ad822929039b36fc616a19aaa9493c2b1f61d9521febd6145dd3e18c9d80b8 +EBUILD openoffice-2.4.0.ebuild 12404 RMD160 5d6bfbb750873f97505a4f8e958ed3f41643545a SHA1 ea33abccbff4ff88accd6eba6357eaab70a640c9 SHA256 315bba806bb7af3b864589cf65d6c93c68cd34df55026ebe0d80e60fc16d050f +MISC ChangeLog 79356 RMD160 764ea7ffa9ddc1cf46cc99ed9b9a6791c44790f0 SHA1 f73a4ea6a47fab223f81aa401f34a43cecb2685d SHA256 2f9f89bf7765543cabe542c20e5a075d48a24d789fed37abbf2a6391ac04a377 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 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 |