summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-office/openoffice/ChangeLog7
-rw-r--r--app-office/openoffice/openoffice-2.4.0_rc5.ebuild10
2 files changed, 14 insertions, 3 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index c070ce8c1560..7edacc0ded61 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.376 2008/03/24 16:05:36 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.377 2008/03/24 16:13:25 suka Exp $
+
+ 24 Mar 2008; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-2.4.0_rc5.ebuild:
+ Fix unquoted variable and check if sys-apps/shadow is built with
+ pam-support if the pam use-flag is set, see bug #210870
24 Mar 2008; Andreas Proschofsky <suka@gentoo.org>
openoffice-2.3.1-r1.ebuild:
diff --git a/app-office/openoffice/openoffice-2.4.0_rc5.ebuild b/app-office/openoffice/openoffice-2.4.0_rc5.ebuild
index 42589641831a..a314835a8d68 100644
--- a/app-office/openoffice/openoffice-2.4.0_rc5.ebuild
+++ b/app-office/openoffice/openoffice-2.4.0_rc5.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_rc5.ebuild,v 1.3 2008/03/24 13:24:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0_rc5.ebuild,v 1.4 2008/03/24 16:13:25 suka Exp $
WANT_AUTOCONF="2.5"
WANT_AUTOMAKE="1.9"
@@ -182,6 +182,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
+ fi
+
java-pkg-opt-2_pkg_setup
# sys-libs/db version used
@@ -342,7 +348,7 @@ src_install() {
chown -R root:0 "${D}"
# record java libraries
- use java && java-pkg_regjar ${D}/usr/$(get_libdir)/openoffice/program/classes/*.jar
+ use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/program/classes/*.jar
}