gentoo resync : 10.11.2019

13 files changed, 91 insertions, 174 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 4a02f431adb2..e613dec33f82 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index fcb0dbe55d1c..45f84974b451 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,13 +1,15 @@
 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-docdir.patch 1053 BLAKE2B 3efadd63156463cd0d955b8de072082a3d958849e1c2107eb9bf16260048ad5e9f162162a4f148025fcad091dd44a1f291a6ae708f17014205791e5fcc24b613 SHA512 cae03652fcf541bdce1c89f60e7ba7e2cd14ad3846bbaa7c832e97ee7617188310f51e72c5e88947b51892b61c174f18db35785cf5631b436fc63d35056e2bf1
-AUX scribus-1.5.5-findhyphen.patch 1685 BLAKE2B bcd286d7285ff2a28477ae538bd8917a336c2e0e1db908350893cf56558f7a49e592b8acb980768ce6b3ad228e05bc5f99ce6acf9416ac3ee0db967522a1edbc SHA512 daa75d0c040d3827cde4fd617246c826ade30f85a72c63ac5011251b1c9dce0fff8f5c314c32481b05ba9377e1f9b532487cffcf6194a024a8d75b245acd725c
+AUX scribus-1.5.5-findhyphen-1.patch 1118 BLAKE2B c542a292601b43f12ee2b682225064bd650f2017466aed4aa3a256610dfe1aaa662857cf60682b3c8f1a0dd1b22b34b8c058967bc4879412e8599a641e254b18 SHA512 d536cce91eb161e2d8ead619f932111bcfe661bae9e0706567a0a789ef80eef28e6f81c357bd7bdaaeb97f8c6a872deb7147fea7fef84e279b7e8e812a821cef
+AUX scribus-1.5.5-findhyphen-2.patch 567 BLAKE2B c0aac324b9dc2238d5fd4ae857bcd2a704d10a936a6c152d83c824b0cd4979126f0c1e234e18430ed7894a06a0f000f851b462f8c8bd677f34695773b33f1b55 SHA512 bbcd503a33434625a4eb4f5661cec88aca88f64b078085872ba193ed1651e015a81bf7c0f2fa89588bce2247d286488bcdeacc9cad8e473bee08faa39a9df0e5
 AUX scribus-1.5.5-poppler-0.82.patch 5228 BLAKE2B 4d3dac11d77a41bca4ace028a249acacd07d4595dbd1611b15ad697fd6da5848cea880cb5edbc4411ed512bc3414261129b95984510750bdd5c1066185833d78 SHA512 8621876aa7ba5d91f48e2d4b1c9d865b2179e4029fdf1b122defa619454690328cc30d03963aad0865fe6dff480285fb21ba44c82d57d81f5b7ce1d687c34cc4
 AUX scribus-1.5.5_pre20190429-poppler-0.76.patch 2102 BLAKE2B 80cc47f73cd3c2d8fe5a5ff379b37c279d65fccc68864e28f0cfcbeaf4953eb548e8ccc87d2754a3d2b7014e5702bfb8a191a57e634e77abba55d59b9c6c3bd9 SHA512 210243d3a2f104cf0e03ba0a8df7db15818fcae5808f3974a1260079d31e83b363b29c85aced985cc29b889ea07359a0ac5e62fb03c3ecc0f2b4bc98d633a5e3
 AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
+AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
 DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50
 DIST scribus-1.5.5_pre20190429.tar.gz 85838093 BLAKE2B 4ffdc6356b5a2c7372bf6395847f348e7c56276d39114fa5691b6c7f8345aa89a0efe221adbbf1d431d89208fae53ae211c5298d9406487d46ddf98dd69d8c1a SHA512 1aa76491560848dccbeb17f03ba4ac24d6045881f6f92f31b921cf1a91c051176b835d86e0c46046e73573bf60b330e07945c279c077a7619bf2ee9331ca9324
