gentoo resync : 13.03.2018

17 files changed, 19 insertions, 203 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 6311ce12139a..81bdce719eef 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 7d89fbc6d30e..7c9d351f608f 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -3,6 +3,6 @@ AUX calligra-3.1.0-no-arch-detection.patch 436 BLAKE2B 117544b6089912f34b3c4cb3e
 DIST calligra-3.0.1.tar.xz 60764344 BLAKE2B e264f1eb5928d2f11fba9c9b71a77d2685230b9128105264d109d3aca51f32a814795dd04f5f8fb980dce4fa4d4365c4073b35c2abb8933c906238bc0b25aef2 SHA512 ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
 DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
-EBUILD calligra-3.0.1.ebuild 6816 BLAKE2B 5378a9dba936cd143bd07c97ead77d42dd437133d9e99d46de7629751c2f869cbc5d93b658f965ddac3452e22cd83ee81fece8d2badb101eaeabb15a9d43ee8d SHA512 20746aca48106f77de5bb29431f99907922317a5435f5292a86dea0372243bf846bfb05d5cdf8f9017e2e0c7a1259a40336dd654b4d8706eefbebbee3a67f516
-EBUILD calligra-3.1.0-r1.ebuild 6640 BLAKE2B c1513d043f6c53f3749b17c30b39b651cecadcf2a76b91ecea76ddbec181993ca2ef6dcc03e6e7d945ddaab5dd8debbb0dee2663aad3ee4f6df8aaf6b8e94265 SHA512 ea7102c35352a641a6c263f09d58035f257f38e8c9be8d1ed1b3c7e47c7acf284059daf116948abac3eb85d6dd75365990de198069c838357789e06142e6704f
+EBUILD calligra-3.0.1.ebuild 6814 BLAKE2B 62e0cb77ebdbafc0d4dcf5e4e298122f84087dd895d9182b212ff4f040e62b04f52722860cdadf247880b9688d202985ef43b72f59841a2b79c73befb9c69924 SHA512 9fb02a5ab71bdfd24fe1588576fe1f9fbef96e4e3885e11d6a649cee6e44551c36430ae2f4c0693e9de4e5ddf5186713106a56f0b8e4df1efe61bd7711ad7adb
+EBUILD calligra-3.1.0-r1.ebuild 6638 BLAKE2B 0d1df11b3054975c90a07fa8b79eee25c712db1eb1fe01d74b1e8706a7ef658076cb104555e1f202d8dea9b6dfa8073b039864d0692928d3fc78a56df0ce5706 SHA512 2de362cb860f96377b791f3a560c6b38611201983bcf8a1be925a05d3d9338843e69c318a76a702c80ad44a5c9d465f7455d9c4d51e0b0b692a0022982798a44
 MISC metadata.xml 1108 BLAKE2B 266bc6539219906527f6e8692cfac1a4c894164466e01bd3ddc290ed665d19af6419ae1a8939002a4ccc719826def4038264ecdd65fca3aef8627106114c804b SHA512 61655e86072fdb828475b721492c3029b834931126af3cd015b2de87f3e7d56a866707d04b04dc36319f45f77fe5f3b650131c1e82a4e65d094288d8effe1893
diff --git a/app-office/calligra/calligra-3.0.1.ebuild b/app-office/calligra/calligra-3.0.1.ebuild
index 730f9e6ad9ca..7a2d180f4ec7 100644
--- a/app-office/calligra/calligra-3.0.1.ebuild
+++ b/app-office/calligra/calligra-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -91,7 +91,7 @@ COMMON_DEPEND="
 		media-libs/lcms:2
 	)
 	openexr? ( media-libs/openexr )
-	pdf? ( app-text/poppler:=[qt5] )
+	pdf? ( app-text/poppler[qt5] )
 	phonon? ( media-libs/phonon[qt5(+)] )
 	spacenav? ( dev-libs/libspnav )
 	truetype? ( media-libs/freetype:2 )
diff --git a/app-office/calligra/calligra-3.1.0-r1.ebuild b/app-office/calligra/calligra-3.1.0-r1.ebuild
index 7a42c16449ac..d0f98bb0a470 100644
--- a/app-office/calligra/calligra-3.1.0-r1.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r1.ebuild
@@ -97,7 +97,7 @@ COMMON_DEPEND="
 		media-libs/lcms:2
 	)
 	openexr? ( media-libs/openexr )
