gentoo resync : 24.12.2018

5 files changed, 64 insertions, 30 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 06fc558fa9fb..6250da429824 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,6 +3,7 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0a
 AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418
 AUX libreoffice-6.0.3.2-disable-flaky-tests-1.patch 8928 BLAKE2B e5399e0e520dfe4ac5d0a02c3bf3372ccdc7725f073aabb74c36600a7cd09eb45a9e5d5486bf700ae374723206e3a421069b298137d14a9b05e17e70f2d9d3b4 SHA512 ca100dc389ed93a5eeed35f001d9e0f6f886782bfaa3dead3105b9bce91ca9e721354b55cd67fdb40c7d2d64966c530ebc6ba6a4e3c62b0e006759c7b64f1b29
 AUX libreoffice-6.0.3.2-testTdf108947.patch 638 BLAKE2B 38da9bf34a921d22002d45e650c738687706c77a67ac2748ee14efb48f47a328b1339712687b525a4f66a1ad0b36fc69c0613ef441067a206ea4df81754f4727 SHA512 a712fb653d86a74a96d568805ca48d183a7ec71f32ef34cfb98a4999cb7fead3f5cd11f5d8f8944041583d5221b0dbaeb3cdfc625a1958118e867569d0c56479
+AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
@@ -10,13 +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.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
 DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e SHA512 8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
-DIST libreoffice-6.1.3.1-patchset-01.tar.xz 5068 BLAKE2B 5152903a580bbf44b40cb219c6d875753be354893470e6c5bad1b214ef3835529f3d1ba359baa362268d2b2bc72b698d4b319e0900e39c8dbfe9bfcfaaf0c171 SHA512 3cbf149f43ca89c1c22e6a67d6a66bc59e538588412b5363e662ee27ed764cd728fceffe141c7a49ea5c049640737e2fbbf673095397f422af9ae9b33af9e139
-DIST libreoffice-6.1.3.2.tar.xz 207404836 BLAKE2B d0ba57f8ca93a6bc4406ec21f1338659714af00afb861dca324a21af50abae160f3512bc1c0c5fbac23dfc24e7d8d855e377cb7e71e7ed3991456e922cb09d44 SHA512 1d3de497cbda49df6a59b550a18db5fc92f67ff522ba7432dea7052099226a260997c2efa0a59ce861c3bd921d7d569738721c5ed6efbd8a24e74c52eae5c484
+DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5 SHA512 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
-DIST libreoffice-help-6.1.3.2.tar.xz 15757496 BLAKE2B cebfe42728c0374c355ba8d449d1858e9596b19d76b689c5eac422fa8cc749fec88e0a44fcc55e4c13cfab7a8219f565bd62944e004b7afb6f2e1fb3571c2dde SHA512 e52c9ff796696ab3dc6d32b468f3ca13f346b999a7bdbbffb7811eb8b7b347f4feb9ee02ff500f8b9e64cc246bc171a6166fcbd43e79a9ee75e2dafe37df9994
+DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
 EBUILD libreoffice-6.0.6.2.ebuild 16750 BLAKE2B 7ea6bb2645ee81c15ed71d5353d15507ba5c29d05758de31af8528897f251880f08e08dad979c43d27a9199429c182ec618a038f772e5827106b824343e31948 SHA512 d7dafe868dfb5a59199f71090bc05cb6402aa247ee309e5fa199dcd00d2c44f57a5ddfc6e97f7f851c457d0fe7fb0d8033795b58ae626ff2c616dbbeb0c13e64