-EBUILD scribus-1.5.5.ebuild 4253 BLAKE2B 32f7725f8d49b1c26551e9bee9c872aed5151eb4c2c89223a094cefa6bc3cda272ecf015a06d8afd2534a9f6fc72b7f8a9f2fc76d745b8176317cfc0ed2413e2 SHA512 971bc854c74e93f98895dd3b20f5094dded35518cc5262b9ca8fb2c42f578cc5444c692ca01fbca94e5c6f3c44055cca5a7395eecbecd3495876a1655ff1590e
+EBUILD scribus-1.5.5.ebuild 4259 BLAKE2B a2adc7f37a14b3102f10326125348e41daf31c401bdbad4aa02bf107a88d6e657be9b4288ed307d700a4315fb37c0d75935203d4876bb16e9deaee4aa8b84dbc SHA512 e7f6f40f35b2dc2ce7124a6a4e59f241c024dffaaaa08356abcaefc782b6a55a3c817f72651960f3dac4f8a4b5531c9a271048704d2924135935834805a56a72
 EBUILD scribus-1.5.5_pre20190429.ebuild 6836 BLAKE2B ecabcfc6b6d7291bfd7820030464106185ba921fdd02ea3b2d483a1d4754817ab2f479dd319e23b85f0355f7e4e1a246e7740344896157f9b3bf558420bc0755 SHA512 ee4ac07e72a4de97f45f2b90af8568f79e3669aed79332ba42aead90db6c38209756f38cf251ed4dbbe90020bc4a6eb9dafaa9277514829713dc74d702ef41ad
-EBUILD scribus-9999.ebuild 6643 BLAKE2B f4c56004896b625cfcaddd1cd0a2dba01ece7f5b16a4cf745c4f61ab4747c1feb2d057d134a1bbad1039ac33255e82601efc2f9d5dc882028a8c60e5d9c113ae SHA512 d6a9251b10dd61e702ffff373763d939b9f3229846bd0416106cade51eb5546da0bdcaa5f26c39e7c723f3d6475016dcb6cc13567d16099e0363659e1ec89651
+EBUILD scribus-9999.ebuild 4249 BLAKE2B 9df9a3210b3229837f87c730d6c096b1a8623bba5e26b7f2acacdcb8ead5012f58b340e111f5c82039d4bcb2c210af273d6a96ef34083f50de3fa7b7a390fe80 SHA512 3a5267ffbb917cbb13633e92f8b2f949288ab7925fd50de647ec5fbc7dbdcd0274724d87aedc26633bb278014efca0f01890fcf675055f1c35cfe38284090220
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen.patch b/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch
index 13c168c51f50..98682d60f700 100644
--- a/app-office/scribus/files/scribus-1.5.5-findhyphen.patch
+++ b/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch
@@ -1,22 +1,3 @@
---- a/CMakeLists.txt	2019-07-31 00:34:43.000000000 +0200
-+++ b/CMakeLists.txt	2019-10-02 00:17:34.968355656 +0200
-@@ -954,6 +954,16 @@
- endif()
- #>>HUNSPELL for Speelling support
- 
-+#<<HYPHEN for Hyphenation support
-+find_package(HYPHEN)
-+if(HYPHEN_FOUND)
-+	message("System Hyphen Found OK")
-+	set(HAVE_HYPHEN ON)
-+else()
-+	message("Hyphen or its developer libraries NOT found - using bundled Hyphen instead")
-+endif()
-+#>>HYPHEN for Hyphenation support
-+
- #<<PoDoFo for AI PDF import
- option(WITH_PODOFO "Enable support for PDF embedded in AI" ON)
- if (WITH_PODOFO)
 --- a/scribus/CMakeLists.txt	2019-10-02 00:25:01.194386515 +0200
 +++ b/scribus/CMakeLists.txt	2019-10-02 00:26:23.584392213 +0200
 @@ -1069,7 +1069,9 @@
diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch b/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch
new file mode 100644
index 000000000000..a8993ca63874
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch
@@ -0,0 +1,19 @@
+--- a/CMakeLists.txt	2019-07-31 00:34:43.000000000 +0200
++++ b/CMakeLists.txt	2019-10-02 00:17:34.968355656 +0200
+@@ -954,6 +954,16 @@
+ endif()
+ #>>HUNSPELL for Speelling support
+ 
++#<<HYPHEN for Hyphenation support
++find_package(HYPHEN)
++if(HYPHEN_FOUND)
++	message("System Hyphen Found OK")
++	set(HAVE_HYPHEN ON)
++else()
++	message("Hyphen or its developer libraries NOT found - using bundled Hyphen instead")
++endif()
++#>>HYPHEN for Hyphenation support
++
+ #<<PoDoFo for AI PDF import
+ option(WITH_PODOFO "Enable support for PDF embedded in AI" ON)
+ if (WITH_PODOFO)
diff --git a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
new file mode 100644
index 000000000000..3123ce4477c9
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
@@ -0,0 +1,19 @@
+--- a/CMakeLists_Dependencies.cmake	2019-07-31 00:34:43.000000000 +0200
++++ b/CMakeLists_Dependencies.cmake	2019-10-02 00:17:34.968355656 +0200
+@@ -954,6 +954,16 @@
+ endif()
+ #>>HUNSPELL for Speelling support
+ 
++#<<HYPHEN for Hyphenation support
++find_package(HYPHEN)
++if(HYPHEN_FOUND)
++	message("System Hyphen Found OK")
++	set(HAVE_HYPHEN ON)
++else()
++	message("Hyphen or its developer libraries NOT found - using bundled Hyphen instead")
++endif()
++#>>HYPHEN for Hyphenation support
++
+ #<<PoDoFo for AI PDF import
+ option(WITH_PODOFO "Enable support for PDF embedded in AI" ON)
+ if (WITH_PODOFO)
diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild
index 3cfe057c2add..65a2d33765b6 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -72,7 +72,7 @@ PATCHES=(
 	# non(?)-upstreamable
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
 	"${FILESDIR}"/${P}-docdir.patch
-	"${FILESDIR}"/${P}-findhyphen.patch
+	"${FILESDIR}"/${P}-findhyphen-{1,2}.patch
 )
 
 src_prepare() {
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 06ff411dee8c..ac7b913c7f8e 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-
 inherit cmake-utils desktop flag-o-matic python-single-r1 subversion xdg
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
@@ -18,37 +16,18 @@ ESVN_PROJECT=Scribus-1.5
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-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
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	tk? ( scripts )"
 
 # osg
 # couple of third_party libs bundled
-COMMON_DEPEND="${PYTHON_DEPS}
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="${PYTHON_DEPS}
 	app-text/libmspub
 	app-text/libqxp
 	app-text/poppler:=
@@ -78,28 +57,30 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	sys-libs/zlib[minizip]
 	virtual/jpeg:0=
 	>=x11-libs/cairo-1.10.0[X,svg]
-	boost? ( >=dev-libs/boost-1.62:= )
+	boost? ( >=dev-libs/boost-1.67:= )
 	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}
+RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl
 "
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
+	# non(?)-upstreamable
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
+	"${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch
+	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
 )
 
 src_prepare() {
-	rm -r codegen/cheetah || die
+	cmake-utils_src_prepare
+
+	rm -r codegen/cheetah scribus/third_party/hyphen || die
+
 	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
 	find_package(PkgConfig)
 	pkg_check_modules(ZLIB minizip zlib)
@@ -107,7 +88,6 @@ src_prepare() {
 	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" \
@@ -121,54 +101,27 @@ src_prepare() {
 	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)"
+		-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)"
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+		-DWITH_BOOST=$(usex boost)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_NOEXAMPLES=$(usex !examples)
+		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DWANT_HUNSPELL=$(usex hunspell)
+		-DWANT_HEADERINSTALL=$(usex !minimal)
+		-DWANT_NOOSG=$(usex !osg)
+		-DWITH_PODOFO=$(usex pdf)
+		-DWANT_NOTEMPLATES=$(usex !templates)
 	)
 	cmake-utils_src_configure
 }
