back to amd64 from of emul-linux-x86

4 files changed, 18 insertions, 13 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index 060a8c739cc1..d186258abe7c 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.56 2005/01/12 20:53:43 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.57 2005/01/14 15:10:37 luckyduck Exp $
+
+  14 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  openoffice-bin-1.1.1.ebuild, openoffice-bin-1.1.3.ebuild,
+  openoffice-bin-1.1.4.ebuild:
+  back to amd64 from of emul-linux-x86
 
   12 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
   openoffice-bin-1.1.1.ebuild, openoffice-bin-1.1.3.ebuild,
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild
index 16b22b83dad8..52f415facc5e 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild,v 1.15 2005/01/12 20:53:43 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild,v 1.16 2005/01/14 15:10:37 luckyduck Exp $
 
 # NOTE:  There are two big issues that should be addressed.
 #
@@ -23,7 +23,7 @@ SRC_URI="x86? ( mirror://openoffice/stable/${PV}/OOo_${PV}_LinuxIntel_install.ta
 LICENSE="|| ( LGPL-2  SISSL-1.1 )"
 SLOT="0"
 KEYWORDS="x86 ppc -sparc ~amd64"
-IUSE="emul-linux-x86 kde gnome"
+IUSE="kde gnome"
 
 DEPEND="sys-apps/findutils
 	virtual/libc
@@ -33,7 +33,7 @@ DEPEND="sys-apps/findutils
 	app-arch/unzip
 	|| ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
 	!app-office/openoffice
-	emul-linux-x86? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
+	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
 RDEPEND="virtual/libc
 	>=dev-lang/perl-5.0
 	virtual/x11
@@ -41,7 +41,7 @@ RDEPEND="virtual/libc
 	app-arch/unzip
 	|| ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
 	!app-office/openoffice
-	emul-linux-x86? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
+	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
 
 src_install() {
 	# Sandbox issues; bug #8587
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.3.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.3.ebuild
index 0c28473e64dd..5de8e3a08369 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.1.3.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.3.ebuild,v 1.6 2005/01/12 20:53:43 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.3.ebuild,v 1.7 2005/01/14 15:10:37 luckyduck Exp $
 
 # NOTE:  There are two big issues that should be addressed.
 #
@@ -22,7 +22,7 @@ SRC_URI="x86? ( mirror://openoffice/stable/${PV}/OOo_${PV}_LinuxIntel_install.ta
 LICENSE="|| ( LGPL-2  SISSL-1.1 )"
 SLOT="0"
 KEYWORDS="x86 amd64"
-IUSE="emul-linux-x86 kde gnome"
+IUSE="kde gnome"
 
 DEPEND="sys-apps/findutils
 	virtual/libc
@@ -32,7 +32,7 @@ DEPEND="sys-apps/findutils
 	app-arch/unzip
 	|| ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
 	!app-office/openoffice
-	emul-linux-x86? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
+	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
 RDEPEND="virtual/libc
 	>=dev-lang/perl-5.0
 	virtual/x11
@@ -40,7 +40,7 @@ RDEPEND="virtual/libc
 	app-arch/unzip
 	|| ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
 	!app-office/openoffice
-	emul-linux-x86? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
+	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
 
 src_install() {
 	# Sandbox issues; bug #8587
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild
index e1610da13667..ee95b1d8b781 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild,v 1.4 2005/01/12 20:53:43 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild,v 1.5 2005/01/14 15:10:37 luckyduck Exp $
 
 # NOTE:  There are two big issues that should be addressed.
 #
@@ -22,7 +22,7 @@ SRC_URI="x86? ( mirror://openoffice/stable/${PV}/OOo_${PV}_LinuxIntel_install.ta
 LICENSE="|| ( LGPL-2  SISSL-1.1 )"
 SLOT="0"
 KEYWORDS="x86 ~amd64"
-IUSE="emul-linux-x86 kde gnome"
+IUSE="kde gnome"
 
 DEPEND="sys-apps/findutils
 	virtual/libc
@@ -32,7 +32,7 @@ DEPEND="sys-apps/findutils
 	app-arch/unzip
 	|| ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
 	!app-office/openoffice
-	emul-linux-x86? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
+	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
 RDEPEND="virtual/libc
 	>=dev-lang/perl-5.0
 	virtual/x11
@@ -40,7 +40,7 @@ RDEPEND="virtual/libc
 	app-arch/unzip
 	|| ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
 	!app-office/openoffice
-	emul-linux-x86? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
+	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
 
 src_install() {
 	# Sandbox issues; bug #8587