summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2006-01-21 15:11:39 +0000
committerAndreas Proschofsky <suka@gentoo.org>2006-01-21 15:11:39 +0000
commitde372e436b69eb900e0ebb853010b746b0a87ee1 (patch)
treed56a994d333f602092ad294d9be59a26600159bf /app-office
parentStable on ppc. (diff)
downloadgentoo-2-de372e436b69eb900e0ebb853010b746b0a87ee1.tar.gz
gentoo-2-de372e436b69eb900e0ebb853010b746b0a87ee1.tar.bz2
gentoo-2-de372e436b69eb900e0ebb853010b746b0a87ee1.zip
Remove blocker on openoffice-ximian-bin as this is dead now
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice-ximian/ChangeLog6
-rw-r--r--app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild4
-rw-r--r--app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild4
-rw-r--r--app-office/openoffice/ChangeLog6
-rw-r--r--app-office/openoffice/openoffice-2.0.0.ebuild3
-rw-r--r--app-office/openoffice/openoffice-2.0.1.ebuild3
6 files changed, 16 insertions, 10 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 14ca231f15fa..57b88ea4bfa8 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/openoffice-ximian
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.147 2006/01/21 14:35:03 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.148 2006/01/21 15:11:39 suka Exp $
+
+ 21 Jan 2006; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-ximian-1.3.9-r1.ebuild, openoffice-ximian-1.3.16.ebuild:
+ Remove blocker on openoffice-ximian-bin as this is dead now
21 Jan 2006; Andreas Proschofsky <suka@gentoo.org>
openoffice-ximian-1.3.9-r1.ebuild, openoffice-ximian-1.3.16.ebuild:
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild
index 5ebacb042a4c..f626e2338b32 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.16.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-ximian/openoffice-ximian-1.3.16.ebuild,v 1.4 2006/01/21 14:35:03 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild,v 1.5 2006/01/21 15:11:39 suka Exp $
# Notes:
#
@@ -53,7 +53,7 @@ LICENSE="|| ( LGPL-2 SISSL-1.1 )"
SLOT="0"
KEYWORDS="~x86 ~ppc ~sparc"
-RDEPEND="!app-office/openoffice-ximian-bin
+RDEPEND="
|| ( (
x11-libs/libXaw
x11-libs/libXinerama
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild
index 40c959e6b4e7..3371b667b6d7 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.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-ximian/openoffice-ximian-1.3.9-r1.ebuild,v 1.10 2006/01/21 14:35:03 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild,v 1.11 2006/01/21 15:11:39 suka Exp $
# Notes:
#
@@ -53,7 +53,7 @@ LICENSE="|| ( LGPL-2 SISSL-1.1 )"
SLOT="0"
KEYWORDS="ppc sparc x86"
-RDEPEND="!app-office/openoffice-ximian-bin
+RDEPEND="
|| ( (
x11-libs/libXaw
x11-libs/libXinerama
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 5e8e10da5f41..5139441b4460 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.171 2006/01/20 20:32:03 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.172 2006/01/21 15:08:36 suka Exp $
+
+ 21 Jan 2006; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-2.0.0.ebuild, openoffice-2.0.1.ebuild:
+ Remove blocker on openoffice-ximian-bin as this is dead now
20 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org>
openoffice-2.0.1.ebuild:
diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild
index cbb23b20c90b..53a03a3a209f 100644
--- a/app-office/openoffice/openoffice-2.0.0.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0.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.0.ebuild,v 1.23 2006/01/21 13:40:46 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.24 2006/01/21 15:08:36 suka Exp $
inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
@@ -28,7 +28,6 @@ SLOT="0"
KEYWORDS="x86 ~ppc sparc"
RDEPEND="!app-office/openoffice-bin
- !app-office/openoffice-ximian-bin
!app-office/openoffice-ximian
|| ( (
x11-libs/libXaw
diff --git a/app-office/openoffice/openoffice-2.0.1.ebuild b/app-office/openoffice/openoffice-2.0.1.ebuild
index 380ee2e90619..7c7afced84a5 100644
--- a/app-office/openoffice/openoffice-2.0.1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.1.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.1.ebuild,v 1.12 2006/01/20 20:32:03 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.13 2006/01/21 15:08:36 suka Exp $
inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
@@ -29,7 +29,6 @@ SLOT="0"
KEYWORDS="~x86 ~ppc sparc"
RDEPEND="!app-office/openoffice-bin
- !app-office/openoffice-ximian-bin
!app-office/openoffice-ximian
|| ( (
x11-libs/libXaw