11 files changed, 8 insertions, 237 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index beefb6e3ce07..bc5f895d8aae 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index b3f0acdc6bcf..f04e39576bcc 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -2,6 +2,6 @@ DIST homebank-5.1.3.tar.gz 2686661 BLAKE2B bd43e3bc2d5d2c42e80cfc32b2beaa923b7c9
 DIST homebank-5.2.2.tar.gz 2601784 BLAKE2B e0a66cebbdc9247aeba9946c4adf5b6677abb49cd93d212fc8008c44c53a21966ee4fa1291f887196fe3168de992a892d54fe82aec228a88f613b45358076dd2 SHA512 83ccf7f96b1eb9f2e5c134b151dce53790092e2ecb06f5e6a5e50057d6a32cde6cf45b9e98c07a81e7f224d33dae5d98e4693e57c413df675f63d21b418525b0
 DIST homebank-5.2.3.tar.gz 2665397 BLAKE2B d197a113b1387c414ba8d11ebe012d0887dbfb1d9eb20c61197e0ddcf87da64e09b2bff108c07b350a1326f8b935fb4c8d56f14240e9815df5b021ab75a3f7dc SHA512 7b6530aa609ea047a19aadb65e459406226cc94d07a5a44e7ba06535cafcfe52e8b2471644b2bffbeb20cd699167858d2787ebdbc45166e4c7720fbff717b3de
 EBUILD homebank-5.1.3.ebuild 1013 BLAKE2B 9424e98145e2dabad30dd7c83e4d59bb0f1e19c5eb9e61b3c61a784eb20d9c626e0b6b94b0ae8790ded9362c9327a6c818a9b720aa77a43a3dda4591f90c0e5b SHA512 49e5ec89c7dc355caf8f76bb727a512d8dc8c98f1dc1e794e1003f557167767472cf3cc85b1027f67d4f1647eb16fdf5fa0dc13e77d387c704bd6996bab18f41
-EBUILD homebank-5.2.2.ebuild 1000 BLAKE2B 781e7e42272458172dddc4436444a91197515c374146a300e52ea064479c222e0a9edc48642c4d7b079fb8281691078c912453fefa9ae3172526650ee680ce91 SHA512 6d3c5c55c8a510cf7821959c10e158404f773d33e133f511897cc46d4206fc422f132cd5371ea4d17095bcfeb6831e2fbabb59f4333afc58affa7647955dfdeb
+EBUILD homebank-5.2.2.ebuild 999 BLAKE2B 53aec6f626399963ea20591bb4a5f0e94d25b0d47b8df2da17f8886e4231349a6f15d1183f8c58848342c813f196ec26e375c8e98cdb4a605bfcff127d462aac SHA512 0ea5bd890af50e49811afdc5d8fe1fc49ef708a96b633fe84ffce587591eea33bb83a63a2ab87ed0a0a22879d475c2c20931003c90ead0fd3ba8ade029e00ba7
 EBUILD homebank-5.2.3.ebuild 1002 BLAKE2B 0de0aa1becd47738cea68abbf8289d964ea9a3671bdbee45cf1664fa551989577e3a8754adc03c495db6b199543e296f86541f142937f4b9973728e74413170c SHA512 fd73b62f725cefd5fa55da99b93f2d29ef82c4fd0e470da7312e5f5c914650a6334e0d8d6a6bb38a777737fcaca5ba86edf094c3475a4d6caa674bf1106a9001
 MISC metadata.xml 246 BLAKE2B 1c5c874dba813702c9e2e0147a6d99d357e2570756e7e15379e972c638d820c953aa010c7a00e26efce9a5d9936c88111176a47c540a90c38c49b889239deea9 SHA512 4f7ed62ba7f03a650ba8db92de0fd24d5a5fecb9866aa28011f7bb10d13f7fcff92bae46d1b68c5d5c03fe39b45a36dc264db290c8518cb2ed77ffbca93af563
