Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 260968 Details for
Bug 353035
bump openoffice ebuilds to eapi3
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for 3.2.1-r1
openoffice-3.2.1-r1.ebuild.diff (text/plain), 3.42 KB, created by
Jonathan Callen (RETIRED)
on 2011-01-29 06:59:37 UTC
(
hide
)
Description:
Patch for 3.2.1-r1
Filename:
MIME Type:
Creator:
Jonathan Callen (RETIRED)
Created:
2011-01-29 06:59:37 UTC
Size:
3.42 KB
patch
obsolete
>--- /gentoo/usr/portage/app-office/openoffice/openoffice-3.2.1-r1.ebuild 2010-11-17 09:40:23.000000000 -0500 >+++ openoffice-3.2.1-r1.ebuild 2011-01-29 01:55:40.511749307 -0500 >@@ -3,7 +3,7 @@ > # $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.1-r1.ebuild,v 1.4 2010/11/17 14:40:23 maekke Exp $ > > WANT_AUTOMAKE="1.9" >-EAPI="2" >+EAPI="3" > KDE_REQUIRED="optional" > CMAKE_REQUIRED="never" > PYTHON_DEPEND="2" >@@ -63,7 +63,7 @@ HOMEPAGE="http://go-oo.org" > > LICENSE="LGPL-2" > SLOT="0" >-KEYWORDS="amd64 ~ppc ~sparc x86" >+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux" > > COMMON_DEPEND="!app-office/openoffice-bin > x11-libs/libXaw >@@ -227,6 +227,9 @@ src_prepare() { > cp -f "${FILESDIR}/neon-remove-SSPI-support.diff" "${S}/patches/hotfixes" || die > cp -f "${FILESDIR}/libX11-fix.diff" "${S}/patches/hotfixes" || die > >+ # Prefix patch >+ epatch "${FILESDIR}/ooo-build-3.0.1.2-prefix.patch" >+ > #Use flag checks > if use java ; then > echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE} >@@ -319,6 +322,8 @@ src_configure() { > > cd "${S}" > ./configure --with-distro="Gentoo" \ >+ --prefix="${EPREFIX}"/usr \ >+ --sysconfdir="${EPREFIX}"/etc \ > --with-arch="${ARCH}" \ > --with-srcdir="${DISTDIR}" \ > --with-lang="${LINGUAS_OOO}" \ >@@ -343,8 +348,8 @@ src_configure() { > --enable-extensions \ > --with-system-libwpd \ > --with-system-libwpg \ >- --mandir=/usr/share/man \ >- --libdir=/usr/$(get_libdir) \ >+ --mandir="${EPREFIX}"/usr/share/man \ >+ --libdir="${EPREFIX}"/usr/$(get_libdir) \ > || die "Configuration failed!" > > } >@@ -363,18 +368,18 @@ src_install() { > make DESTDIR="${D}" install || die "Installation failed!" > > # Fix the permissions for security reasons >- chown -RP root:0 "${D}" >+ chown -RP root:0 "${ED}" > > # record java libraries > if use java; then >- java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar >- java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar >+ java-pkg_regjar "${ED}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar >+ java-pkg_regjar "${ED}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar > fi > > # Upstream places the bash-completion module in /etc. Gentoo places them in > # /usr/share/bash-completion. bug 226061 >- dobashcompletion "${D}"/etc/bash_completion.d/ooffice.sh ooffice >- rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed" >+ dobashcompletion "${ED}"/etc/bash_completion.d/ooffice.sh ooffice >+ rm -rf "${ED}"/etc/bash_completion.d/ || die "rm failed" > > } > >@@ -384,10 +389,10 @@ pkg_postinst() { > fdo-mime_mime_database_update > BASHCOMPLETION_NAME=ooffice && bash-completion_pkg_postinst > >- ( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdir)/openoffice/program/soffice.bin >+ ( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e "${EPREFIX}"/usr/$(get_libdir)/openoffice/program/soffice.bin ]] && scanelf -Xzm "${EPREFIX}"/usr/$(get_libdir)/openoffice/program/soffice.bin > > # Add available & useful jars to openoffice classpath >- use java && /usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null >+ use java && ${EPREFIX}/usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null > > elog " Some aditional functionality can be installed via Extension Manager: " > elog " *) PDF Import "
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 353035
:
260909
|
260966
| 260968 |
260970