@@ -176,53 +129,32 @@ 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
+	if ! use tk; then
+		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+	if use scripts; then
+		python_fix_shebang "${ED}"/usr/share/scribus/scripts
+		python_optimize "${ED}"/usr/share/scribus/scripts
+	else
+		rm "${ED}"/usr/share/scribus/scripts/*.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
 
-	mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
+	# These files are parsed to populate the help/about window.
 	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
+	for size in 16 32 128 256 512; 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
-}
diff --git a/app-office/tedia2sql/Manifest b/app-office/tedia2sql/Manifest
deleted file mode 100644
index ecacdd7d525c..000000000000
--- a/app-office/tedia2sql/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tedia2sql-1.2.12.tar.gz 72419 BLAKE2B b227524234aad074e8b6c72d566fe7272beb0e0f050e3e0d778a9a458b45819fe51148736cbbe92dc056cc3ac15b8993ba16b0deb0672791c8f02f41b20cb16d SHA512 070ed328c1d021ea8f0f4242373935bfc4850db418b4ace4c391e84e1248079c9ff24f549dfb786fac0f527df8e0dbce81f360df74f71c07a93f46f32ef45196
-EBUILD tedia2sql-1.2.12.ebuild 598 BLAKE2B d3830bbf233f1ff95140bf3adf75d13ed160693d0049a3778ccd2b73c938411303306d5373863bb83896babfc8f84f332bd25550ee0a90870193ea9249c1e36c SHA512 9056ff211a3d4cdd93a536381a87ed31b386783789c8340115a1d4ea4caaa38b20d3195db00e5cca388c294aa5f99a21f825402fb2c34d7ec71a1cbb4051a8e5
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-office/tedia2sql/metadata.xml b/app-office/tedia2sql/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-office/tedia2sql/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-office/tedia2sql/tedia2sql-1.2.12.ebuild b/app-office/tedia2sql/tedia2sql-1.2.12.ebuild
deleted file mode 100644
index 16eb6ec455e9..000000000000
--- a/app-office/tedia2sql/tedia2sql-1.2.12.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Convert database ERD designed in Dia into SQL DDL scripts"
-HOMEPAGE="http://tedia2sql.tigris.org"
-SRC_URI="http://tedia2sql.tigris.org/files/documents/282/19423/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/perl-5.8
-	>=dev-perl/XML-DOM-1.43
-	>=virtual/perl-Digest-MD5-2.36"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	insinto /etc
-	doins tedia2sqlrc
-
-	dobin tedia2sql
-	dodoc README
-	use doc && dohtml -A sql -A dia www/*
-}
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index a69b3deea978..a355722d51af 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,6 +1,6 @@
 DIST wps-office_11.1.0.8372_amd64.deb 213018066 BLAKE2B 9769bc6c4c6d292259594f0e39361e67e00cfb4bae05119ecf12ce0666944110c5bc61f5761cf8713bb944237780883116b928a6623d8e6ec476667c64f9c8af SHA512 9a690f6ec9b46f827dcf593316f71bcb13ad55568ccb0056c679e5c803a899cad89b7399d307da07a239aeca7a08a5669b8892649f005464fe0cb2efa926d523
 DIST wps-office_11.1.0.8372_i386.deb 216082588 BLAKE2B c8d4f2f4e12b28a38553023ba281add34266266ffadbf1c0bfc3c6a08ef5b0c9f1b3ec828cc5106aea3c8d28409b87a9fc0a3c791f4e9f95e1a2a63ff2651c50 SHA512 76044bbb0cba614a2c506baef8e309f9a965009aa74922a64975a7a78f703e7091efedfb363ff0d86bf794b854cd6646226db902bf8a9afc064a64631cbb05e7
 DIST wps-office_11.1.0.8865_amd64.deb 252991358 BLAKE2B 476d7431a7690b56a2958233bd204a75a32b7f6f7598a092ede89355db6e9749194de41d1a0598e4ef02c96190a5803db007fc848540a5a1e797a32c8f918c20 SHA512 2f515fdfd3f380eb5ba2661006288b04d192ff75d02b95ae2f16a146b287aa78b24d2ae258590354fa567c2c52502ef4e7b9f2ad6ea965911208557681c4a1e7
-EBUILD wps-office-11.1.0.8372.ebuild 1920 BLAKE2B 96a5ee9eb15d3660dbbf8c6ad4a334c34103e8173cb02d17c838cb610a3acf5108c31421e98a97ff87fad2ac0ee46b07c6b63c8b93ae2337920f6eec56eb989c SHA512 bf971365a23a7330ff76be72d6435436dc9c75cd050b061bc0e4d6a66f2c7f9efdd3d2bd766a609ce3995b07001b7ff021c2cf8ca5d646b2e711a5d7aeae3757
-EBUILD wps-office-11.1.0.8865.ebuild 1812 BLAKE2B fb196d6113e5c689283b5c45f7fcce2e58e5656b771d2f1c545c56f44067fde92a93c7bfcb6e7c97a943558c9c3a9a37fbafa13876bc167b915e983c1cc4a1ac SHA512 d79e3f7aff6a492e7138bbdd73c9d3ec89e911ddb565a8276467fca6ad20d591fd146914833e3a232342243c24ed75924d1a11dc369625a1892af9d78a6ae5a7
+EBUILD wps-office-11.1.0.8372-r1.ebuild 1927 BLAKE2B e4f3111f103e6a8f7326da8a7fd23b41b85b71aeccf32dbe3551028a417c09c3cfa3df623e4c907de45ff025e93ac4f09954631eab78d77a1adcfdab99f56868 SHA512 a07826ae3b27bd84a7b4dba98f7e669bb27b4b736efd497ab7d006f0a6e490a6ebeb6d4414ab31895877a123895423b5478efdfab21da83fa58accee271bb6d0
+EBUILD wps-office-11.1.0.8865-r1.ebuild 1819 BLAKE2B cd8993666633350c99df97b78651b9f04172e5120dd274e428c354d7f29b156ba63d5a909beedf11e836fc89df846dd5e37af5feb5a3e2841f5fcb7acc950183 SHA512 84d37b01f65788122b53513ac2145261af910c0b7121f9e58667df701cbef7f002dc8b8ea1bb123695881ba93298b6b38f01f9c2bd100dd6cb6bdfd5ba87c71a
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/app-office/wps-office/wps-office-11.1.0.8372.ebuild b/app-office/wps-office/wps-office-11.1.0.8372-r1.ebuild
index 0619efde9401..9bd4cf23a68e 100644
--- a/app-office/wps-office/wps-office-11.1.0.8372.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.8372-r1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 	dev-libs/glib:2
 	sys-libs/zlib:0
 	net-print/cups
-	media-libs/libpng:1.2
+	media-libs/libpng-compat:1.2
 	virtual/glu
 
 	dev-libs/libpcre:3
diff --git a/app-office/wps-office/wps-office-11.1.0.8865.ebuild b/app-office/wps-office/wps-office-11.1.0.8865-r1.ebuild
index a6c94fc5dbea..490d154afda2 100644
--- a/app-office/wps-office/wps-office-11.1.0.8865.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.8865-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	dev-libs/glib:2
 	sys-libs/zlib:0
 	net-print/cups
-	media-libs/libpng:1.2
+	media-libs/libpng-compat:1.2
 	virtual/glu
 
 	dev-libs/libpcre:3