diff --git a/app-office/homebank/homebank-5.2.2.ebuild b/app-office/homebank/homebank-5.2.2.ebuild
index c9d81bdf37c7..d7e0d5401663 100644
--- a/app-office/homebank/homebank-5.2.2.ebuild
+++ b/app-office/homebank/homebank-5.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+ofx"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 RDEPEND=">=dev-libs/glib-2.39
 	>=net-libs/libsoup-2.26
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 1d3ea2b7d06f..89fe271757a6 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -24,5 +24,5 @@ DIST x86-bin-libreoffice-kde-6.2.4.2.xd3 18283075 BLAKE2B 485b77a94350861c615388
 DIST x86-bin-libreoffice-kde-java-6.1.5.2.xd3 25252595 BLAKE2B 207ae00d0b210bd869d3d19d7348ee0380153c7d108ddb03d5bdac92718b78106fac321c2df00dc2cc71cfdf791b309a591b530c936ee1673314d55e30d46e9c SHA512 70edcebceee32c82c78ba704cb292cad8e59f31d8d58f72c525cd32723726b251221370c6d2dfe4a54d3f0615f0859792160f1c66b20d8f7b77030f54c084073
 DIST x86-bin-libreoffice-kde-java-6.2.4.2.xd3 27890295 BLAKE2B e5d9ade91a15f1474d7cc41216a363ffea712020a6f35af7080ea95400101a3158aca8bdcddac9b910c8dd6a9d454d4e9116fd92b3330fc57950fc421ebdfe60 SHA512 3d82e794770237376293b2048f8e1ca38320e75ebaf3b825a074b00cf0c710a43faa3cee328e310c689af34aa466bec7512cde566bd7cab5d814aebe39c31eba
 EBUILD libreoffice-bin-6.1.5.2.ebuild 6776 BLAKE2B e2ede8bab5f7463da2e97e8ec0cc377168c06b1a86eae93e9f072dfc659f5d1d4e71ed808ece490f630d118be56fdd0932621d30029462af7bb7c7215f49b6e6 SHA512 d6f3a381a17bcafc9b880a12b0957024fe9627d27f198ad896d177880aeb5791b72fd177aa852c8deb77292f432691122099c79700380c57c68264f82adbdf9b
-EBUILD libreoffice-bin-6.2.4.2.ebuild 6778 BLAKE2B 29f89558d775364d06739726a652c8a715c832caa550b21e73edc5d24c8646db5ed0a157064d0d5dbd7f2a3ba9fd92b6b574094ed17d89c990b842923c82b60e SHA512 6db14be88612da6a173bb8813db7d794056a715486d02bd1c8803ace10eeb44e521ef3a4575213c8d7c707c667a47518185f67e6f33f2d65f8f7bfa25b4a6723
+EBUILD libreoffice-bin-6.2.4.2.ebuild 6806 BLAKE2B 1e6e502bbb0e87d05ba7b7177995b51939b3f6a111b870a19e47ac9dcd3226120b68444ff1bf455d386f6983e785aa51f20c474274c74a04b5263d4e0c9b3c61 SHA512 05f4fc52b999388083a47319f9ec2f341aa69bafd31c27ecd0960ef0a7433647cb20288951277862ec832f1efb92a149fe538dac0b001b4ac13a84adcb2b9e46
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.2.4.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.2.4.2.ebuild
index 5ce58420e2e9..0bddd642e004 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-6.2.4.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.2.4.2.ebuild
@@ -97,6 +97,7 @@ COMMON_DEPEND="
 	app-text/mythes
 	>=dev-cpp/clucene-2.3.3.4-r2
 	=dev-cpp/libcmis-0.5*
+	dev-db/mariadb-connector-c
 	dev-db/unixODBC
 	dev-lang/perl
 	dev-libs/boost:=[nls]
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 7a4fc9537665..6f3a2ba13083 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -336,5 +336,5 @@ DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 807741 BLAKE2B f32d
 DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 808093 BLAKE2B a9a96e687d98a395f0ec917a3f3feac6c9a7d79dcd428ffbb04590899faf02e1fb497c6b6a1a211a5f44684c92da8e063c5839a444e8b660b830f85ccca4a8f3 SHA512 d9b3a84584afde6bd86842c9fadc96ee276f75e44c79d1357fca0d3ca06eeb7917875c472605d962ef726361850db1388f9be1b86d1c1d256e970b65c833272b
 DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zu.tar.gz 321382 BLAKE2B aba2c826aa536ea5fb2642b27334e3c7ac67cb07e8013329ea61369c772536de233b664e80e4b8f61f108f2530d49f68d2f90be36df1b7ba539c4833c27f6b64 SHA512 6d823e59d2958fdf448ddd7114f13f1f781631e1bd4c7747f0e6504aa23e2b2f090d3e6689504185b80c2e6ca9992628d4ba770311d4313092c26e15f3cfd39c
 EBUILD libreoffice-l10n-6.1.5.2.ebuild 3624 BLAKE2B 2b6d4ac738668df01a41adec81827de1b93dcee3ec6f622f89ebcddc3ca2a162c6493a06c635f17cf7a9b69f9c6eb8f61606124640f438db1f5a064c16d09811 SHA512 f4347080c7a16640feb557b566c332901b4090a1b711caafe7e7445d7728bfabe2bf7617ac7047489921384dd601320e32f3ea205d7a4db2c6f510b3d6748e9c
