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 (-2 / +8 lines)
Lines 19-25 Link Here
19
	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-lang.tar.bz2
19
	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-lang.tar.bz2
20
	binfilter? ( http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-binfilter.tar.bz2 )
20
	binfilter? ( http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-binfilter.tar.bz2 )
21
	http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
21
	http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
22
	odk? ( http://go-oo.org/packages/OOD680/${SRC}-sdk_oo.tar.bz2
22
	odk? ( http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-sdk_oo.tar.bz2
23
		java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
23
		java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
24
	http://go-oo.org/packages/SRC680/extras-2.tar.bz2
24
	http://go-oo.org/packages/SRC680/extras-2.tar.bz2
25
	http://go-oo.org/packages/SRC680/biblio.tar.bz2
25
	http://go-oo.org/packages/SRC680/biblio.tar.bz2
Lines 100-111 Link Here
100
	!dev-util/dmake
100
	!dev-util/dmake
101
	>=dev-lang/python-2.3.4
101
	>=dev-lang/python-2.3.4
102
	>=app-admin/eselect-oodict-20060706
102
	>=app-admin/eselect-oodict-20060706
103
	java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
103
	java? ( || ( =virtual/jdk-1.4* !amd64? ( =virtual/jdk-1.5* ) )
104
		dev-java/ant-core )
104
		dev-java/ant-core )
105
	dev-libs/libxslt
105
	dev-libs/libxslt
106
	ldap? ( net-nds/openldap )
106
	ldap? ( net-nds/openldap )
107
	>=dev-libs/libxml2-2.0"
107
	>=dev-libs/libxml2-2.0"
108
108
109
if use amd64; then
110
	# All availible Java 1.5 JDKs are broken, in one way or another, on amd64.
111
	# Thus we force the use of a Java 1.4 JDK on amd64 (and amd64 only).
112
	export JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
113
fi
114
109
PROVIDE="virtual/ooo"
115
PROVIDE="virtual/ooo"
110
116
111
# FIXME executable stacks should be addressed upstream!
117
# FIXME executable stacks should be addressed upstream!

Return to bug 151225