diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-29 20:19:23 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-29 20:19:23 +0100 |
| commit | 12bb627384ddfd47382b9f1b6464481a58d01ebb (patch) | |
| tree | f9760c04ccd4fcd7de214e2acd5b0e43fb530aa9 /app-office/libreoffice | |
| parent | 5fdd950c7ae03e12746a45c86d85861beaacc846 (diff) | |
gentoo resync : 29.08.2018
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/Manifest | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-6.1.9999.ebuild | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 10 |
3 files changed, 11 insertions, 7 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index d1127e778389..3faf87d7b15a 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -20,6 +20,6 @@ DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3a DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5 SHA512 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13 EBUILD libreoffice-6.0.3.2.ebuild 16953 BLAKE2B 9b17913bb18d607ac0141226e54199b1d48c5f88a66d9ba8a6bb40459e35c1301a57c0b111a23f12e03daba9e9e6b850e874d64e4d2a37bba809dbff24201eb8 SHA512 acd68e679413031897fe17a27b1da7c688522ca4e773174be5ab1595c588b62e0969f72fa758f1548d9adce54cca151ecd5edfee1193dcf568ec5fc4b8265a22 EBUILD libreoffice-6.0.6.2.ebuild 16750 BLAKE2B 7ea6bb2645ee81c15ed71d5353d15507ba5c29d05758de31af8528897f251880f08e08dad979c43d27a9199429c182ec618a038f772e5827106b824343e31948 SHA512 d7dafe868dfb5a59199f71090bc05cb6402aa247ee309e5fa199dcd00d2c44f57a5ddfc6e97f7f851c457d0fe7fb0d8033795b58ae626ff2c616dbbeb0c13e64 -EBUILD libreoffice-6.1.9999.ebuild 16533 BLAKE2B ac11c68340706f89e7e25dee5fb2e6ad2f1301c20ebc7883892fa78ba997225c48121ba4882eb2dc12399281dea013c024e6fd713ef84ee04da82069ee2aab4d SHA512 a370fafd44229c2df400754b53f261f3fc3388adf96bf8b2c1d6e408e7fe8a695487921e78621311f87506732841569c0e63161ae4f4d8ed8af4b95f941f5be7 -EBUILD libreoffice-9999.ebuild 16527 BLAKE2B 7941f76ce5f0030d1995394cf9bbcec24e4bbf70688dcd43d88cb13e3673dc4b627da06c256748c0adfda4508a0b669acf167c688f6041c230409a3d5673ff11 SHA512 a196eacab025ce720c58ec95d70a6337913916b660db670afb5a16a5427abf235cbf60747a7036c24b3ab5fbf70a412df71433f0ae7e4d7b23a901aec0f60fb2 +EBUILD libreoffice-6.1.9999.ebuild 16517 BLAKE2B 82b9cf3fad314a2a9099678beeeaf32b8cc10dd435161e072eafe75f5f804664c6f886da1cd3f5b5e2b143321bf5f1d66b239c1844988f3ce7f5c3a6f1c80058 SHA512 343504186ab1d951f6096b370910120b80d6dd8d329551763cdfd1762e3d0aed9aa83f42274a5c80317b7c0cc1792770563cd7cc06a547295c768ab23c1dfd80 +EBUILD libreoffice-9999.ebuild 16604 BLAKE2B df09b1b62b6dabdcbfaffbac81d5d27a3b53a18e88703bb1a2a4950a1a77f2856153f302499349fba8fe63150357e056275a6f3f694ce4acbbdcfbf40aa595cb SHA512 aa24bbb10b5d879a011b6924bdb2e21ae86fec3991a83dfcbfa00e200b75ba7b01e245bbc9c73854cdb2808c4c6036196efb925f2f619891058a809117261968 MISC metadata.xml 1090 BLAKE2B b30fc707317ea0601859f327540712eae38a9fc7365675501fca648e17e2ee3b35c2391e76dc7878b53e5216ca4eb2618595fbac2e07d8680f8daeaa67aaeeeb SHA512 4ffa1f2d605bc5666e25ce126d3264f9ed272ae1b12b9dd17ae366462d58de4a64767ee63928b233c21a15a77b549eb5c574064e73164cb20b0adb6ce12a9ec2 diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild index 46abef27e981..11cbcd4c3e81 100644 --- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild @@ -398,9 +398,11 @@ src_configure() { --disable-epm --disable-fetch-external --disable-gstreamer-0-10 + --disable-kde5 --disable-online-update --disable-openssl --disable-pdfium + --disable-qt5 --disable-report-builder --with-alloc=system --with-build-version="Gentoo official package" @@ -432,8 +434,6 @@ src_configure() { $(use_enable gtk gtk3) $(use_enable gtk2 gtk) $(use_enable kde gtk3-kde5) - $(use_enable kde kde5) - $(use_enable kde qt5) $(use_enable mysql ext-mariadb-connector) $(use_enable odk) $(use_enable pdfimport) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 8654bb522fb3..fa678928f90a 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -69,7 +69,6 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) - kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -120,6 +119,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] + media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 @@ -222,7 +222,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool - >=dev-util/mdds-1.2.3:1= + >=dev-util/mdds-1.4.1:1= media-libs/glm sys-devel/bison sys-devel/flex @@ -388,6 +388,7 @@ src_configure() { --with-system-headers --with-system-jars --with-system-libs + --enable-build-opensymbol --enable-cairo-canvas --enable-largefile --enable-mergelibs @@ -433,7 +434,6 @@ src_configure() { $(use_enable gstreamer gstreamer-1-0) $(use_enable gtk gtk3) $(use_enable gtk2 gtk) - $(use_enable kde gtk3-kde5) $(use_enable kde kde5) $(use_enable kde qt5) $(use_enable mysql ext-mariadb-connector) @@ -449,6 +449,10 @@ src_configure() { $(use_with odk doxygen) ) + if use gtk && use kde; then + myeconfargs+=( --enable-gtk3-kde5 ) + fi + if use eds || use gtk; then myeconfargs+=( --enable-dconf --enable-gio ) else |