-EBUILD libreoffice-l10n-6.2.4.2.ebuild 3626 BLAKE2B 98b23450185353f96f166b2aeb3d2fa741f73b0ac064c8c6e2bb578946520ac7801f2c2d6b7cb15b73ed12fad268fb413440b5c76399391560aab6174a2555a9 SHA512 410c9b184e8e0617b045074fb0de5aa91210b9380423cdb70b84ef83f5500ce1c9ab4d27b0e0592c8ed94e6fb51f3a47a287a45d05e4035eacc5a1e58b69966d
+EBUILD libreoffice-l10n-6.2.4.2.ebuild 3625 BLAKE2B 9b5407d112e0fb173a805e83c53fa2b5dd954c5dd353ffca3b0471ead48d47bc3657dca67a7327716ae64f8b98753abd4d13e4b96ab1951eb7c26e4c6d9abc42 SHA512 77fddff95092009130efeb24188d7752ff3213cf3929d996d819c7de39b1841382670ed25ddbf51a44937bf28231b80a831d1a9442af1965edb2a49a9132f970
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.2.4.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.2.4.2.ebuild
index bcf1dc5f21fd..a22cefd56729 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-6.2.4.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.2.4.2.ebuild
@@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="offlinehelp"
 
 #
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ded4ea3d789a..cae7aff823bd 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -16,7 +16,7 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd234
 DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
 DIST libreoffice-help-6.2.4.2.tar.xz 13024208 BLAKE2B e4b6c8e9071ca0786c2679e7a27de13ec78e0e1935dacc23970123e4056b34f294beee941ef34b72a43208abdbba1d53614cb6d8cf0a0a2e5868431692409ef4 SHA512 d93a3cac65659575fb0a17528c5d5c0cfdf6d20b8b694908b9795cac1f1b4f2122c849a31a9e5d04f579c8a27b2b1913ec7474560300ee0fbf4e0f39d3937048
 EBUILD libreoffice-6.1.5.2.ebuild 16963 BLAKE2B 3191a0fea6afc8225d61796f3a78f82540e9aaa67bb4965613c17e110a1fa88afc36f1c7cd9a8f57b631369653d6b4035cc15d085ef5ebbb3f080febba4d3861 SHA512 2232556f0b75e5f24724315fecb409066d976013a70f1689e9714ecc31824411aef345fc6f3897792e43b817dbb3af8d80ac30ea14cd72ba3c873c1998f543c3
-EBUILD libreoffice-6.2.4.2.ebuild 15750 BLAKE2B e268ae04c27bccf6e30aad50f2fa5035f17698019d93083661d7f1cbea5c1f4dfe71c31c26740329500f0bedb3b1a1720b993cfc36ea252543ae658fe9ef74d8 SHA512 aad531d86b8b1516e033d8ef2ed5ed7e295d3263777dc55e2c2d9bc95fc87a20edb2eb6fbd225fbaf618a4653d562c0c9c40d4be42d5c286fcb1cd4ff24deec9
+EBUILD libreoffice-6.2.4.2.ebuild 15749 BLAKE2B 8585ec043f237b53681a24bfb4676b33a68af85935da2aec6b800380c83a46a431dd9b83bd1fd8653e4b8c2493a1ce75f38c2f18fcd9252f7e2743268b31a05f SHA512 1cb6098dd1c8559d464de43156fe98a16c683c0c4d7f3fe730d606057c6c4f96f07ee41483271301ac69323b9101790e1b2d4509f60e5589474edb3bedaa9890
 EBUILD libreoffice-6.2.9999.ebuild 15740 BLAKE2B 4d1061d3fb675fcbcf424d68d7697cd6e793a595c723a8d8425ced8d436e4447165d85e19ab852ee82b63be82bc926fda8761fa8d4d13bfc99353999e92e4b55 SHA512 10ffedfe6da3f65e3ebd1daa5871400a88846e3b6393b454f802fd655837592713d91c936037cf62e686fcaf9ed49b6cf3ec58828a11d7e52db8d48b575ca10e
 EBUILD libreoffice-9999.ebuild 15678 BLAKE2B 6282d6df8cd81553e0db03edebd6150aac7df2a270dac3be8f22ce528524a43d4e6bb64e92ade05ecfddcd87252a815359a8c9283137d0129d416e85461787b9 SHA512 ebe8efc2dbe687012085584b91e0713f257827fb81d1610631cd34497c8d5473e527ded434b4594dda98b0b3af88b7d88ad4309d44bb95b9e805a8ebfcd7d568
 MISC metadata.xml 1086 BLAKE2B 486defe600d5a74151756ff486e6eca7d529491dfc8db061c6589dc122d9c47e97f8301f28cb86b566ba69e578b9ae6d1e5dae2ca44972e322ccdb1e829aea94 SHA512 c29b3763e187455edc966fb2fdd85cd22faaa5c58b0dbdafc80c9c0ae8ea8400c189723778a86d108869d8891d9d0db5e1e7de931303737178c1e1f084d6f8c7