-	pdf? ( app-text/poppler:=[qt5] )
+	pdf? ( app-text/poppler[qt5] )
 	phonon? ( media-libs/phonon[qt5(+)] )
 	spacenav? ( dev-libs/libspnav )
 	truetype? ( media-libs/freetype:2 )
diff --git a/app-office/hamster-time-tracker/Manifest b/app-office/hamster-time-tracker/Manifest
deleted file mode 100644
index 4c2dc05a0388..000000000000
--- a/app-office/hamster-time-tracker/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD hamster-time-tracker-9999.ebuild 760 BLAKE2B 659ca7795b3bc267bc4c49aa7c4c66821e700685b4fb9af395321f3d5c0b43dab1db66f1e7c0741f05111e6020ef808ea7cb4d827c7241a924d45ccab2448eb1 SHA512 51e622e6fd91463c6acd4aadbec763053055ab3f634af4cb98896bb8539fa5f76dde5e4ac3f9b59bc7cb72341b8b4d249b4d8d2091fb3cf11d9c439d2a54e623
-MISC metadata.xml 464 BLAKE2B 4e6fd6d2413f2e9c12702a8f4f0971d54f631cd2552a1827d89032037fae5b63f6d5959e95653f6f228dc95e8e6b56cb0572279dff2d89bbefad53abb7147983 SHA512 a7d99d19302bc60c8320ab5d736e3bdacd81a6d967b8a6d3e2a8f2af50987874ace68e14a81caeabad2d012bba504eaaaaeb643442f8873f53e8583ce0568974
diff --git a/app-office/hamster-time-tracker/hamster-time-tracker-9999.ebuild b/app-office/hamster-time-tracker/hamster-time-tracker-9999.ebuild
deleted file mode 100644
index 2e20f8fca37b..000000000000
--- a/app-office/hamster-time-tracker/hamster-time-tracker-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit git-r3 python-single-r1 waf-utils
-
-DESCRIPTION="Time tracking for the masses"
-HOMEPAGE="http://projecthamster.wordpress.com"
-EGIT_REPO_URI="https://github.com/projecthamster/hamster.git"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-python/gconf-python
-	gnome-base/gconf[introspection]
-	dev-python/pyxdg
-	>=x11-libs/gtk+-3.10
-	sys-devel/gettext
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-util/intltool"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	git-r3_src_unpack
-}
-
-src_prepare() {
-	python_fix_shebang .
-}
diff --git a/app-office/hamster-time-tracker/metadata.xml b/app-office/hamster-time-tracker/metadata.xml
deleted file mode 100644
index b928a45c4f92..000000000000
--- a/app-office/hamster-time-tracker/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>nicolasbock@gentoo.org</email>
-		<name>Nicolas Bock</name>
-	</maintainer>
-	<longdescription lang="en">
-		Project Hamster is time tracking for individuals. It helps you to keep
-		track on how much time you have spent during the day on activities you
-		choose to track.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index d74b9929644b..5d10783bd78d 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,5 +1,5 @@
 DIST kmymoney-4.8.1.1.tar.xz 20963444 BLAKE2B d2be72a1c7dc41f48405ee406c419b9eb74cc02a80949965b8241331c00fbec23c32177aea0a401a76ef64a97e25e9e532c28e4f29bf88c9c2fd04f608790df6 SHA512 1f730f7db9117469aebaab33891f6064f648fa0ad25afff9ac1fab8d638c376d8e1f013401512c4be060436d6bbdfdacad6427b1e0911ac6b46288db1e242783
 DIST kmymoney-5.0.0.tar.xz 13301572 BLAKE2B 6fa95f3f56feff016ea336db4f17dbaf6f6a8395b2e246e90976e36c7e5dff5d122c8a07a86c64e94c69746829aa9dfaff74c9888cfe3ba553299462175f7048 SHA512 932dcc1bbb9e767cc14b5d0689857fadee5b29fe9edabd8958c328b131c9a41f8c4bb137b7351b3fe7f10178513268391a0420b5e28881166a1d5d8bbd657ed8
 EBUILD kmymoney-4.8.1.1-r1.ebuild 3540 BLAKE2B c414fcdb2e15c26e6c0f8c741ed4660f56ce9f353f3ec57b94a99eb52f686bb57126a9e8ffd23629322cb62f1d244558e28866cc29824573652827cfd62bd65a SHA512 9fd06bd1b03a78612d7db3b71507464ab86055693c66913f947dfa6cb14fdf79d0b380a1bd4c0b4bfea2760eda918700c2229b282af6e5648fd189087209cbfb
