summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2006-07-03 14:41:03 +0000
committerAndreas Proschofsky <suka@gentoo.org>2006-07-03 14:41:03 +0000
commitb5cfbb8a2f02e3a46ea8845e347f79aa72fd952c (patch)
tree21c4e5f4acca226082da4341f33f1482ce7295df /app-office/openoffice
parentStable on amd64 wrt security Bug #135886. (diff)
downloadhistorical-b5cfbb8a2f02e3a46ea8845e347f79aa72fd952c.tar.gz
historical-b5cfbb8a2f02e3a46ea8845e347f79aa72fd952c.tar.bz2
historical-b5cfbb8a2f02e3a46ea8845e347f79aa72fd952c.zip
Fix building with -ldap, see bug #138959
Package-Manager: portage-2.1.1_pre2-r2
Diffstat (limited to 'app-office/openoffice')
-rw-r--r--app-office/openoffice/ChangeLog6
-rw-r--r--app-office/openoffice/Manifest16
-rw-r--r--app-office/openoffice/openoffice-2.0.3.ebuild7
3 files changed, 17 insertions, 12 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 4a840018cc52..02f8ca977c6f 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/openoffice
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.228 2006/07/03 05:45:36 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.229 2006/07/03 14:41:03 suka Exp $
+
+ 03 Jul 2006; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-2.0.3.ebuild:
+ Fix building with -ldap, see bug #138959
*openoffice-2.0.3 (03 Jul 2006)
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index a7950f900629..9faf77a46201 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -50,14 +50,14 @@ EBUILD openoffice-2.0.2-r2.ebuild 8077 RMD160 8f7e70da2934147d5adfcb2ff37bc0e49d
MD5 a781d043ead9a5764574d944fc3c3e7f openoffice-2.0.2-r2.ebuild 8077
RMD160 8f7e70da2934147d5adfcb2ff37bc0e49d58fff5 openoffice-2.0.2-r2.ebuild 8077
SHA256 23ce684f0fb9193f05e8089f48c30149e05a7f4f590016f6c86e3e80fb76d49c openoffice-2.0.2-r2.ebuild 8077
-EBUILD openoffice-2.0.3.ebuild 8680 RMD160 b810692816e56f535625e324e13e3cbecbf9be4b SHA1 fbbff8a5328da06e2aa6af5d665872a80e0cc296 SHA256 2c27ca1b511b129d3f5f54b8570381a4ba98c044fdd0e199c0f17428bea919e2
-MD5 1dec8745f3a1d221df0d796397720594 openoffice-2.0.3.ebuild 8680
-RMD160 b810692816e56f535625e324e13e3cbecbf9be4b openoffice-2.0.3.ebuild 8680
-SHA256 2c27ca1b511b129d3f5f54b8570381a4ba98c044fdd0e199c0f17428bea919e2 openoffice-2.0.3.ebuild 8680
-MISC ChangeLog 48378 RMD160 94d4bdf58ced9186f2af6b4b6438b442fd6f0d86 SHA1 8b4611a4552880b28c31ede3de8e0a5c6435290d SHA256 8bde56e153a6f6aafb4b8cba96899860f952377a0160604188092b0753a75e8e
-MD5 27e90b760ab211a0f0b0037e6de6232b ChangeLog 48378
-RMD160 94d4bdf58ced9186f2af6b4b6438b442fd6f0d86 ChangeLog 48378
-SHA256 8bde56e153a6f6aafb4b8cba96899860f952377a0160604188092b0753a75e8e ChangeLog 48378
+EBUILD openoffice-2.0.3.ebuild 8712 RMD160 6bc69f069c475cd8d9c1e0c0e9e1de9f518b7af2 SHA1 f0ce557d8c55ef14781dd08b1c5fb3b44fdc29e8 SHA256 6a1d572f8d5e41c5327e624f4a4a0c6b4fe1a5785945f30566321a87d635bc19
+MD5 e54b04bd6d1a7f709dc7a279e8bf22e3 openoffice-2.0.3.ebuild 8712
+RMD160 6bc69f069c475cd8d9c1e0c0e9e1de9f518b7af2 openoffice-2.0.3.ebuild 8712
+SHA256 6a1d572f8d5e41c5327e624f4a4a0c6b4fe1a5785945f30566321a87d635bc19 openoffice-2.0.3.ebuild 8712
+MISC ChangeLog 48502 RMD160 1c45669c552f2fa08334d1fc9d5170010b6f10c9 SHA1 c3c2fc1c0651f63dd7e178cd3d5c5ab10a6d4ff1 SHA256 3542160c7c54eac0ba071c9354c7cdd2638d9c2f9d338d1292ab06edc62593bd
+MD5 fbab10ced20efbb89be12a1571a0d73c ChangeLog 48502
+RMD160 1c45669c552f2fa08334d1fc9d5170010b6f10c9 ChangeLog 48502
+SHA256 3542160c7c54eac0ba071c9354c7cdd2638d9c2f9d338d1292ab06edc62593bd ChangeLog 48502
MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
diff --git a/app-office/openoffice/openoffice-2.0.3.ebuild b/app-office/openoffice/openoffice-2.0.3.ebuild
index 67e462a0f333..d0ea73c18453 100644
--- a/app-office/openoffice/openoffice-2.0.3.ebuild
+++ b/app-office/openoffice/openoffice-2.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.3.ebuild,v 1.1 2006/07/03 05:45:36 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.3.ebuild,v 1.2 2006/07/03 14:41:03 suka Exp $
inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg kde-functions mono toolchain-funcs
@@ -36,7 +36,7 @@ HOMEPAGE="http://go-oo.org"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="-amd64 ~sparc ~x86"
+KEYWORDS="-amd64 ~x86"
RDEPEND="!app-office/openoffice-bin
|| ( (
@@ -177,7 +177,8 @@ src_unpack() {
echo "`use_with firefox system-mozilla`" >> ${CONFFILE}
echo "`use_with firefox`" >> ${CONFFILE}
- echo "`use_enable ldap openldap`" >> ${CONFFILE}
+ echo "`use_enable ldap`" >> ${CONFFILE}
+ echo "`use_with ldap openldap`" >> ${CONFFILE}
echo "`use_enable eds evolution2`" >> ${CONFFILE}
echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
echo "`use_enable gnome lockdown`" >> ${CONFFILE}