diff --git a/app-office/libreoffice/libreoffice-6.2.4.2.ebuild b/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
index ce0fc855d366..3dd54c5dc3bb 100644
--- a/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
@@ -77,7 +77,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-util/intltool
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 545330b2e65c..a3983c512510 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,9 +1,7 @@
 AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
 AUX scribus-1.5.5_pre20190429-poppler-0.76.patch 2102 BLAKE2B 80cc47f73cd3c2d8fe5a5ff379b37c279d65fccc68864e28f0cfcbeaf4953eb548e8ccc87d2754a3d2b7014e5702bfb8a191a57e634e77abba55d59b9c6c3bd9 SHA512 210243d3a2f104cf0e03ba0a8df7db15818fcae5808f3974a1260079d31e83b363b29c85aced985cc29b889ea07359a0ac5e62fb03c3ecc0f2b4bc98d633a5e3
-DIST scribus-1.5.5_pre20190124.tar.gz 85713996 BLAKE2B c4bb181012c5b2d15076239cb06d5b2d88fb24ef67d5e258142a4acb7979a304d5fdbd9163a24aaa47a1c8f354b0b70af7115430173ade9a8e77c1cb489fc849 SHA512 e9bd63c37a4818a5dda151b7bb6b7fa9cf7918949bd5612009646335d630b4b4188c2346c7567a3dc5f857849a2d49967f825320720c12e38a6038c7a0d3c34a
 DIST scribus-1.5.5_pre20190429.tar.gz 85838093 BLAKE2B 4ffdc6356b5a2c7372bf6395847f348e7c56276d39114fa5691b6c7f8345aa89a0efe221adbbf1d431d89208fae53ae211c5298d9406487d46ddf98dd69d8c1a SHA512 1aa76491560848dccbeb17f03ba4ac24d6045881f6f92f31b921cf1a91c051176b835d86e0c46046e73573bf60b330e07945c279c077a7619bf2ee9331ca9324
-EBUILD scribus-1.5.5_pre20190124.ebuild 6747 BLAKE2B 8d6e459e6168bda2702ed9729602ebf31c0f90f3140f58fd9f02ce34a453fec108aeb98d0fd77febf7aaab322bc0e91448285db30f271137e403ed6519beb59d SHA512 bd8b75b386e11a9b7fc7b19f930453a5e9ca130add472cb0177928bcd50b6f5010b635bca9612b9b591dc6e0708b14cd5bb8ebe5007c2c532ff587331390bf50
 EBUILD scribus-1.5.5_pre20190429.ebuild 6843 BLAKE2B b302dbe626d7683093511f2b317115ba51afe5b74d1710238530be81672785b855d13aacb582d9bda07dce61e319b48e352f72daa8b5575af9d210dd74198270 SHA512 fa349878cfab3fc837a0956dd2af09d0c2ce8491fc04b3aaa8f81fdb8b8468937a5f3ba0a7a1bd08dbe6c49bca4067a46f7dd780e70325fe190e6bedfdbcb180
 EBUILD scribus-9999.ebuild 6643 BLAKE2B c1c8ea9bb6f97b3f37c8bf10dd974e2ecf2330d564108b30351c3f126bd699b8e3ebcdba5e4e4254edacaeb28e78801d954986531379a4b8fc312c2a9d332dee SHA512 6461c89f4ef4fda64e6c31420889fe51666930d3efb5fcb6142329249b314b12ae20feca11800afe735c69e4eeb695f587ab2b9710ae74a3a71c75053d2750c8
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
deleted file mode 100644
index 76be599564da..000000000000
--- a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-COMMIT=1ed85778dd55bcbcfad2bbc276fd4c97f43ad965
-inherit cmake-utils desktop flag-o-matic python-single-r1 xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
-
-#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
-# Keep this sorted, otherwise eliminating of duplicates below won't work
-IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
-
-map_lang() {
-	local lang=${1/_/-}
-	case $1 in
-		# Retain the following, which have a specific subtag
-		de_*|en_*|pt_*|zh_*) ;;
-		# Consider all other xx_XX as duplicates of the generic xx tag
-		*_*) lang=${1%%_*} ;;
-	esac
-	echo ${lang}
-}
-
-prev_l=
-for l in ${IUSE_L10N}; do
-	l=$(map_lang ${l})
-	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
-	prev_l=${l}
-done
-unset l prev_l
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/libqxp
-	app-text/poppler:=
-	dev-libs/hyphen
-	>=dev-libs/icu-58.2:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2]
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:0=[icu]
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libfreehand
-	media-libs/libpagemaker
-	media-libs/libpng:0=
-	media-libs/libvisio
-	media-libs/libzmf
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.0[X,svg]
-	boost? ( >=dev-libs/boost-1.62:= )
-	hunspell? ( app-text/hunspell:= )
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	osg? ( dev-games/openscenegraph:= )
-	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.3-docdir.patch
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-)
-
-S="${WORKDIR}"/${PN}-${COMMIT}
-
-src_prepare() {
-	rm -r codegen/cheetah || die
-	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
-	find_package(PkgConfig)
-	pkg_check_modules(ZLIB minizip zlib)
-	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
-	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
-	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
-	EOF
-
-	sed \
-		-e "/^\s*unzip\.[ch]/d" \
-		-e "/^\s*ioapi\.[ch]/d" \
-		-i scribus/CMakeLists.txt Scribus.pro || die
-	rm scribus/ioapi.[ch] || die
-
-	sed \
-		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-		-i resources/templates/CMakeLists.txt || die
-
-	sed \
-		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
-		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local _lang lang langs
-	for _lang in ${IUSE_L10N}; do
-		lang=$(map_lang ${_lang})
-		if use l10n_${lang}; then
-			# From the CMakeLists.txt
-			# "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
-			langs+=";${_lang}"
-		else
-			# Don't install localized documentation
-			sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die
-			safe_delete \
-				./resources/dicts/README_${_lang}.txt \
-				./resources/dicts/README_hyph_${_lang}.txt \
-				./resources/dicts/hyph_${_lang}.dic \
-				./resources/loremipsum/${_lang}.xml
-		fi
-		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
-		safe_delete \
-			./resources/dicts/README_en_EN.txt \
-			./resources/dicts/README_hyph_en_EN.txt \
-			./resources/dicts/hyph_en_EN.dic \
-			./resources/loremipsum/en_EN.xml
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
-		-DWANT_GUI_LANG="${langs#;};en"
-		-DWITH_PODOFO="$(usex pdf)"
-		-DWITH_BOOST="$(usex boost)"
-		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
-		-DWANT_NOOSG="$(usex !osg)"
-		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_HEADERINSTALL="$(usex !minimal)"
-		-DWANT_HUNSPELL="$(usex hunspell)"
-		-DWANT_NOEXAMPLES="$(usex !examples)"
-		-DWANT_NOTEMPLATES="$(usex !templates)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang _lang
-	# en_EN can be deleted always
-	for _lang in ${IUSE_L10N}; do
-		lang=$(map_lang ${_lang})
-		if ! use l10n_${lang}; then
-			safe_delete "${ED%/}"/usr/share/man/${_lang}
-		fi
-	done
-
-	if ! use scripts; then
-		rm "${ED%/}"/usr/share/scribus/scripts/*.py || die
-	elif ! use tk; then
-		rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-
-	use scripts && \
-		python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \
-		python_optimize "${ED%/}"/usr/share/scribus/scripts
-
-	mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
-	cat >> "${T}"/COPYING <<- EOF || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
-	EOF
-	dodoc "${T}"/COPYING
-	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
-	local size
-	for size in 16 32 128 256; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}
-
-safe_delete () {
-	local x
-	for x in ${@}; do
-		if [[ -d "${x}" ]]; then
-			ebegin "Deleting ${x} recursively"
-			rm -r "${x}" || die
-			eend $?
-		elif [[ -f "${x}" ]]; then
-			ebegin "Deleting ${x}"
-			rm "${x}" || die
-			eend $?
-		fi
-	done
-}