-EBUILD kmymoney-5.0.0.ebuild 2746 BLAKE2B 3665026bb8fac87e5e98d17245f968f67b8bb1040606ae79729ee1d4245b25dfe33583b1cec15a06d895162fde0143c9bcc8a3bbc1fc2516abccbb0300bff593 SHA512 0382f30ce0c9e6b85d910343d2e7e24e4d8bf5ea2f717b927654d4b1fe41627fa91be08325872aa8692c4cdeaaf4b72090a6578448e95b5c448eece0c572143a
+EBUILD kmymoney-5.0.0-r1.ebuild 2804 BLAKE2B 1f6e82667ca0f976781d110ca71abf0c8380ab1b5d773be0336f6e0e0ac5505c2b2e348799a18ad81594db18a15f2cd74739ba8d87222e8f6e46c2f3ddd9dec0 SHA512 ed0fe2e088b1ba4e6a6843d89ca504d0405b2865ef1b783b4b54c58c32b4f0ca2fc4608f29d0e74318510f4a92f2fc8134c62d4d09c3a7a6f5b9fd3c214fdde1
 MISC metadata.xml 787 BLAKE2B 090845c035b23d5dd951c6836a154c74736597c05f52a6841596d1d3663085176aae10ae54489eb6152faa82a5c77dbe7001861c63ca1b6191a534022e1be5bc SHA512 19f3d92cb3b3e92ce1692d76af59bc474257948a4740300484f17eecca391b0a4f6f5517fe6dd06d513231706c1123cf1e955ea6fb3a321d2fbc71063da68586
diff --git a/app-office/kmymoney/kmymoney-5.0.0.ebuild b/app-office/kmymoney/kmymoney-5.0.0-r1.ebuild
index 7afd40004fc9..46fb7493d352 100644
--- a/app-office/kmymoney/kmymoney-5.0.0.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.0-r1.ebuild
@@ -30,17 +30,19 @@ COMMON_DEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
 	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep sonnet)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtsql)
 	$(add_qt_dep qtsvg)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index a4ffba5f2ee5..0c50cb87498f 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -9,6 +9,6 @@ AUX scribus-9999-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c272
 DIST scribus-1.4.6.tar.xz 73601104 BLAKE2B 5968a48410d1a2a4caa333c9f83b43f68c964862d9aa3cb20e136760201ef2ef6cb82f770026b6f962758c9d397f25a017d906433f52f88bec11c57105c27f6b SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3
 DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
 EBUILD scribus-1.4.6.ebuild 4501 BLAKE2B b30fa6004319b54965b5b61f9cc466535135a8dd78434b090ff827df779ec003af1cf9ed00903d1614b6102be34298a95a1c3c609b1c5ec7a707b09b42bfe393 SHA512 0ede0bf314d6aea40da9316ea1778b9e2810780d715fe5fb66221354467147c54694b3b6f620faa7da6ad386034cb4b8b03df9acb3cd372b17ecc4415543531b
