diff options
Diffstat (limited to 'app-office')
11 files changed, 38 insertions, 944 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 0dc9e72fbe49..6bf9abf813fe 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for app-office/libreoffice -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.424 2012/12/19 20:22:04 scarabeus Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.425 2013/01/01 10:56:53 scarabeus Exp $ + + 01 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> + -files/libreoffice-3.5-doublebuild.patch, + -files/libreoffice-3.5-hebrew-icu49.patch, + -files/libreoffice-3.5-propagate-gb_FULLDEPS.patch, + -files/libreoffice-3.5.4-libexttextcat.patch, + -files/libreoffice-3.6.3.2-fix-poppler.patch, + -files/libreoffice-system-pyuno.patch, -libreoffice-3.5.7.2.ebuild, + libreoffice-3.6.9999.ebuild, libreoffice-4.0.9999.ebuild, + libreoffice-9999-r2.ebuild: + Use python-r1 eclass. Drop 3.5 series as 3.6 seem fine wrt regressions for + now. 19 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.4.3.ebuild, libreoffice-3.6.9999.ebuild: diff --git a/app-office/libreoffice/files/libreoffice-3.5-doublebuild.patch b/app-office/libreoffice/files/libreoffice-3.5-doublebuild.patch deleted file mode 100644 index 903fe2359adf..000000000000 --- a/app-office/libreoffice/files/libreoffice-3.5-doublebuild.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c40c21fe0670c6fb58bc82e4df2825e23c7406bb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.cz> -Date: Tue, 3 Apr 2012 14:40:12 +0200 -Subject: [PATCH] Do not run build again during the install phase. - ---- - solenv/gbuild/extensions/post_AuxTargets.mk | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk -index 72414b7..825b130 100644 ---- a/solenv/gbuild/extensions/post_AuxTargets.mk -+++ b/solenv/gbuild/extensions/post_AuxTargets.mk -@@ -83,7 +83,7 @@ distclean: clean - desktop/scripts/soffice.sh ooo.lst post_download post_download.log \ - set_soenv set_soenv.last set_soenv.stamp src.downloaded warn - --install: build -+install: - echo "Installing in $(INSTALLDIR)..." && \ - ooinstall "$(INSTALLDIR)" && \ - echo "" && \ --- -1.7.7 - diff --git a/app-office/libreoffice/files/libreoffice-3.5-hebrew-icu49.patch b/app-office/libreoffice/files/libreoffice-3.5-hebrew-icu49.patch deleted file mode 100644 index 6156f06f1ceb..000000000000 --- a/app-office/libreoffice/files/libreoffice-3.5-hebrew-icu49.patch +++ /dev/null @@ -1,202 +0,0 @@ -From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001 -From: Caolán McNamara <caolanm@redhat.com> -Date: Sun, 13 May 2012 21:41:30 +0000 -Subject: Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules - -i.e. sync with svn diff -c 31071 -http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt - -Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6 ---- -diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt -index cbabee6..91c8f3d 100644 ---- a/i18npool/source/breakiterator/data/line.txt -+++ b/i18npool/source/breakiterator/data/line.txt -@@ -61,11 +61,13 @@ $BB = [:LineBreak = Break_Before:]; - $BK = [:LineBreak = Mandatory_Break:]; - $B2 = [:LineBreak = Break_Both:]; - $CB = [:LineBreak = Contingent_Break:]; -+$CJ = [:LineBreak = Conditional_Japanese_Starter:]; - $CL = [:LineBreak = Close_Punctuation:] ; - $CM = [:LineBreak = Combining_Mark:]; - $CR = [:LineBreak = Carriage_Return:]; - $EX = [:LineBreak = Exclamation:]; - $GL = [:LineBreak = Glue:]; -+$HL = [:LineBreak = Hebrew_Letter:]; - $HY = [:LineBreak = Hyphen:]; - $H2 = [:LineBreak = H2:]; - $H3 = [:LineBreak = H3:]; -@@ -77,7 +79,7 @@ $JV = [:LineBreak = JV:]; - $JT = [:LineBreak = JT:]; - $LF = [:LineBreak = Line_Feed:]; - $NL = [:LineBreak = Next_Line:]; --$NS = [:LineBreak = Nonstarter:]; -+$NS = [[:LineBreak = Nonstarter:] $CJ]; - $NU = [:LineBreak = Numeric:]; - $OP = [[:LineBreak = Open_Punctuation:] - $DG]; - $PO = [:LineBreak = Postfix_Numeric:]; -@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*; - $CLcm = $CL $CM*; - $EXcm = $EX $CM*; - $GLcm = $GL $CM*; -+$HLcm = $HL $CM*; - $HYcm = $HY $CM*; - $H2cm = $H2 $CM*; - $H3cm = $H3 $CM*; -@@ -150,6 +153,7 @@ $B2 $CM+; - $CL $CM+; - $EX $CM+; - $GL $CM+; -+$HL $CM+; - $HY $CM+; - $H2 $CM+; - $H3 $CM+; -@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM]; # Bases that can't take CMs - # so for this one case we need to manually list out longer sequences. - # - $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP]; --$AL_FOLLOW_CM = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP]; -+$AL_FOLLOW_CM = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP]; - $AL_FOLLOW = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM]; - - -@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm); - $BBcm [^$CB]; # $BB x - $BBcm $LB20NonBreaks $CM*; - -+# LB 21a Don't break after Hebrew + Hyphen -+# HL (HY | BA) x -+# -+$HLcm ($HYcm | $BAcm) [^$CB]?; -+ - # LB 22 --$ALcm $INcm; -+($ALcm | $HLcm) $INcm; - $CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL - $IDcm $INcm; - $INcm $INcm; -@@ -331,16 +340,18 @@ $NUcm $INcm; - # $LB 23 - $IDcm $POcm; - $ALcm $NUcm; # includes $LB19 -+$HLcm $NUcm; - $CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL - $NUcm $ALcm; -+$NUcm $HLcm; - - # - # LB 24 - # - $PRcm $IDcm; - $ALcm $PRcm; --$PRcm $ALcm; --$POcm $ALcm; -+$PRcm ($ALcm | $HLcm); -+$POcm ($ALcm | $HLcm); - - # - # LB 25 Numbers. -@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm); - - # LB 28 Do not break between alphabetics - # --$ALcm $ALcm; --$CM+ $ALcm; # The $CM+ is from rule 10, and unattached CM is treated as AL -+($ALcm | $HLcm) ($ALcm | $HLcm); -+$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL - - # LB 29 - $IScm ($ALcm | $NUcm); -@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm); - # Rule 30 Do not break between letters, numbers or ordinary symbols - # and opening or closing punctuation - # --($ALcm | $NUcm) $OPcm; -+($ALcm | $HLcm | $NUcm) $OPcm; - $CM+ $OPcm; --$CLcm ($ALcm | $NUcm); -- -- -+$CLcm ($ALcm | $HLcm | $NUcm); - - # - # Reverse Rules. -@@ -391,6 +400,7 @@ $CM+ $B2; - $CM+ $CL; - $CM+ $EX; - $CM+ $GL; -+$CM+ $HL; - $CM+ $HY; - $CM+ $H2; - $CM+ $H3; -@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM]; # . x (BA | HY | NS) - $CM* [$LB20NonBreaks-$CM] $CM* $BB; # BB x . - [^$CB] $CM* $BB; # - -- -+# LB21a -+[^$CB] $CM* ($HY | $BA) $CM* $HL; - - # LB 22 --$CM* $IN $CM* $ALPlus; -+$CM* $IN $CM* ($ALPlus | $HL); - $CM* $IN $CM* $ID; - $CM* $IN $CM* $IN; - $CM* $IN $CM* $NU; - - # LB 23 - $CM* $PO $CM* $ID; --$CM* $NU $CM* $ALPlus; --$CM* $ALPlus $CM* $NU; -+$CM* $NU $CM* ($ALPlus | $HL); -+$CM* ($ALPlus | $HL) $CM* $NU; - - # LB 24 - $CM* $ID $CM* $PR; - $CM* $PR $CM* $ALPlus; --$CM* $ALPlus $CM* $PR; --$CM* $ALPlus $CM* $PO; -+$CM* ($ALPlus | $HL) $CM* $PR; -+$CM* ($ALPlus | $HL) $CM* $PO; - - $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP; - $CM* $NU+ $CM* $HY+ / $SP; -@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL); - $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR; - - # LB 28 --$CM* $ALPlus $CM* $ALPlus; -- -+$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL); - - # LB 29 - $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP]; - - # LB 30 --$CM* $OP $CM* ($NU | $ALPlus); --$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP]; -+$CM* $OP $CM* ($ALPlus | $HL | $NU); -+$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP]; - - - ## ------------------------------------------------- -@@ -609,6 +619,9 @@ $SP+ $CM* $QU; - $SP+ $CM* $CL; - $SP+ $CM* $B2; - -+# LB 21 -+$CM* ($HY | $BA) $CM* $HL; -+ - # LB 18 - ($CM* ($IS | $SY))+ $CM* $NU; - $CL $CM* ($NU | $IS | $SY); -@@ -629,6 +642,6 @@ $dictionary $dictionary; - # turn off rule chaining. We don't want to move more - # than necessary. - # --[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary]; -+[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary]; - $dictionary $dictionary; - --- -cgit v0.9.0.2-2-gbebe diff --git a/app-office/libreoffice/files/libreoffice-3.5-propagate-gb_FULLDEPS.patch b/app-office/libreoffice/files/libreoffice-3.5-propagate-gb_FULLDEPS.patch deleted file mode 100644 index 8175e8a34d4a..000000000000 --- a/app-office/libreoffice/files/libreoffice-3.5-propagate-gb_FULLDEPS.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 07fc748fb1b242859913df178a0c41dc95a9f3e7 Mon Sep 17 00:00:00 2001 -From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> -Date: Wed, 21 Dec 2011 22:29:02 +0100 -Subject: [PATCH] propagate gb_FULLDEPS - ---- - solenv/gbuild/source_and_rerun.mk | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk -index a2aaea0..27de233 100644 ---- a/solenv/gbuild/source_and_rerun.mk -+++ b/solenv/gbuild/source_and_rerun.mk -@@ -2,7 +2,7 @@ - gb_MAKEFILEDIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) - - define gb_SourceEnvAndRecurse_recurse --$(MAKE) -f $(firstword $(MAKEFILE_LIST)) -j $${GMAKE_PARALLELISM} $(1) gb_SourceEnvAndRecurse_STAGE=$(2) -+$(MAKE) -f $(firstword $(MAKEFILE_LIST)) -j $${GMAKE_PARALLELISM} $(1) gb_SourceEnvAndRecurse_STAGE=$(2) gb_FULLDEPS=$(gb_FULLDEPS) - endef - - ifneq ($(strip $(gb_PARTIALBUILD)),) --- -1.7.5.4 - diff --git a/app-office/libreoffice/files/libreoffice-3.5.4-libexttextcat.patch b/app-office/libreoffice/files/libreoffice-3.5.4-libexttextcat.patch deleted file mode 100644 index 905c6818afe1..000000000000 --- a/app-office/libreoffice/files/libreoffice-3.5.4-libexttextcat.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 25a605f36544582bd454d4bc0e71e684749a0b80 Mon Sep 17 00:00:00 2001 -From: Caolán McNamara <caolanm@redhat.com> -Date: Fri, 25 May 2012 14:51:04 +0000 -Subject: this is supposed to just be the number of bytes - -Change-Id: Iecd376aba13f94c5c62fab2f3278c5f3efda20b4 ---- -diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx b/lingucomponent/source/languageguessing/simpleguesser.cxx -index 383ab3e..3346ef2 100644 ---- a/lingucomponent/source/languageguessing/simpleguesser.cxx -+++ b/lingucomponent/source/languageguessing/simpleguesser.cxx -@@ -117,8 +117,7 @@ vector<Guess> SimpleGuesser::GuessLanguage(const char* text) - if (!h) - return guesses; - -- //calculate le number of unicode charcters (symbols) -- int len = utfstrlen(text); -+ int len = strlen(text); - - if (len > MAX_STRING_LENGTH_TO_ANALYSE) - len = MAX_STRING_LENGTH_TO_ANALYSE; --- -cgit v0.9.0.2-2-gbebe diff --git a/app-office/libreoffice/files/libreoffice-3.6.3.2-fix-poppler.patch b/app-office/libreoffice/files/libreoffice-3.6.3.2-fix-poppler.patch deleted file mode 100644 index 6ae1dd175485..000000000000 --- a/app-office/libreoffice/files/libreoffice-3.6.3.2-fix-poppler.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1296db324d5962ff904c0ed488a62132dd36a66f Mon Sep 17 00:00:00 2001 -From: Rene Engelhard <rene@debian.org> -Date: Wed, 31 Oct 2012 17:00:18 +0000 -Subject: fix sdext build with poppler >= 0.19.x - -Conflicts: - - configure.ac - -Change-Id: I655e8e15c7f7a8c292b3a1820ee48c29e847d05a -Signed-off-by: Tomas Chvatal <tchvatal@suse.cz> ---- -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index 87c0ab2..9d38e9b 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -497,7 +497,9 @@ void PDFOutDev::endPage() - printf("endPage\n"); - } - --#if POPPLER_CHECK_VERSION(0, 17, 0) -+#if POPPLER_CHECK_VERSION(0, 19, 0) -+void PDFOutDev::processLink(AnnotLink *link) -+#elif POPPLER_CHECK_VERSION(0, 17, 0) - void PDFOutDev::processLink(AnnotLink *link, Catalog *) - #else - void PDFOutDev::processLink(Link* link, Catalog*) -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index bba8f58..1911d57 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -201,10 +201,12 @@ namespace pdfi - // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy); - // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); - -- #if POPPLER_CHECK_VERSION(0, 17, 0) -- virtual void processLink(AnnotLink *link, Catalog *catalog); -- #else - //----- link borders -+ #if POPPLER_CHECK_VERSION(0, 19, 0) -+ virtual void processLink(AnnotLink *link); -+ #elif POPPLER_CHECK_VERSION(0, 17, 0) -+ virtual void processLink(AnnotLink *link, Catalog *catalog); -+ #else - virtual void processLink(Link *link, Catalog *catalog); - #endif - --- -cgit v0.9.0.2-2-gbebe diff --git a/app-office/libreoffice/files/libreoffice-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-system-pyuno.patch deleted file mode 100644 index c603d6acbb1a..000000000000 --- a/app-office/libreoffice/files/libreoffice-system-pyuno.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in -index defd7b2..ea2a809 100755 ---- a/desktop/scripts/soffice.sh.in -+++ b/desktop/scripts/soffice.sh.in -@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then - exit 1; - fi - -+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} -+export PYTHONPATH -+ - case "`uname -s`" in - NetBSD|OpenBSD|FreeBSD|DragonFly) - # this is a temporary hack until we can live with the default search paths -diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py -index f93ac5e..92a2891 100644 ---- a/pyuno/source/module/uno.py -+++ b/pyuno/source/module/uno.py -@@ -26,8 +26,12 @@ - # for a copy of the LGPLv3 License. - # - #************************************************************************* -+import os - import sys - -+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program') -+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: -+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc" - import pyuno - - try: -diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py -index 610ac5f..df243d0 100755 ---- a/scripting/source/pyprov/officehelper.py -+++ b/scripting/source/pyprov/officehelper.py -@@ -53,7 +53,7 @@ def bootstrap(): - if "UNO_PATH" in os.environ: - sOffice = os.environ["UNO_PATH"] - else: -- sOffice = "" # lets hope for the best -+ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program" - sOffice = os.path.join(sOffice, "soffice") - if platform.startswith("win"): - sOffice += ".exe" diff --git a/app-office/libreoffice/libreoffice-3.5.7.2.ebuild b/app-office/libreoffice/libreoffice-3.5.7.2.ebuild deleted file mode 100644 index 238bbd90c95e..000000000000 --- a/app-office/libreoffice/libreoffice-3.5.7.2.ebuild +++ /dev/null @@ -1,547 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.7.2.ebuild,v 1.2 2012/11/07 21:10:10 tetromino Exp $ - -EAPI=4 - -KDE_REQUIRED="optional" -QT_MINIMAL="4.7.4" -KDE_SCM="git" -CMAKE_REQUIRED="never" - -PYTHON_DEPEND="2" -PYTHON_USE_WITH="threads,xml" - -# experimental ; release ; old -# Usually the tarballs are moved a lot so this should make -# everyone happy. -DEV_URI=" - http://dev-builds.libreoffice.org/pre-releases/src - http://download.documentfoundation.org/libreoffice/src/3.5.7/ - http://download.documentfoundation.org/libreoffice/old/src -" -EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice" -ADDONS_URI="http://dev-www.libreoffice.org/src/" - -BRANDING="${PN}-branding-gentoo-0.5.tar.xz" -# PATCHSET="${P}-patchset-01.tar.xz" - -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" -inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="LibreOffice, a full office productivity suite." -HOMEPAGE="http://www.libreoffice.org" -SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" -[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" - -# Split modules following git/tarballs -# Core MUST be first! -MODULES="core binfilter help" -# Only release has the tarballs -if [[ ${PV} != *9999* ]]; then - for i in ${DEV_URI}; do - for mod in ${MODULES}; do - if [[ ${mod} == binfilter ]]; then - SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.xz )" - else - SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" - fi - done - unset mod - done - unset i -fi -unset DEV_URI - -# Really required addons -# These are bundles that can't be removed for now due to huge patchsets. -# If you want them gone, patches are welcome. -ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz" -ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )" -ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" -ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" -ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" -ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )" -ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" -SRC_URI+=" ${ADDONS_SRC}" - -unset ADDONS_URI -unset EXT_URI -unset ADDONS_SRC - -IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome +graphite gstreamer +gtk -jemalloc kde mysql nlpsolver +nsplugin odk opengl pdfimport postgres svg test -+vba +webdav +xmlsec" -LICENSE="LGPL-3" -SLOT="0" -[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" - -NSS_DEPEND=" - >=dev-libs/nspr-4.8.8 - >=dev-libs/nss-3.12.9 -" - -COMMON_DEPEND=" - app-arch/zip - app-arch/unzip - >=app-text/hunspell-1.3.2-r3 - app-text/mythes - >=app-text/libexttextcat-3.2 - app-text/libwpd:0.9[tools] - app-text/libwpg:0.2 - >=app-text/libwps-0.2.2 - <dev-cpp/libcmis-0.2 - dev-db/unixODBC - dev-libs/expat - >=dev-libs/glib-2.28 - >=dev-libs/hyphen-2.7.1 - >=dev-libs/icu-49 - >=dev-lang/perl-5.0 - >=dev-libs/openssl-1.0.0d - >=dev-libs/redland-1.0.14[ssl] - >=media-libs/fontconfig-2.8.0 - media-libs/freetype:2 - >=media-libs/libpng-1.4 - media-libs/libvisio - >=net-misc/curl-7.21.4 - sci-mathematics/lpsolve - >=sys-libs/db-4.8 - virtual/jpeg - >=x11-libs/cairo-1.10.0[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - dbus? ( >=dev-libs/dbus-glib-0.92 ) - eds? ( gnome-extra/evolution-data-server ) - gnome? ( gnome-base/gconf:2 ) - gtk? ( >=x11-libs/gtk+-2.24:2 ) - graphite? ( media-gfx/graphite2 ) - gstreamer? ( - >=media-libs/gstreamer-0.10:0.10 - >=media-libs/gst-plugins-base-0.10:0.10 - ) - java? ( - >=dev-java/bsh-2.0_beta4 - dev-java/lucene:2.9 - dev-java/lucene-analyzers:2.3 - ) - jemalloc? ( dev-libs/jemalloc ) - mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) - opengl? ( virtual/opengl ) - pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] ) - postgres? ( >=dev-db/postgresql-base-8.4.0 ) - svg? ( gnome-base/librsvg ) - webdav? ( net-libs/neon ) - xmlsec? ( ${NSS_DEPEND} ) -" - -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - !<app-openoffice/openoffice-bin-3.4.0-r1 - !app-office/openoffice - media-fonts/libertine-ttf - media-fonts/liberation-fonts - media-fonts/urw-fonts - cups? ( net-print/cups ) - java? ( >=virtual/jre-1.6 ) -" - -PDEPEND=" - >=app-office/libreoffice-l10n-3.5.0 -" - -# FIXME: cppunit should be moved to test conditional -# after everything upstream is under gbuild -# as dmake execute tests right away -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.46 - >=dev-libs/libxml2-2.7.8 - dev-libs/libxslt - dev-perl/Archive-Zip - dev-util/cppunit - >=dev-util/gperf-3 - dev-util/intltool - dev-util/mdds - virtual/pkgconfig - media-libs/sampleicc - net-misc/npapi-sdk - net-print/cups - >=sys-apps/findutils-4.4.2 - sys-devel/bison - sys-apps/coreutils - sys-devel/flex - sys-devel/gettext - >=sys-devel/make-3.82 - sys-libs/zlib - x11-libs/libXt - x11-libs/libXtst - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - java? ( - >=virtual/jdk-1.6 - >=dev-java/ant-core-1.7 - test? ( dev-java/junit:4 ) - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-system-pyuno.patch" - "${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch" - "${FILESDIR}/${PN}-3.5-doublebuild.patch" - "${FILESDIR}/${PN}-3.5-hebrew-icu49.patch" -) - -REQUIRED_USE=" - nsplugin? ( gtk ) - gnome? ( gtk ) - eds? ( gnome ) - nlpsolver? ( java ) -" - -S="${WORKDIR}/${PN}-core-${PV}" - -RESTRICT="test" - -pkg_pretend() { - local pgslot - - if [[ ${MERGE_TYPE} != binary ]]; then - CHECKREQS_MEMORY="512M" - CHECKREQS_DISK_BUILD="6G" - check-reqs_pkg_pretend - - if [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 5 ]] ) \ - ; then - eerror "Compilation with gcc older than 4.5 is not supported" - die "Too old gcc found." - fi - fi - - # ensure pg version - if use postgres; then - pgslot=$(postgresql-config show) - if [[ ${pgslot//.} < 90 ]] ; then - eerror "PostgreSQL slot must be set to 9.0 or higher." - eerror " postgresql-config set 9.0" - die "PostgreSQL slot is not set to 9.0 or higher." - fi - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - kde4-base_pkg_setup - - python_set_active_version 2 - python_pkg_setup - - if [[ ${MERGE_TYPE} != binary ]]; then - CHECKREQS_MEMORY="512M" - CHECKREQS_DISK_BUILD="6G" - check-reqs_pkg_pretend - fi -} - -src_unpack() { - local mod dest tmplfile tmplname mypv - - [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - if use branding; then - unpack "${BRANDING}" - fi - - if [[ ${PV} != *9999* ]]; then - for mod in ${MODULES}; do - if [[ ${mod} == binfilter ]] && ! use binfilter; then - continue - fi - unpack "${PN}-${mod}-${PV}.tar.xz" - if [[ ${mod} != core ]]; then - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}" - rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" - fi - done - else - for mod in ${MODULES}; do - if [[ ${mod} == binfilter ]] && ! use binfilter; then - continue - fi - mypv=${PV/.9999} - [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" - EGIT_PROJECT="${PN}/${mod}" - EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}" - EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" - EGIT_NOUNPACK="true" - git-2_src_unpack - if [[ ${mod} != core ]]; then - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}" - rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" - fi - done - unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH - fi -} - -src_prepare() { - # optimization flags - export ARCH_FLAGS="${CXXFLAGS}" - export LINKFLAGSOPTIMIZE="${LDFLAGS}" - - # patchset - if [[ -n ${PATCHSET} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - - base_src_prepare - - # please no debug in binfilter, it blows up things insanely - if use binfilter && ! use binfilterdebug ; then - for name in $(find "${S}/binfilter" -name makefile.mk) ; do - sed -i -e '1i\CFLAGS+= -g0' $name || die - done - fi - - eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - # system pyuno mess - sed \ - -e "s:%eprefix%:${EPREFIX}:g" \ - -e "s:%libdir%:$(get_libdir):g" \ - -i pyuno/source/module/uno.py \ - -i scripting/source/pyprov/officehelper.py || die - -} - -src_configure() { - local java_opts - local internal_libs - local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") - - # recheck that there is some value in jobs - [[ -z ${jbs} ]] && jbs="1" - - # sane: just sane.h header that is used for scan in writer, not - # linked or anything else, worthless to depend on - # vigra: just uses templates from there - # it is serious pain in the ass for packaging - # should be replaced by boost::gil if someone interested - internal_libs+=" - --without-system-sane - --without-system-vigra - " - - if use java; then - # hsqldb: system one is too new - # saxon: system one does not work properly - java_opts=" - --without-system-hsqldb - --without-system-saxon - --with-ant-home="${ANT_HOME}" - --with-jdk-home=$(java-config --jdk-home 2>/dev/null) - --with-java-target-version=$(java-pkg_get-target) - --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/" - --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) - --with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar) - --with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar) - " - if use test; then - java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)" - else - java_opts+=" --without-junit" - fi - fi - - if use branding; then - internal_libs+=" - --with-about-bitmap="${WORKDIR}/branding-about.png" - --with-intro-bitmap="${WORKDIR}/branding-intro.png" - " - fi - - # 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 - # --enable-*-link: link to the library rather than just dlopen on runtime - # --enable-release-build: build the libreoffice as release - # --disable-fetch-external: prevent dowloading during compile phase - # --disable-gnome-vfs: old gnome virtual fs support - # --disable-kdeab: kde3 adressbook - # --disable-kde: kde3 support - # --disable-ldap: ldap requires internal mozilla stuff, same like mozab - # --disable-mozilla: disable mozilla build that is used for adresbook, not - # affecting the nsplugin that is always ON - # --disable-pch: precompiled headers cause build crashes - # --disable-rpath: relative runtime path is not desired - # --disable-static-gtk: ensure that gtk is linked dynamically - # --disable-ugly: disable ugly pieces of code - # --disable-zenity: disable build icon - # --enable-extension-integration: enable any extension integration support - # --with-{max-jobs,num-cpus}: ensuring parallel building - # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs - # --without-stlport: disable deprecated extensions framework - # --disable-ext-report-builder: too much java packages pulled in - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ - --with-system-headers \ - --with-system-libs \ - --with-system-jars \ - --with-system-dicts \ - --enable-cairo-canvas \ - --enable-largefile \ - --enable-python=system \ - --enable-randr \ - --enable-randr-link \ - --enable-release-build \ - --enable-unix-qstart-libpng \ - --enable-mergelibs \ - --disable-ccache \ - --disable-crashdump \ - --disable-dependency-tracking \ - --disable-epm \ - --disable-fetch-external \ - --disable-gnome-vfs \ - --disable-ext-report-builder \ - --disable-kdeab \ - --disable-kde \ - --disable-ldap \ - --disable-mozilla \ - --disable-online-update \ - --disable-pch \ - --disable-rpath \ - --disable-systray \ - --disable-static-gtk \ - --disable-strip-solver \ - --disable-ugly \ - --disable-zenity \ - --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ - --with-build-version="Gentoo official package" \ - --enable-extension-integration \ - --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-tar="${DISTDIR}" \ - --with-lang="" \ - --with-max-jobs=${jbs} \ - --with-num-cpus=2 \ - --with-unix-wrapper=libreoffice \ - --with-vendor="Gentoo Foundation" \ - --with-x \ - --without-afms \ - --without-fonts \ - --without-myspell-dicts \ - --without-stlport \ - --without-system-mozilla \ - --without-help \ - --with-helppack-integration \ - --without-sun-templates \ - $(use_enable binfilter) \ - $(use_enable dbus) \ - $(use_enable eds evolution2) \ - $(use_enable gnome gconf) \ - $(use_enable gnome gio) \ - $(use_enable gnome lockdown) \ - $(use_enable graphite) \ - $(use_enable gstreamer) \ - $(use_enable gtk) \ - --disable-gtk3 \ - $(use_enable java ext-scripting-beanshell) \ - $(use_enable kde kde4) \ - $(use_enable mysql ext-mysql-connector) \ - $(use_enable nlpsolver ext-nlpsolver) \ - $(use_enable nsplugin) \ - $(use_enable odk) \ - $(use_enable opengl) \ - $(use_enable pdfimport ext-pdfimport) \ - $(use_enable postgres postgresql-sdbc) \ - $(use_enable svg librsvg system) \ - $(use_enable test linkoo) \ - $(use_enable vba) \ - $(use_enable vba activex-component) \ - $(use_enable webdav neon) \ - $(use_enable xmlsec) \ - $(use_with java) \ - $(use_with mysql system-mysql-cppconn) \ - ${internal_libs} \ - ${java_opts} -} - -src_compile() { - # hack for offlinehelp, this needs fixing upstream at some point - # it is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - ( - source "${S}/Env.Host.sh" 2&> /dev/null - - local path="${SOLARVER}/${INPATH}/res/img" - mkdir -p "${path}" || die - - echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=default_images/res/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=default_images/res/helpimg \ - > "${path}/helpimg.ilst" - [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug." - ) - - # not a proper make script - make build || die -} - -src_test() { - make check || die -} - -src_install() { - # This is not Makefile so no buildserver - make DESTDIR="${D}" distro-pack-install -o build -o check || die - - # Fix bash completion placement - newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} - rm -rf "${ED}"/etc/ - - # symlink the nsplugin to system location - if use nsplugin; then - inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so - fi - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - fi - - # Hack for offlinehelp, this needs fixing upstream at some point. - # It is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - insinto /usr/$(get_libdir)/libreoffice/help - doins xmlhelp/util/*.xsl -} - -pkg_preinst() { - # Cache updates - all handled by kde eclass for all environments - kde4-base_pkg_preinst -} - -pkg_postinst() { - kde4-base_pkg_postinst - - pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin - - use cups || \ - ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.' - - use java || \ - ewarn 'If you plan to use lbase aplication you should enable java or you will get various crashes.' -} - -pkg_postrm() { - kde4-base_pkg_postrm -} diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild index 2d54174cb16d..99a5d26c682b 100644 --- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild +++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2012 Gentoo Foundation +# 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-3.6.9999.ebuild,v 1.38 2012/12/19 20:22:04 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.39 2013/01/01 10:56:53 scarabeus Exp $ -EAPI=4 +EAPI=5 KDE_REQUIRED="optional" QT_MINIMAL="4.7.4" KDE_SCM="git" CMAKE_REQUIRED="never" -PYTHON_DEPEND="2" -PYTHON_USE_WITH="threads,xml" +PYTHON_COMPAT=( python{2_5,2_6,2_7} ) +PYTHON_REQ_USE="threads,xml" # experimental ; release ; old # Usually the tarballs are moved a lot so this should make @@ -27,7 +27,7 @@ BRANDING="${PN}-branding-gentoo-0.6.tar.xz" # PATCHSET="${P}-patchset-01.tar.xz" [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" -inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} +inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="LibreOffice, a full office productivity suite." @@ -93,6 +93,7 @@ SLOT="0" [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND=" + ${PYTHON_DEPS} app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 @@ -259,9 +260,7 @@ pkg_pretend() { pkg_setup() { java-pkg-opt-2_pkg_setup kde4-base_pkg_setup - - python_set_active_version 2 - python_pkg_setup + python-single-r1_pkg_setup [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup } diff --git a/app-office/libreoffice/libreoffice-4.0.9999.ebuild b/app-office/libreoffice/libreoffice-4.0.9999.ebuild index c12f7f7350d8..ca2a56e721f8 100644 --- a/app-office/libreoffice/libreoffice-4.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.0.9999.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2012 Gentoo Foundation +# 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-4.0.9999.ebuild,v 1.8 2012/12/18 21:52:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.9 2013/01/01 10:56:53 scarabeus Exp $ -EAPI=4 +EAPI=5 KDE_REQUIRED="optional" QT_MINIMAL="4.7.4" KDE_SCM="git" CMAKE_REQUIRED="never" -PYTHON_DEPEND="3:3.3" -PYTHON_USE_WITH="threads,xml" +PYTHON_COMPAT=( python3_3 ) +PYTHON_REQ_USE="threads,xml" # experimental ; release ; old # Usually the tarballs are moved a lot so this should make @@ -27,7 +27,7 @@ BRANDING="${PN}-branding-gentoo-0.7.tar.xz" # PATCHSET="${P}-patchset-01.tar.xz" [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" -inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} +inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="LibreOffice, a full office productivity suite." @@ -89,6 +89,7 @@ SLOT="0" [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND=" + ${PYTHON_DEPS} app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 @@ -266,9 +267,7 @@ pkg_pretend() { pkg_setup() { java-pkg-opt-2_pkg_setup kde4-base_pkg_setup - - python_set_active_version 3 - python_pkg_setup + python-single-r1_pkg_setup [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup } diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 0378ef76799b..39f1d76bc42b 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2012 Gentoo Foundation +# 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.145 2012/12/18 21:52:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.146 2013/01/01 10:56:53 scarabeus Exp $ -EAPI=4 +EAPI=5 KDE_REQUIRED="optional" QT_MINIMAL="4.7.4" KDE_SCM="git" CMAKE_REQUIRED="never" -PYTHON_DEPEND="3:3.3" -PYTHON_USE_WITH="threads,xml" +PYTHON_COMPAT=( python3_3 ) +PYTHON_REQ_USE="threads,xml" # experimental ; release ; old # Usually the tarballs are moved a lot so this should make @@ -27,7 +27,7 @@ BRANDING="${PN}-branding-gentoo-0.7.tar.xz" # PATCHSET="${P}-patchset-01.tar.xz" [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" -inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} +inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="LibreOffice, a full office productivity suite." @@ -89,6 +89,7 @@ SLOT="0" [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND=" + ${PYTHON_DEPS} app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 @@ -266,9 +267,7 @@ pkg_pretend() { pkg_setup() { java-pkg-opt-2_pkg_setup kde4-base_pkg_setup - - python_set_active_version 3 - python_pkg_setup + python-single-r1_pkg_setup [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup } |