gentoo resync : 31.10.2017

5 files changed, 3 insertions, 62 deletions

diff --git a/app-office/qcharselect/Manifest b/app-office/qcharselect/Manifest
deleted file mode 100644
index ba9dde18632b..000000000000
--- a/app-office/qcharselect/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST qcharselect-0.3.tar.bz2 136257 SHA256 1a7d3476aeae005e957333ae0ca009b05975870a12db3beec8ffaa914d31e7f0 SHA512 810b8b5463960ebb7c95d1a85543f57c0fb140342f63804d0c1c43006c78f29b3969c262a2fb7544e64cf5d5f4f7848a7b2923217cc1ebfa734c8d23ff4e236b WHIRLPOOL 2c165925d62f2769c927a30f1506124bf53e9dc6d58a8384d6f54e77748a2b2ca49a2b5b13daaf1ce4de3bc9cc527f92315a7c29c150633fb5e73009f73a2890
-EBUILD qcharselect-0.3.ebuild 865 SHA256 d551ffeee764f85a739c118c4e4b063e8f14ca6d9945a6691d75ae5d3fc9b25d SHA512 664398e36e3baeada0a86c4e37f86197ea32508e97ba9d0a61b7404c13a66c6d48040336d455a6dcc305207209e777211c8d5931199419b15bb58c23d90db518 WHIRLPOOL c7efcf9a97990d845fec5069ca30b2d0f58467c73d0332415208ab216b416579bbed6b7a9bf988225ef4cf686a0efef5749448d9d6abe6c663ca045874b41e72
-MISC ChangeLog 2437 SHA256 b2c2b01cd726d3abfed13cfd9b57baa541c78aefdc0dbf620151263176558f73 SHA512 066de479b539b088901d2d8a8b5bb7bfc9f3a9541593d680d56b24334f0e2853a0840c447ae60191e0695e0af0d444afbdaee47dc38ba4ca947c02ca88a19bde WHIRLPOOL e04049d429f533192720db9e28f618e8ba4a11697192a015d1a8af46bf57a28bfa8afed18eb9785f1bd398b2aef3c6054fd6141e5bc59216817f576aaf44f053
-MISC ChangeLog-2015 993 SHA256 e55aefc30739add4de39fe642f6a1dc5dfad93548ed7bfba52898f881ac84891 SHA512 8a68b0f7b2c67bad003d90a6cc238cf7046dc18aa16d28703a7d6941414593aa0513433a0a9593590748da11e89122012a31d60af72b1d80f3c124bc91f29c65 WHIRLPOOL 610c63c90373c856b9552140853a08288acda948c97cb5c077a4dd2753dca68f8e8a86798df5556bf8176d27c4aa09c566b32ea51bd94ee433802877e4babd4a
-MISC metadata.xml 328 SHA256 c11c15e9916323d985bfa7ff9f2848cf4f4d6c6dabf21e83a0b79ca6a9e76199 SHA512 ddf269c62b79014eb3d8f6f88e8dfe605c20bc33a5fa0fe1248ce6c999692e4997eda3f85bb7e44f7c512b69d51c51b47aca8fc7e554ba6972bb1ae754d97d8a WHIRLPOOL 96b37b9d629d6b5328347f46186799b7a773c2acce04e30e189ae221b7f59b3aad72fc60bd0345b90396da3b5666f442fd4bd6bc1bafbf4a7b04bcfe60015d61
diff --git a/app-office/qcharselect/metadata.xml b/app-office/qcharselect/metadata.xml
deleted file mode 100644
index 200d4619eecb..000000000000
--- a/app-office/qcharselect/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">qcharselect</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-office/qcharselect/qcharselect-0.3.ebuild b/app-office/qcharselect/qcharselect-0.3.ebuild
deleted file mode 100644
index c28940f590d8..000000000000
--- a/app-office/qcharselect/qcharselect-0.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib
-
-DESCRIPTION="A Qt4 port of KCharSelect from KDE 3.5"
-HOMEPAGE="http://qcharselect.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-qt/qtgui:4[qt3support]"
-DEPEND="$RDEPEND
-	x11-misc/makedepend"
-
-src_prepare() {
-	sed -e 's:update-mime-database:true:g' \
-		-e 's:data/desktop/qcharselect:src/QCharSelect:' \
-		-i Makefile.in || die
-
-	sed -e 's: %m::' \
-		-e '/Path=/d' \
-		-i src/QCharSelect.desktop || die
-}
-
-src_configure() {
-	local myconf
-	use debug && myconf="--enable-debug"
-
-	econf \
-		--with-qtdir=/usr \
-		--with-qtlibdir=/usr/$(get_libdir)/qt4 \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index a8266e21afec..76faac326bdd 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -13,7 +13,7 @@ AUX scribus-9999-docdir.patch 1309 SHA256 49c1c5072caf3f9e6cdde3a521be1752c18200
 AUX scribus-9999-fpic.patch 499 SHA256 f9ea952e09140b3d293789c979fad9654e03265c0392e975d24513819ef67c19 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015 WHIRLPOOL 06ea6c67e2fe6a367df34f615efb0f5e2ff2f4e3f756f3d564d4eea27e5184e97f3820087bf7f8a5278dfbf994d8fdc6a26397bb876a83c0a5b601cba636a02b
 DIST scribus-1.4.6.tar.xz 73601104 SHA256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 WHIRLPOOL 5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7
 DIST scribus-1.5.3.tar.xz 74222084 SHA256 73a30b4727e19f5d301a936d23a84275cc4f5613a92416cbd843f5167721d74f SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980 WHIRLPOOL 0e4c36089e00f7bfc582f2138f4b402f26ca22ea6c7ecd1adce066e1b8741b839d34e769c2a7c4806e79279627d678223332cf36609d68716d32515f3389a48a
-EBUILD scribus-1.4.6.ebuild 4200 SHA256 3409ad9d9229400293e30aead1b63baf787a9be2376f6b242f59a77cb0b743a8 SHA512 78beca755fc0fbe0954a54cfcb139036f89e2b32fded489bb8e9ab2b66e2f5a31bb97f6bcadf2875db33ea3199dfee01a0fcee57c48fcd0179dcf67f6ee13891 WHIRLPOOL a16eefe7b69623ae2066f680f02745a4a778ab06e93bca7118d4663c19e9356e30f8431b2b198aa0b6ea264f9abd3356a623bbb651dbf2f70a0cbd88a59f1237
+EBUILD scribus-1.4.6.ebuild 4201 SHA256 191f3b84da09ce1ffa881e7eed25e4d455bdbc2b4e316ef158704f129581b3ec SHA512 cc1b338a59557e15c17eee40b1d5f77153264705287a5ed36dcf5c503f1909268d63ba1b759f669a7a9a79226e9058457f2aa412ae85b0facf7250939f5a6239 WHIRLPOOL 644dd947e975ec5de2c919fe9f71569ef9c05b06753ff31e15546ffa3c8587b6f3e6cb8d2231d6aaf745bbbfd479a30e26eb8f6312a89092ffd6d5c51331f0c1
 EBUILD scribus-1.5.3.ebuild 6695 SHA256 47381d1e4981aa137e598c6133175d3f1ef6bfb2e3f0cbf0385ef60d05d90788 SHA512 1325a44ef7090dc87d9a39658d85f1a0328c7443dd3e8e74cd5e2b7daa98bee6abe02672220085db8d9aec9ce928a01dff68262903e22c02c8de4f76f7173979 WHIRLPOOL 3b4f03286ed8029deaabafd38f9332d91e17be3a3cc8e857f5ba1bc6a2cba71a8d226ac6ecc1165862d77e422fd7686f888ea23985c0504355bc512f0ae7e26c
 EBUILD scribus-9999.ebuild 6686 SHA256 e0028c375384aba9a4b641e45bb06870d3e0c2b32056137e30421e7fe4d091f9 SHA512 e1d92175029bd07824ab1e92875fcdbaff3c830e274e9002189fc7edb76bb1e39102bdd7d0b4473363dc727a3abceb5ff63cacf4ae2593d9d272768f1e4d4523 WHIRLPOOL 89ce4e9f04eea9d6ed797f190b129440fc81144968bd182b14865e46274e7fa3352f537989924dd002ffb459f006782d546125f2e00dd7e44a00617c9050e2c0
 MISC ChangeLog 9778 SHA256 770902fbc7ba329b09be36932d12e4a7938a6d527c26eef4123c150fbecbf573 SHA512 242c3bad1617d51fb635222301578f3ca993c95c48dcb474bd2703f3db05faa1b0bd1ddde566a132c77b19c53a9bb76c8413f11f6ed9026f58133aa5d02f87d5 WHIRLPOOL ddf0156b4e30194b14c902eef2d8e2a198c83f779de2ec3f310dbbdf841b62af3462ca3535b59cb4c78041675bbd43c2a0b751ab120706d5632ddf1b22e7666e
diff --git a/app-office/scribus/scribus-1.4.6.ebuild b/app-office/scribus/scribus-1.4.6.ebuild
index 2965bff878de..71e5719cdb10 100644
--- a/app-office/scribus/scribus-1.4.6.ebuild
+++ b/app-office/scribus/scribus-1.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
 
 # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}