From 8392ebcffba002c05a96bf15f58f1af13b6aa4fe Mon Sep 17 00:00:00 2001
From: Andreas Proschofsky <suka@gentoo.org>
Date: Mon, 24 Jan 2011 20:04:27 +0000
Subject: Don't care about parallel installability (which causes all sorts of
 problems anyway) and get starter symlinks

(Portage version: 2.1.9.35/cvs/Linux x86_64)
---
 app-office/libreoffice-bin/ChangeLog                      |  8 +++++++-
 .../libreoffice-bin/libreoffice-bin-3.3.0_rc4.ebuild      | 15 +++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'app-office/libreoffice-bin')

diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index 42b7acd02a10..fcee17a0b221 100644
--- a/app-office/libreoffice-bin/ChangeLog
+++ b/app-office/libreoffice-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/libreoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.1 2011/01/23 14:42:30 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.2 2011/01/24 20:04:27 suka Exp $
+
+  24 Jan 2011; Andreas Proschofsky <suka@gentoo.org>
+  libreoffice-bin-3.3.0_rc4.ebuild:
+  Don't care about parallel installability (which causes all sorts of problems
+  anyway) and get starter symlinks 
+  back
 
 *libreoffice-bin-3.3.0_rc4 (23 Jan 2011)
 
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.3.0_rc4.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.3.0_rc4.ebuild
index deb4c8f71a25..7f9304153318 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.3.0_rc4.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.3.0_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.0_rc4.ebuild,v 1.1 2011/01/23 14:42:30 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.0_rc4.ebuild,v 1.2 2011/01/24 20:04:27 suka Exp $
 
 EAPI="3"
 
@@ -49,7 +49,10 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="x11-libs/libXaw
+RDEPEND="!app-office/libreoffice
+	!app-office/openoffice
+	!app-office/openoffice-bin
+	x11-libs/libXaw
 	sys-libs/glibc
 	>=dev-lang/perl-5.0
 	app-arch/zip
@@ -159,12 +162,12 @@ src_install () {
 
 	# Component symlinks
 	# Disabled, trouble with parallel installing openoffice
-#	for app in base calc draw impress math writer; do
-#		dosym loffice /usr/bin/lo${app}
-#	done
+	for app in base calc draw impress math writer; do
+		dosym loffice /usr/bin/lo${app}
+	done
 
 	dosym ${INSTDIR}/program/spadmin /usr/bin/loffice-printeradmin
-#	dosym ${INSTDIR}/program/soffice /usr/bin/soffice
+	dosym ${INSTDIR}/program/soffice /usr/bin/soffice
 
 	rm -f "${ED}${INSTDIR}/basis-link" || die
 	dosym ${INSTDIR}/basis3.3 ${INSTDIR}/basis-link
-- 
cgit v1.2.3-65-gdbad