Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 151225 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/app-office/openoffice/openoffice-2.0.4.ebuild (-1 / +11 lines)
Lines 99-105 Link Here
99
	!dev-util/dmake
99
	!dev-util/dmake
100
	>=dev-lang/python-2.3.4
100
	>=dev-lang/python-2.3.4
101
	>=app-admin/eselect-oodict-20060706
101
	>=app-admin/eselect-oodict-20060706
102
	java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
102
	java? ( amd64? ( =virtual/jdk-1.4* dev-java/eclipse-ecj )
103
		!amd64? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )
103
		dev-java/ant-core )
104
		dev-java/ant-core )
104
	dev-libs/libxslt
105
	dev-libs/libxslt
105
	ldap? ( net-nds/openldap )
106
	ldap? ( net-nds/openldap )
Lines 107-112 Link Here
107
108
108
PROVIDE="virtual/ooo"
109
PROVIDE="virtual/ooo"
109
110
111
if use amd64; then
112
	# sun-jdk-1.5 is broken on amd64, and has to be disabled. Currently it's
113
	# not possible to disable a single implementation, so we disable all 1.5.
114
	JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
115
	# On my setup javac won't work for some unknown reason.
116
	# ecj does just fine. Haven't tried jikes.
117
	JAVA_PKG_FORCE_COMPILER="ecj-3.2 ecj-3.1"
118
fi
119
110
# FIXME executable stacks should be addressed upstream!
120
# FIXME executable stacks should be addressed upstream!
111
QA_EXECSTACK_x86="usr/lib/openoffice/program/libgcc3_uno.so"
121
QA_EXECSTACK_x86="usr/lib/openoffice/program/libgcc3_uno.so"
112
122

Return to bug 151225