-EBUILD scribus-1.5.3-r1.ebuild 7024 BLAKE2B a3943ed45395e422f0f316ce622c384b2dd0d6418fe6f8e2a859e9b880376a90a6033b4da99fef3368f1ce55f9a4193ee392549fa7949cfbe9077696e95ac17c SHA512 f03c1c3c26076daf20bc8681f808ac3dccd32bf1b23825be9026c6d7ba55a4ad670e91da7f1380833c993f62577e7b415f011573abd578c03255762bb4a5e04d
+EBUILD scribus-1.5.3-r1.ebuild 7023 BLAKE2B fb1027454b96b4900ace6c0e859c15a5adb8e5e7be234a0164f7b513bca16ac7ada72fd66b93d484f57864536dec6266a6d2ab6d7c9b918d763b712300493a60 SHA512 fc814f7d0c88edb24f91326ad93f4034e0f39c1f5396c315bef6cec7b3de69c08e9867abba05f4241711d23daaee8656f74e0c77a9d60dfdec557542774821e5
 EBUILD scribus-9999.ebuild 6947 BLAKE2B 98d7eacf3fe442b1539519139e9a127a3d7c0ea7fa5b9e75c6b7b220353ce7635c97675df9f2df1f272116c44f6825817e8c62fff75860d4cfeb75bc4fa388f8 SHA512 fd3911b80f04485f8fc11f2b30bc3f3e1ced644217b6e1d00716e48a68154b5b12102267e363b39dcaeaff129eb46b246f415c581f724951f45b3a9e174355af
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index 85a102a443dd..b65910862d8b 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 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
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 6807e441bfd8..ad6493f0922d 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -4,7 +4,7 @@ AUX texmaker-5.0-unbundle-hunspell-singleapp.patch 1886 BLAKE2B 62c66e1e2868f40b
 AUX texmakerx_my.pri 128 BLAKE2B 2821eff5f67ac93334518b84b7e1a9b8157de8be13b3d6e801f57ce9937e5586ddbc34fc5ace9706419b79472d660860c36c35a7ae216cea8ff59d54f8b8e8a8 SHA512 ce03623e219b43eca4bcd07b78566d55af78f41483a2659479a9118ffd1a987b77e38c32fa3a9ff2b35556191b708f198668956181e01272f2bc39a828f9277e
 DIST texmaker-4.5.tar.bz2 11287724 BLAKE2B 9138e4765e439419384573aed210b1df30890a1b8f3493e89f85c187bca56791dbdfb4805853dff6335cfeb2fc3ba7a00039927d3476c2c90aaa6d6213ba32b3 SHA512 623ae1496f11e5cd1328b997dbb29ec7188d6c1b256b6370c6fdd4fcda4bfc4b301d29cfa3b2ce529391b8f9913ea4678a6895abfb4fa6f9820e7177c676ab11
 DIST texmaker-5.0.tar.bz2 15728938 BLAKE2B 14d0ea9e7f8b5f4b4e40bfdbe706b585215d0df8546aeb5d614c73314f41b3f0d443ccf5d4ddb0d7eab00bf76a358cbd51e14ff21ac15e0f8e89b884f12719df SHA512 2473e0ad701da399f428caf8b067129c069a86d8cc5f1d0993ba53025961f7caab816195495d63788d58dafa7a208ca8fbcebbac118a49b20f3f639ee377a636
-EBUILD texmaker-4.5-r2.ebuild 1742 BLAKE2B ea63bccc8295e79ccc35d448ea9c6c28ac83f8a2d6ab5243d9f5aa1ad271cc71febd8a116bb268b3e0ba8b8645e8ea47fe72df0614cad38c6f15c7aaab920c06 SHA512 1c6a44109f3f21eee419f18585d7ca5beca7f408cca0ce87fb9d7cbf405de24d20753fc8e9fd7656ff9ea1dfa685c96e40333a9f12a946b9917442da4165c142
-EBUILD texmaker-4.5-r3.ebuild 1747 BLAKE2B 5ba82e830b53cbd72053932c74965a9537f26a22e2d5ca914cabb8e2fb3f4053cca3589e2e5d523b94158e658c94cb450b9a15f26b7256bcb2a26c0319a51cc9 SHA512 359fc6de06824a19cd6541e61efeeaaff63d3bd1f92b375a9a4d0793ae9569d2641d35f4624e8538f602c8ab9b3a933521b9474be222b90337d842454de7b36c
-EBUILD texmaker-5.0-r1.ebuild 1737 BLAKE2B 9aa3ef14ff70d86ab839537a46006bb7728b505ae34e6274b8e503e43230e0bffc3cf0cf025a362eed797f85c96bed651dfc2ca0765ee10fef8b83f133c3bf00 SHA512 adba9834c2c7404d4a53c1e815c00d63bddd4c452c5a12a9858fb8f76ebff0284540058179fb793b60edc5e03f33d3f831ece5f7c1ef8bc8caa62039c2146435
+EBUILD texmaker-4.5-r2.ebuild 1740 BLAKE2B cbcb8086313b36cc4cf8f178932dda1d8d700a75d74e95303872acd59acbb5eef49f24cb81ef3033da79dbf718112986ed04cfafa61c4b0ce4cbdc4c977b10c2 SHA512 1d6025872c47fc3432e886df10c7580ba386316d9a67d022f9806001aef30ae9159a04894a5fcf557245a0f9a872daa4c930a3be6ccaa7ef8b243cb08b879c18
+EBUILD texmaker-4.5-r3.ebuild 1745 BLAKE2B bb45d7ae2a12a02ff08cc6807c4cd62a5eedcedef694244f26b25ba74245a8111f6b60918590d7a65af3ec24345664cff3969e524320763b9d00f317123caadc SHA512 7b8c330700dff8f5fe3e69ff09369983729e2ecd780e31989c8f418f6aa367c7eabcf77aaa736139203bef7f4e58e85d47c1251457d47fe57eb1925a03dfa799
+EBUILD texmaker-5.0-r1.ebuild 1735 BLAKE2B 1ee73f61a0cec82ecaf6f598fc7208d186b85e4f5d56fb03a25758734678503b3dfbbdc968b26bf00b1504be4b4a3d9022a85be897e76fa10796b1cf822da0f3 SHA512 195c3860f17107a51413fcc4e0c88f067c8e3c182eff5012c5251e8a95f3c828c44514987649e74db4f9203c9fba9c0247fd59f5b762fbba99129ab683752c04
 MISC metadata.xml 371 BLAKE2B 5e48352072e5e7318de74bfd9e5d2fbd6c746092f7a3d89ecd0f60f3c781993f1af0a37754073f5d31d480feb45992d7939ac7c230167650d4a7c859ee4b5f7d SHA512 fc327d181a4a8194af71244eb082e8e9c749b250687f038b740d1f5f62cac02f300becdbaca84b997edf8372b3352a8d840eadc2f06c8171fef339ac5537914c
