CMAKE_REQUIRED can be 'always' (default) or 'never'

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 648204db88d6f17e6c43de5f26a090b67a3904d6..8316ff844e5462f39c96721f9407ab46b44ecb81 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.529 2010/04/18 13:40:03 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.530 2010/05/01 01:01:06 reavertm Exp $
+
+  01 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  openoffice-3.2.0.ebuild:
+  CMAKE_REQUIRED can be 'always' (default) or 'never'
 
   18 Apr 2010; Andreas Proschofsky <suka@gentoo.org>
   -openoffice-3.1.1.ebuild, -files/gentoo-3.1.1.diff,

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index cf28161bfb57d81ff0d3ba735ae0ea6452f0b736..4bc42f6b57ebba84a12b058ecea64e12a02db35a 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -25,6 +25,6 @@ DIST ooo-build-3.2.0.10.tar.gz 13064810 RMD160 da7a0d18dee79db651fa144e9775511af
 DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6ca6030301577477857 SHA1 c3dd261bfe366ac514a019b0fa829369b833c0c7 SHA256 3fcc0eb394ddfc43111ac27f35a7d966d4f775b0b46d6853c9b2b2612a940f4a
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD openoffice-3.2.0.ebuild 13400 RMD160 c1fe4d6881c4ea7dc6db6ecf935986ca45dc0884 SHA1 79f0ec1e1da3424b1164f5656c0a0a550f412dca SHA256 9f1215a65612423f1ea5471247ddfb877f8a56317ba0b1ccf2311d9421e61ee3
-MISC ChangeLog 108587 RMD160 c840f84e95b616735d6fe7997f05b2360b4a3b4b SHA1 bff26abc8617aa11dfd63b20be2e7af8a404d25a SHA256 e005ea758b32c52dfcc0cc7346c888b871e9967f6b914cd56a4bd67f9aa48c1a
+EBUILD openoffice-3.2.0.ebuild 13404 RMD160 7bbccab830c2ff3f89f8c6f8cb7a31d32239a65b SHA1 7f7f8af8ed746c0d87ce461b0d66c85cd0d56d4a SHA256 e2ac4d55387aa379c5e77b22ca7588fea13695e51ccd107c9ad9e528f38eaeb4
+MISC ChangeLog 108727 RMD160 6c86e957fa2657fba471291a374c10b6346ba1c8 SHA1 74cec745d297f37ee79f5ae77e4044a158eddc3e SHA256 0ec7ac01de0718bc4703564b6266d175c2022ec99156a2f11c7739263ae441f8
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78

diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild
index d495b34ad82c357b917ff8dac0ca94488a0eaea4..5444200e86d01241cfb870a6a307480d05d76565 100644 (file)
--- a/app-office/openoffice/openoffice-3.2.0.ebuild
+++ b/app-office/openoffice/openoffice-3.2.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.22 2010/04/18 13:33:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.23 2010/05/01 01:01:06 reavertm Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
 KDE_REQUIRED="optional"
-CMAKE_REQUIRED="false"
+CMAKE_REQUIRED="never"
 
 inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base mono multilib toolchain-funcs