diff options
Diffstat (limited to 'app-office/libreoffice/libreoffice-9999-r2.ebuild')
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 3d0ea939ec68..44e4e244fc14 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.147 2013/01/10 10:13:21 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.148 2013/01/11 21:24:53 scarabeus Exp $ EAPI=5 @@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4" KDE_SCM="git" CMAKE_REQUIRED="never" -PYTHON_COMPAT=( python3_3 ) +PYTHON_COMPAT=( python2_7 python3_3 ) PYTHON_REQ_USE="threads,xml" # experimental ; release ; old @@ -43,7 +43,11 @@ MODULES="core help" if [[ ${PV} != *9999* ]]; then for i in ${DEV_URI}; do for mod in ${MODULES}; do - SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" + if [[ ${mod} == core ]]; then + SRC_URI+=" ${i}/${P}.tar.xz" + else + SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" + fi done unset mod done @@ -234,8 +238,6 @@ REQUIRED_USE=" nsplugin? ( gtk ) " -S="${WORKDIR}/${PN}-core-${PV}" - CHECKREQS_MEMORY="512M" CHECKREQS_DISK_BUILD="6G" @@ -276,21 +278,13 @@ src_unpack() { local mod mod2 dest tmplfile tmplname mypv [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - if use branding; then - unpack "${BRANDING}" - fi + use branding && unpack "${BRANDING}" if [[ ${PV} != *9999* ]]; then + unpack "${P}.tar.xz" for mod in ${MODULES}; do + [[ ${mod} == core ]] && continue unpack "${PN}-${mod}-${PV}.tar.xz" - if [[ ${mod} != core ]]; then - mod2=${mod} - # mapping does not match on help - [[ ${mod} == help ]] && mod2="helpcontent2" - mkdir -p "${S}/${mod2}/" || die - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die - rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" - fi done else for mod in ${MODULES}; do @@ -405,6 +399,11 @@ src_configure() { mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die fi + # System python 2.7 enablement: + export PYTHON="${PYTHON}" + export PYTHON_CFLAGS=`pkg-config --cflags ${EPYTHON}` + export PYTHON_LIBS=`pkg-config --libs ${EPYTHON}` + # system headers/libs/...: enforce using system packages # --enable-unix-qstart-libpng: use libpng splashscreen that is faster # --enable-cairo: ensure that cairo is always required |