diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
commit | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch) | |
tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /app-office/libreoffice | |
parent | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff) |
gentoo resync : 19.03.2019
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r-- | app-office/libreoffice/Manifest | 10 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.2.1.2.ebuild (renamed from app-office/libreoffice/libreoffice-6.2.1.1.ebuild) | 66 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.2.9999.ebuild | 65 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 61 |
4 files changed, 100 insertions, 102 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 885205728869..ca2a360f3e51 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -11,12 +11,12 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140 DIST libreoffice-6.2.1.1-patchset-01.tar.xz 8404 BLAKE2B 6fd1a3e931a1d3ef040e0e79ff53299fb47a55bf36f98998ebb896738a639aca8844bf6a5bb5fcbf3a5afeae935cb3e637436dcba456df005d00d5ed5a80e0d0 SHA512 eff36e8b5af2a592572ed60d9f22f59d8611dd5f62977ad93aa957181173d479a19f5907673b0f7532bfcca728a12a20101f2282914a34e0f0a53fd53e682ef3 -DIST libreoffice-6.2.1.1.tar.xz 213874132 BLAKE2B f8d4cc02e712f84363bca723e18127c25c76e2057985333c1045a5f656bb6482d7c381a5407dbf08ee5d1ca0f8692e43290ad90b8ed11ee5c4753072760a432f SHA512 92c79b62e99c9928eed2a0c1c14fe147f7bd0d6f891a87525b38fc3964bd298587f42f363503a93853bf57ecf898b4f0dd15d5064fcd354a8d3b4b7eba118b13 +DIST libreoffice-6.2.1.2.tar.xz 213885668 BLAKE2B b1b15dacfded68e9ce2c183e211928d732564ef0a51a967216545d8ff39bf52e72ecbcb53672cc9d967cb4474fc10efbd97e3d9107d3f7169138c62e8221f212 SHA512 0d18e5f470b3e8a70d1679c7acdc91887cbbbb2032e1eb452308d257a6bc02d42e93fec66709c84838f7565e42217ac1d2b121e3356f7c754fc7ee33b7c6f0ef DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f -DIST libreoffice-help-6.2.1.1.tar.xz 16186528 BLAKE2B 69b42c88a2c4ff9efe06d397bed3d782805ce85bffdc52ce02742e7f8a65e36ecdd3e08ed9639941fa4a7812fe02405865fb2aff7ef73b41f4a8df0c77019222 SHA512 0e5e753cacae453ceeb299ea6137e249078b50e6cb8797704175fc39355d2c644e4e402838d5eb32ee62c90231ea27bc65bfe8990957a61120e9caf00242d39c +DIST libreoffice-help-6.2.1.2.tar.xz 16187168 BLAKE2B 3b24bfa2b7f859329597305e98694d164b82f3bc6767b82df9d6b35951455d98ffaa19cb42417e1b3ece73fe35b3abebbd11fb8a0cd38f370fc7ed203b26bc55 SHA512 c8bd2765b46162203d0b0acc06dc76108bd0093020981e1030d26d5a8771fb9494337c16cc99c10b7de7a906e713dd27555b0af8754d142387c3a968fa663a2f EBUILD libreoffice-6.1.5.2.ebuild 16965 BLAKE2B b4c7e322edfeed776794f313ed3e7382f35e8ba072ce058749b4bcd6627749f592862365fa8a499bd981ad2220bc60dcdd7dc574eff7612773b4351209a4838d SHA512 e59d2fcaa749c73f52faf339c78ff92b5ceae9f952509227b6f346cb4467b0737ea27349d64d9ab6dac5966ed356ccd2cd352156ea8a2b866fadf830d57bf996 -EBUILD libreoffice-6.2.1.1.ebuild 16882 BLAKE2B ae0be771b6f39b2f1c6187494767860541a94c69c8b69e7cb3dfa708afee16056d4b048fe119789c359e0ae3e91e49f5dacbf8d05c883d0fa9d74b683e2b5b4e SHA512 af76eb401ee7cbe4f571a61371dd74217dd6345c8cb3a54a727fe7d10e3e58dfc05ec857d7807759b7672e5ad7b917699e7f47cbdc6ef4b5e382d8ddd6d094a9 -EBUILD libreoffice-6.2.9999.ebuild 16877 BLAKE2B 8d658b1638b8701418c1e9c2627643ead7e4c522373529e5f2841c8f499bdd5b3dd034e7c7f4dc66d598d4df1bbabdb115d26bb1750b37df407f6c7e2ff43cc7 SHA512 0047a128972a9103944fc50ab498349156015153e2d73051ce8b822647cac1d6116de409fc941f064e9597e09ec1b3acd9afd2994679bc8af8262795f52f919b -EBUILD libreoffice-9999.ebuild 16810 BLAKE2B 720ad5222852d017c242a6659788fdb81586ccbafa8ff09cac1831c482335b156714781d700b67676f4d5fb24686fc6ecc50ea563a6e91d0f7d3ffcdb0389956 SHA512 15e040b739a7f572e43a91edee6dba625e8caf6c619ed28b83695f0054d344a55499f7359a1ba53ea666c8a16b0af7d6c51b5b7c53d4806003da45ea2ab0514e +EBUILD libreoffice-6.2.1.2.ebuild 16870 BLAKE2B 504f41bf2ba2f2c96bf2c34c427e7a4c1dca1aa37a7ab1240a95203a7dc57bf9e27d28108e322c9c9b81a9145235fc6f79138ea9dd47c5ba3ad584dab40c3ca9 SHA512 4705d5089179769b2dc44b0c9300f351dd7825c57b8d5ab2b494777903fbc46b5cff2c11c8f3e47326d8c518a96d82bdb7e750a75992cfaae04e054c29980ab0 +EBUILD libreoffice-6.2.9999.ebuild 17096 BLAKE2B bbcc6a14713f40ded9ef056c53e40572d0116626f66937984cf53bfe20faae484796889cde299364a725b8eaf3b3c04dc7a3ac4a281c4c02d9ec55c881c091dc SHA512 44bd3df5227cc048f2a88364faa84cbab6028933f46c689a68407af8f0e735543285064c5a424f54225878861206047a3e62a58b1e1c7f8e1eded0b7beca1099 +EBUILD libreoffice-9999.ebuild 16803 BLAKE2B 59ee769ff2fe9c81bbfc280114d835eee84657d1d5ad678624dadc5270549af9c3d55a8cefe57a2df830998c4cb154b6263dc9b8b99eac8e6d8d208074adc6ea SHA512 a167030961143a01865af85176ac8615fec7fc2859427afa2c17b1440e33f218d5f18c761162d7b6db01766b0b6acdc64beaa64198f11a6fd6e098358d3a7c44 MISC metadata.xml 1086 BLAKE2B 486defe600d5a74151756ff486e6eca7d529491dfc8db061c6589dc122d9c47e97f8301f28cb86b566ba69e578b9ae6d1e5dae2ca44972e322ccdb1e829aea94 SHA512 c29b3763e187455edc966fb2fdd85cd22faaa5c58b0dbdafc80c9c0ae8ea8400c189723778a86d108869d8891d9d0db5e1e7de931303737178c1e1f084d6f8c7 diff --git a/app-office/libreoffice/libreoffice-6.2.1.1.ebuild b/app-office/libreoffice/libreoffice-6.2.1.2.ebuild index 410e0c324069..33dcacf28ec1 100644 --- a/app-office/libreoffice/libreoffice-6.2.1.1.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.1.2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) PYTHON_REQ_USE="threads(+),xml" @@ -18,10 +18,10 @@ DEV_URI=" ADDONS_URI="https://dev-www.libreoffice.org/src/" BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -PATCHSET="${P}-patchset-01.tar.xz" +PATCHSET="${PN}-6.2.1.1-patchset-01.tar.xz" [[ ${MY_PV} == *9999* ]] && inherit git-r3 -inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg +inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" @@ -77,9 +77,16 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="" -# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +BDEPEND=" + dev-util/intltool + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + odk? ( >=app-doc/doxygen-1.8.4 ) +" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip app-arch/zip @@ -193,26 +200,6 @@ COMMON_DEPEND="${PYTHON_DEPS} pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) " - -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - !app-office/openoffice - media-fonts/liberation-fonts - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( >=virtual/jre-1.6 ) - kde? ( kde-frameworks/breeze-icons:* ) - vlc? ( media-video/vlc ) -" - -if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then - PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" -else - # Translations are not reliable on live ebuilds - # rather force people to use english only. - PDEPEND="!app-office/libreoffice-l10n" -fi - # FIXME: cppunit should be moved to test conditional # after everything upstream is under gbuild # as dmake execute tests right away @@ -222,14 +209,9 @@ DEPEND="${COMMON_DEPEND} dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 - dev-util/intltool >=dev-util/mdds-1.4.1:1= media-libs/glm - sys-devel/bison - sys-devel/flex - sys-devel/gettext sys-devel/ucpp - virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst @@ -237,7 +219,6 @@ DEPEND="${COMMON_DEPEND} dev-java/ant-core >=virtual/jdk-1.6 ) - odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit @@ -245,6 +226,23 @@ DEPEND="${COMMON_DEPEND} media-fonts/liberation-fonts ) " +RDEPEND="${COMMON_DEPEND} + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + !app-office/openoffice + media-fonts/liberation-fonts + || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) + java? ( >=virtual/jre-1.6 ) + kde? ( kde-frameworks/breeze-icons:* ) + vlc? ( media-video/vlc ) +" +if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then + PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" +else + # Translations are not reliable on live ebuilds + # rather force people to use english only. + PDEPEND="!app-office/libreoffice-l10n" +fi PATCHES=( # master branch @@ -555,7 +553,7 @@ src_install() { insinto /usr/$(get_libdir)/${PN}/program newins "${WORKDIR}/branding-sofficerc" sofficerc dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die fi # Hack for offlinehelp, this needs fixing upstream at some point. @@ -564,8 +562,8 @@ src_install() { insinto /usr/$(get_libdir)/libreoffice/help doins xmlhelp/util/*.xsl - pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin } pkg_preinst() { diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild index 4b4ea02af443..caf354cdab3b 100644 --- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) PYTHON_REQ_USE="threads(+),xml" @@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" PATCHSET="${PN}-6.2.1.1-patchset-01.tar.xz" [[ ${MY_PV} == *9999* ]] && inherit git-r3 -inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg +inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" @@ -79,6 +79,14 @@ SLOT="0" [[ ${MY_PV} == *9999* ]] || \ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +BDEPEND=" + dev-util/intltool + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + odk? ( >=app-doc/doxygen-1.8.4 ) +" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip app-arch/zip @@ -192,26 +200,6 @@ COMMON_DEPEND="${PYTHON_DEPS} pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) " - -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - !app-office/openoffice - media-fonts/liberation-fonts - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( >=virtual/jre-1.6 ) - kde? ( kde-frameworks/breeze-icons:* ) - vlc? ( media-video/vlc ) -" - -if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then - PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" -else - # Translations are not reliable on live ebuilds - # rather force people to use english only. - PDEPEND="!app-office/libreoffice-l10n" -fi - # FIXME: cppunit should be moved to test conditional # after everything upstream is under gbuild # as dmake execute tests right away @@ -221,14 +209,9 @@ DEPEND="${COMMON_DEPEND} dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 - dev-util/intltool >=dev-util/mdds-1.4.1:1= media-libs/glm - sys-devel/bison - sys-devel/flex - sys-devel/gettext sys-devel/ucpp - virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst @@ -236,7 +219,6 @@ DEPEND="${COMMON_DEPEND} dev-java/ant-core >=virtual/jdk-1.6 ) - odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit @@ -244,11 +226,30 @@ DEPEND="${COMMON_DEPEND} media-fonts/liberation-fonts ) " +RDEPEND="${COMMON_DEPEND} + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + !app-office/openoffice + media-fonts/liberation-fonts + || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) + java? ( >=virtual/jre-1.6 ) + kde? ( kde-frameworks/breeze-icons:* ) + vlc? ( media-video/vlc ) +" +if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then + PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" +else + # Translations are not reliable on live ebuilds + # rather force people to use english only. + PDEPEND="!app-office/libreoffice-l10n" +fi PATCHES=( # master branch "${FILESDIR}/${PN}-6.2-ldap-optional.patch" - "${WORKDIR}"/${PATCHSET/.tar.xz/} + "${WORKDIR}"/${PATCHSET/.tar.xz/}/001-qt5-change-salgraphics-gettextlayout-def.patch + "${WORKDIR}"/${PATCHSET/.tar.xz/}/002-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch + "${WORKDIR}"/${PATCHSET/.tar.xz/}/003-qt5-fpicker-honor-autoextension.patch # not upstreamable stuff "${FILESDIR}/${PN}-5.4-system-pyuno.patch" @@ -554,7 +555,7 @@ src_install() { insinto /usr/$(get_libdir)/${PN}/program newins "${WORKDIR}/branding-sofficerc" sofficerc dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die fi # Hack for offlinehelp, this needs fixing upstream at some point. @@ -563,8 +564,8 @@ src_install() { insinto /usr/$(get_libdir)/libreoffice/help doins xmlhelp/util/*.xsl - pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin } pkg_preinst() { diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 66452c403fbd..33af7c8cd646 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) PYTHON_REQ_USE="threads(+),xml" @@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" # PATCHSET="${P}-patchset-01.tar.xz" [[ ${MY_PV} == *9999* ]] && inherit git-r3 -inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg +inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" @@ -79,6 +79,14 @@ SLOT="0" [[ ${MY_PV} == *9999* ]] || \ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +BDEPEND=" + dev-util/intltool + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + odk? ( >=app-doc/doxygen-1.8.4 ) +" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip app-arch/zip @@ -192,26 +200,6 @@ COMMON_DEPEND="${PYTHON_DEPS} pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) " - -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - !app-office/openoffice - media-fonts/liberation-fonts - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( >=virtual/jre-1.6 ) - kde? ( kde-frameworks/breeze-icons:* ) - vlc? ( media-video/vlc ) -" - -if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then - PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" -else - # Translations are not reliable on live ebuilds - # rather force people to use english only. - PDEPEND="!app-office/libreoffice-l10n" -fi - # FIXME: cppunit should be moved to test conditional # after everything upstream is under gbuild # as dmake execute tests right away @@ -221,14 +209,9 @@ DEPEND="${COMMON_DEPEND} dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 - dev-util/intltool >=dev-util/mdds-1.4.1:1= media-libs/glm - sys-devel/bison - sys-devel/flex - sys-devel/gettext sys-devel/ucpp - virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst @@ -236,7 +219,6 @@ DEPEND="${COMMON_DEPEND} dev-java/ant-core >=virtual/jdk-1.6 ) - odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit @@ -244,6 +226,23 @@ DEPEND="${COMMON_DEPEND} media-fonts/liberation-fonts ) " +RDEPEND="${COMMON_DEPEND} + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + !app-office/openoffice + media-fonts/liberation-fonts + || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) + java? ( >=virtual/jre-1.6 ) + kde? ( kde-frameworks/breeze-icons:* ) + vlc? ( media-video/vlc ) +" +if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then + PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" +else + # Translations are not reliable on live ebuilds + # rather force people to use english only. + PDEPEND="!app-office/libreoffice-l10n" +fi PATCHES=( # "${WORKDIR}"/${PATCHSET/.tar.xz/} @@ -552,7 +551,7 @@ src_install() { insinto /usr/$(get_libdir)/${PN}/program newins "${WORKDIR}/branding-sofficerc" sofficerc dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die fi # Hack for offlinehelp, this needs fixing upstream at some point. @@ -561,8 +560,8 @@ src_install() { insinto /usr/$(get_libdir)/libreoffice/help doins xmlhelp/util/*.xsl - pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin } pkg_preinst() { |