-EBUILD libreoffice-6.1.3.2.ebuild 16623 BLAKE2B 4a398b357886bc9612024d4d5d8e4af39de36c425f730f18e7f1f23500a22e4b0c40cfbcf771409f3d2e436d475acf3bcec6988881c98e290823afbd1e1a75f1 SHA512 03076b8bfd35d12ea051313de3a28b3e519f0fce84680e49022fb92fb94a7b91ecac4afe781038dbbad4efaa126d59671d10bdd7d009caef08ad3b630e24215d
-EBUILD libreoffice-6.1.9999.ebuild 16694 BLAKE2B bc79126c3c409458f2401b1018e8ba74bb4606aad94a40d6643678de94a6f3d49fa581dc5b3d8f34b96452842f2d2e4e0c9d0846341c6b9ad167c6680c40306c SHA512 b915f9faed3ea5c330fe044427aed94a9de4ae6310f1260110a96ab26a2515002f55685bd19f14e8bd6dafec1867d9b29199d303213edf51a78f06fbea11ae40
-EBUILD libreoffice-9999.ebuild 16785 BLAKE2B 9e09b6431e39ab5ec1943eb006056bfaf8e96098f982a13a244b81329d603acb5616b9be6cc18056cf9773669c3b45e2284e4d50ad8ac565686b21e67b29525b SHA512 fd8745c7e4d3491f76e9ad422ad5c0a5615a866b74ef5719c493b365dce82f44de93b90b203789361dbfa2cda4024b4adaa1f71c15c4f0a986dea228d211fce7
+EBUILD libreoffice-6.1.4.2.ebuild 16802 BLAKE2B cce42bed53384a2362edd12cee583a142991a0d4b7f97a9011cdcae0a37744fce32ca381807e1d688185a2beb3649a49940dad2ffa2cd85d2040397d2c998118 SHA512 a49bdff7cbb0bc586d5589c2c1cf07bae590425142480657bf9e4acc3a402780aa034b0c67efb79dda49a8d2e9e722fd7944875fad1445776ee6247d7c3a5b67
+EBUILD libreoffice-6.1.9999.ebuild 16802 BLAKE2B cce42bed53384a2362edd12cee583a142991a0d4b7f97a9011cdcae0a37744fce32ca381807e1d688185a2beb3649a49940dad2ffa2cd85d2040397d2c998118 SHA512 a49bdff7cbb0bc586d5589c2c1cf07bae590425142480657bf9e4acc3a402780aa034b0c67efb79dda49a8d2e9e722fd7944875fad1445776ee6247d7c3a5b67
+EBUILD libreoffice-9999.ebuild 16893 BLAKE2B be990cffb5cc7338165c1b72abff267e926b92436c38160704a2b2148802d1bbe32ea0b22788c4c6055b73b630572a3db4b901c855175ae80fb56b8a2978f69b SHA512 1e372bf57c226fd624005dfa04dc49c3299552aac862396d645a799cc4f3a395fe61c68e89b60370e1aca6f02004b45371b2aabca50feeedfa3b8ad62c765816
 MISC metadata.xml 1008 BLAKE2B 62a25f90e9b01f8fd924e861b0ddf1789e3124474cf73e2fad217e54e0324e38ad5bf37ff703b37bb5946d66e5de8711ff5e9b53a15e0ad368ebb3d04a3a05a3 SHA512 146662ca1c1dd7eb49c00b927657329befd3ee58ac0226ebb5fe81aefe90d7bf66ed6113cbe93774c0b917377eef8c1821a9ede278c9ba791a3ab544a2eaf2c7
diff --git a/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch b/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch
new file mode 100644
index 000000000000..ea6eb8b816ff
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch
@@ -0,0 +1,29 @@
+--- a/bin/distro-install-desktop-integration	2018-10-29 20:55:29.000000000 +0100
++++ b/bin/distro-install-desktop-integration	2018-11-22 02:03:36.464866894 +0100
+@@ -39,22 +39,20 @@
+ 
+ create_man_link()
+ {
+-    echo "Install $MANDIR/man1/$1.1.gz"
++    echo "Install $MANDIR/man1/$1.1"
+ 
+     mkdir -p $DESTDIR$MANDIR/man1
+     echo ".so man1/$2.1" >| $DESTDIR$MANDIR/man1/$1.1
+-    gzip -f $DESTDIR$MANDIR/man1/$1.1
+-    test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$3"
++    test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1" >>"$DESTDIR/$3"
+ }
+ 
+ install_man()
+ {
+-    echo "Install $MANDIR/man1/$1.1.gz"
++    echo "Install $MANDIR/man1/$1.1"
+ 
+     mkdir -p $DESTDIR$MANDIR/man1
+     cp "${SRCDIR?}"/sysui/desktop/man/$1.1 $DESTDIR$MANDIR/man1 || exit 1;
+-    gzip -f $DESTDIR$MANDIR/man1/$1.1
+-    test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$2"
++    test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1" >>"$DESTDIR/$2"
+ }
+ 
+ 
diff --git a/app-office/libreoffice/libreoffice-6.1.3.2.ebuild b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
index 16abc13fd3e6..29174b9eb1cd 100644
--- a/app-office/libreoffice/libreoffice-6.1.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
 
 MY_PV="${PV/_alpha/.alpha}"
 MY_PV="${MY_PV/_beta/.beta}"