diff --git a/app-office/texmaker/texmaker-4.5-r2.ebuild b/app-office/texmaker/texmaker-4.5-r2.ebuild
index e46b14878904..2c65b02c9180 100644
--- a/app-office/texmaker/texmaker-4.5-r2.ebuild
+++ b/app-office/texmaker/texmaker-4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	app-text/poppler:=[qt5]
+	app-text/poppler[qt5]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
diff --git a/app-office/texmaker/texmaker-4.5-r3.ebuild b/app-office/texmaker/texmaker-4.5-r3.ebuild
index b33ba0007afe..79f1a8da1221 100644
--- a/app-office/texmaker/texmaker-4.5-r3.ebuild
+++ b/app-office/texmaker/texmaker-4.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	app-text/poppler:=[qt5]
+	app-text/poppler[qt5]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
diff --git a/app-office/texmaker/texmaker-5.0-r1.ebuild b/app-office/texmaker/texmaker-5.0-r1.ebuild
index f91b5375634a..f9febdd05987 100644
--- a/app-office/texmaker/texmaker-5.0-r1.ebuild
+++ b/app-office/texmaker/texmaker-5.0-r1.ebuild
@@ -19,7 +19,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	app-text/poppler:=[qt5(+)]
+	app-text/poppler[qt5(+)]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 9de35eb9b9ec..76bb64ea35e7 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,5 +1,4 @@
 DIST wps-office_10.1.0.5707~a21_amd64.deb 88085156 BLAKE2B 2288080715f0130b70bfcdb2886cfdf9c4648a1373367dde1f9d12b179a2816b75f5e342f73edeedf8305af9e65ecb290a297fb85d6a468087360537f0ef7ae9 SHA512 3812237ef2662a9b7e3777dc253c8c410fca73627eb42e33c177b7a2c52b27324fd3ff75b24e1309ecf77279086ab639e3b7fe3e42a4a420036e2989e1941ebd
 DIST wps-office_10.1.0.5707~a21_i386.deb 87863566 BLAKE2B 617b9f874b063ddbe2040f0a5bf30ec07149dae3f90f84fcba86b2bd2950a233190db72a9ba9d8563413c422a1da0d1b41767a864de6f13974467296f2dcb32e SHA512 0fb3eb873f0017d9dbe7a3dc7d849086cdbbd5eaaf5fbfb9bdbe737c40029799df83d98e4e0bf04f6737a0033c76fccba206a3342624b045e309b6d2c35fffe7
