gentoo resync : 12.11.2017

3 files changed, 2 insertions, 76 deletions

diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
index 9a523188e826..f76d9beb84ee 100644
--- a/www-client/otter/Manifest
+++ b/www-client/otter/Manifest
@@ -1,7 +1,5 @@
-DIST otter-0.9.12.tar.gz 4211473 SHA256 1a184561b9dbf3443cf1f83ad8604976b1b06cc00a93306331b364f237363e20 SHA512 65d6d89fbd632652bde00418954f46a5617548a189ab8863102dedb4fc1be62e41d2b187ad67eb5a6214c96d6b5957223ffbe24c1f641bb92295ac3e846d01d2 WHIRLPOOL df1034578b553a30fa79a8038f3b26e33c0570cfb52645c5bfe3a6a1f31a33a98f12b57f25ca2376a2f4eaaa9c4949579369f2f7c3fcd8f4b5792ccfa2449973
 DIST otter-0.9.91.tar.gz 4422341 SHA256 31ba7efc9359f553c600b190a8f4105a98818cf2022f32298238397912c5e13a SHA512 d7a98c5a9ef8dc2cd134ca20885c4332f96ef5ebb31bee968d132ca6cc6f30786e382be42decd10e4b0d85f7ddd67fb6dd008ac130d4ba4cf5cbb7423ce9f63d WHIRLPOOL f0e5dd25bae9f589a6c533d7c01665a3c8886e1398405412a8fc95f61c7d8f1bf7e75ffa20ffbb1a43b2539032ca672f0111b0b5de16f828b36f97acd1578f23
-EBUILD otter-0.9.12.ebuild 1508 SHA256 3b3e855c1529031344401b0452da773cadf83e638b495bb1088ccbccfc42cbb6 SHA512 0fcc4b7b5e39ed89e6cf263ae674d3b7da7904f25085b0555059d1b0db18dd22a848077a2a4e872ede80b5830f19842403cca1b48cb3ac395ca8b819fdc13a23 WHIRLPOOL ca23ef26e12dafaad7ebe90f82fa71ef153b882f49656a70e63f90c7f452297427fa5f9e3240e80e09e43fd7f73e7290a5973292e54da2bb312776aa8cb43377
-EBUILD otter-0.9.91.ebuild 1523 SHA256 621c01098b40ea8fceac2d3ba7da9cd4d9d2dd8f93905bcafe7a2d0fa91976a7 SHA512 94c3d3d84d0766a739e1dc11c69a75cae6972da18f2ffb265127a6639b7c891b8c68bc1e367c9031fb7b14157a5f65314125082940f1cda4273124aa27ee6eb4 WHIRLPOOL e57c8ce303a9bc496c4f884e6f94b7cbf0209dc05afabaa7170d1c96b4e0c029454efb3b20b21eec0b590dbfb801b88054fac3f49deedf382fcf9ff8a97740bd
+EBUILD otter-0.9.91.ebuild 1530 SHA256 6cfa42afbbc9f562857cca6be98bc21dac482c0cfc1a9d3022b5e77af9d18b14 SHA512 1fb2dbb7bdfe8e6e12c756ad3bba13d80c1f394cd37f2c38ecc551d2968e5d76be84c5c30ba87c4d435ddcbdea38aba1e780293e4f4a5de42e71a08f5195b941 WHIRLPOOL 6527a03225e07266920f23dfe312c711c67af02bb9d3e8ff34f70b34b28869a4bb653eb3520262f80eba0b07708cdbf041a6bcdcc823df58956c9680c260659c
 EBUILD otter-9999.ebuild 1238 SHA256 f98e2ef939efab2fe53332128b29aba79e59a1ba8493409a9c07294c4e2bed13 SHA512 a015a0aa3b313f8c24e1508a67ff8a8498d02903a4214fc2e9de4b87238a0469ad6221035c16e0649fe2c3197f29b5708a8ba275a102e08c9cf86ee08bfaf151 WHIRLPOOL 8fc1e6e7e922d328afa3c6b6f71b87c0ff860836e56720af51b8801f3ab1938256adb611515550070057194807f66bd2f794688d620180c63b2f923a4520883b
 MISC ChangeLog 4190 SHA256 48ef8891a4228e23d18b44f855e7e4eb48f4400c93da85501828ff543de64045 SHA512 ad35d91f52044c78ca83df6b0202c29646f3b9b8557b1d80d6612b946e8aa71a94a1b48ff1b0931fc0be5464d75e65037e83f8a9e526a3381f06fca9d78b04c3 WHIRLPOOL 6d9d672e03e1049d49eec3726d60727c02ba7409254285cba2174776781ae72756a43f8494719555cd52a50c7bdda5d392be224a9b1431d6bf55325d089e0097
 MISC ChangeLog-2015 1815 SHA256 b5aaf3cdd0948bb6ff7025ae32abbafce7d199c9986a1893ae96629cd24a09e1 SHA512 4f91c00e1a85d72814a0983084421e461d4945b4dd63aa6a9b220256d964a990bbc3b25e8a461162cbb0cbcdbd923d9254790f882845e95f1078a2b3b5cf6bef WHIRLPOOL 7cf898bfa03569eb757f571a57463d18326fae0eb26b3514fc6e58ca4a7c5f4bcf2832b4840cf96f04f886f887c802a0eb789e0549096ba87fd20bc96a27567d
diff --git a/www-client/otter/otter-0.9.12.ebuild b/www-client/otter/otter-0.9.12.ebuild
deleted file mode 100644
index 7ece4e1e4720..000000000000
--- a/www-client/otter/otter-0.9.12.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="http://otter-browser.org/"
-SRC_URI="https://github.com/Emdek/${PN}/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="spell"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxmlpatterns:5
-	spell? ( kde-frameworks/sonnet )
-"
-RDEPEND="
-	${DEPEND}
-"
-
-S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
-DOCS=( CHANGELOG CONTRIBUTING.md TODO )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if [[ -n ${LINGUAS} ]]; then
-		local lingua
-		for lingua in resources/translations/*.qm; do
-			lingua=$(basename ${lingua})
-			lingua=${lingua/otter-browser_/}
-			lingua=${lingua/.qm/}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm resources/translations/otter-browser_${lingua}.qm || die
-			fi
-		done
-	fi
-
-	if ! use spell; then
-		sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	domenu ${PN}-browser.desktop
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/otter/otter-0.9.91.ebuild b/www-client/otter/otter-0.9.91.ebuild
index ec42388d0713..39aa4783beb5 100644
--- a/www-client/otter/otter-0.9.91.ebuild
+++ b/www-client/otter/otter-0.9.91.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="spell"
 
 DEPEND="