@@ -18,11 +18,10 @@ DEV_URI="
 ADDONS_URI="https://dev-www.libreoffice.org/src/"
 
 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.1.3.1-patchset-01.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
 
-[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
-unset SCM_ECLASS
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="A full office productivity suite"
 HOMEPAGE="https://www.libreoffice.org"
@@ -136,7 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
-	sys-libs/zlib:=
+	sys-libs/zlib
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
@@ -194,9 +193,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin
 	!app-office/libreoffice-bin-debug
 	!app-office/openoffice
-	media-fonts/dejavu
 	media-fonts/liberation-fonts
-	media-fonts/libertine
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
 	java? ( >=virtual/jre-1.6 )
 	kde? ( kde-frameworks/breeze-icons:* )
@@ -214,6 +211,7 @@ fi
 # FIXME: cppunit should be moved to test conditional
 #        after everything upstream is under gbuild
 #        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/libatomic_ops-7.2d
 	dev-perl/Archive-Zip
@@ -239,18 +237,17 @@ DEPEND="${COMMON_DEPEND}
 		app-crypt/gnupg
 		dev-util/cppunit
 		media-fonts/dejavu
+		media-fonts/liberation-fonts
 	)
 "
 
 PATCHES=(
-	"${WORKDIR}"/${PATCHSET/.tar.xz/}
+	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
 
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
-	# TODO: upstream
-	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -297,6 +294,7 @@ src_unpack() {
 		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
 		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
 		git-r3_checkout "${base_uri}/${PN}/core"
+		LOCOREGIT_VERSION=${EGIT_VERSION}
 
 		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
 		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
@@ -368,6 +366,11 @@ src_configure() {
 		export MOC5="$(qt5_get_bindir)/moc"
 	fi
 
+	local gentoo_buildid="Gentoo official package"
+	if [[ -n ${LOCOREGIT_VERSION} ]]; then
+		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+	fi
+
 	# system headers/libs/...: enforce using system packages
 	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
 	# --enable-cairo: ensure that cairo is always required
@@ -406,7 +409,7 @@ src_configure() {
 		--disable-qt5
 		--disable-report-builder
 		--with-alloc=system
-		--with-build-version="Gentoo official package"
+		--with-build-version="${gentoo_buildid}"
 		--enable-extension-integration
 		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
 		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 94aaaa087d8a..29174b9eb1cd 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
 
 MY_PV="${PV/_alpha/.alpha}"
 MY_PV="${MY_PV/_beta/.beta}"
@@ -135,7 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
-	sys-libs/zlib:=
+	sys-libs/zlib
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
@@ -193,9 +193,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin
 	!app-office/libreoffice-bin-debug
 	!app-office/openoffice
-	media-fonts/dejavu
 	media-fonts/liberation-fonts
-	media-fonts/libertine
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
 	java? ( >=virtual/jre-1.6 )
 	kde? ( kde-frameworks/breeze-icons:* )
@@ -213,6 +211,7 @@ fi
 # FIXME: cppunit should be moved to test conditional
 #        after everything upstream is under gbuild
 #        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/libatomic_ops-7.2d
 	dev-perl/Archive-Zip
@@ -238,6 +237,7 @@ DEPEND="${COMMON_DEPEND}
 		app-crypt/gnupg
 		dev-util/cppunit
 		media-fonts/dejavu
+		media-fonts/liberation-fonts
 	)
 "
 
@@ -247,6 +247,7 @@ PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 4cf5eb3b938f..de17c67160e6 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
 
 MY_PV="${PV/_alpha/.alpha}"
 MY_PV="${MY_PV/_beta/.beta}"
@@ -135,7 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
-	sys-libs/zlib:=
+	sys-libs/zlib
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
@@ -196,9 +196,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin
 	!app-office/libreoffice-bin-debug
 	!app-office/openoffice
-	media-fonts/dejavu
 	media-fonts/liberation-fonts
-	media-fonts/libertine
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
 	java? ( >=virtual/jre-1.6 )
 	kde? ( kde-frameworks/breeze-icons:* )
@@ -216,6 +214,7 @@ fi
 # FIXME: cppunit should be moved to test conditional
 #        after everything upstream is under gbuild
 #        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/libatomic_ops-7.2d
 	dev-perl/Archive-Zip
@@ -241,6 +240,7 @@ DEPEND="${COMMON_DEPEND}
 		app-crypt/gnupg
 		dev-util/cppunit
 		media-fonts/dejavu
+		media-fonts/liberation-fonts
 	)
 "
 
@@ -250,6 +250,7 @@ PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"