-EBUILD wps-office-10.1.0.5707_alpha21-r1.ebuild 2629 BLAKE2B 0f8590d1e61368cb3153c2dc6ae04ddba1fb7ecc42a8e658d3de1ba0e290f6beba54084215a5858b9393d9279cdd6a0d2238bed5adf14c4899b8c4527aeafe8a SHA512 7d147ca953112aa9d1e121ee5b53ab7f841e5744706dd7a29509c2c798c5489f821430de74b08782808e619bc10ddd48404fbca3e7e711e1c0e95ffacf5e5319
 EBUILD wps-office-10.1.0.5707_alpha21-r2.ebuild 2804 BLAKE2B c86101eebe727d4d95d405d9e9788b1b4eaa24202c1a0496e97ec96af01101021e28c7e5f61d4e05c2256fce1e5ce2147541bb0763bcf882c0801bdd9b4b5c1d SHA512 2c9df6a7fcc200f2fb4890adac7b73fc6f1407bd534df924960e9518031f9c2a53a701f851cab80c13826bc5624c4b5088760839a48ee5277f27d75065692de4
 MISC metadata.xml 325 BLAKE2B e69a86660b1803578e847d64001b10f79bf3bb1fde9a226bcfe4b972183c947dfaaa292c8256cf635db263dae17ca34e796a89142fc6bce87f2efc8514821eb7 SHA512 f0dc46dcbbf409c15db60a6dc1b0e002300d0813385ff5bc006c333bea01be8c037edab4808b67256cd90a31790ad70f432eaedd41f8da8e4fa78e3f7440ac84
diff --git a/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r1.ebuild b/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r1.ebuild
deleted file mode 100644
index d892d28e7b2d..000000000000
--- a/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font gnome2-utils unpacker versionator xdg
-
-MY_PV="$(get_version_component_range 1-4)"
-MY_V="$(get_version_component_range 5)"
-
-if [ -z "$(get_version_component_range 6)" ]; then
-	MY_SP=""
-else
-	MY_SP="$(get_version_component_range 6)"
-fi
-
-case ${PV} in
-	*_alpha*)
-		MY_BRANCH=${MY_V/alpha/a}
-		;;
-	*_beta*)
-		MY_BRANCH=${MY_V/beta/b}
-		;;
-	*)
-		die "Invalid value for \${PV}: ${PV}"
-		;;
-esac
-MY_VV=${MY_PV}~${MY_BRANCH}${MY_SP}
-
-DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="http://linux.wps.cn/ http://wps-community.org/"
-
-KEYWORDS="~amd64 ~x86"
-
-SRC_URI="
-	x86? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_i386.deb )
-	amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_amd64.deb )
-"
-
-SLOT="0"
-RESTRICT="strip mirror" # mirror as explained at bug #547372
-LICENSE="WPS-EULA"
-IUSE="+sharedfonts"
-
-# Deps got from this (listed in order):
-# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
-# ldd /opt/kingsoft/wps-office/office6/wps
-# ldd /opt/kingsoft/wps-office/office6/wpp
-RDEPEND="
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-	sys-devel/gcc
-	sys-libs/glibc
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	dev-libs/glib:2
-	sys-libs/zlib:0
-	net-print/cups
-	media-libs/libpng:1.2
-	virtual/glu
-
-	dev-libs/libpcre:3
-	dev-libs/libffi
-	media-sound/pulseaudio
-	app-arch/bzip2:0
-	media-libs/libpng:0
-	dev-libs/expat
-	sys-apps/util-linux
-	dev-libs/libbsd
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	sys-apps/dbus
-	x11-libs/libXtst
-	sys-apps/systemd
-	sys-apps/tcp-wrappers
-	media-libs/libsndfile
-	net-libs/libasyncns
-	dev-libs/libgcrypt:0
-	app-arch/xz-utils
-	app-arch/lz4
-	sys-libs/libcap
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	dev-libs/libgpg-error
-	sys-apps/attr
-"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m0755
-	doexe "${S}"/usr/bin/wps
-	doexe "${S}"/usr/bin/wpp
-	doexe "${S}"/usr/bin/et
-
-	if ! use sharedfonts; then
-		insinto /opt/kingsoft/wps-office/office6/fonts
-		doins -r "${S}"/usr/share/fonts/wps-office/*
-		rm -rf "${S}"/usr/share/fonts || die
-	fi
-
-	insinto /usr
-	doins -r "${S}"/usr/share
-
-	insinto /
-	doins -r "${S}"/opt
-	fperms 0755 /opt/kingsoft/wps-office/office6/{wps,wpp,et}
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use sharedfonts && font_pkg_postinst
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}