gentoo resync : 31.10.2017

3 files changed, 2 insertions, 50 deletions

diff --git a/dev-qt/qtbearer/Manifest b/dev-qt/qtbearer/Manifest
index 29ca1a995bf5..9b3acd131bf5 100644
--- a/dev-qt/qtbearer/Manifest
+++ b/dev-qt/qtbearer/Manifest
@@ -1,7 +1,5 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-EBUILD qtbearer-4.8.6-r1.ebuild 1498 SHA256 7d8e9bcb55ad3126b605cef9f3db9177fa3315748dfac41658d4596bbb6457f2 SHA512 ffaea0dd23597b46a248a20fbdd9889d0e0624610ee19737aa091eb48beeecab6b715b4a7ed09f4de5a8f285ad557ba303506e470e9c31e787384399cf0c1def WHIRLPOOL 886db118d9a610ae977543d37330d10c058c8d14f0aee621b3e8a0b8ca0fed4ce60a6a5331f9fe2618ead4ace86779777f335b6d9a70104500c1e79ac9be5570
-EBUILD qtbearer-4.8.7.ebuild 1447 SHA256 c21edcc9ebdc7ab29c7177586495d98700ee1d3935f072f2d258040053051757 SHA512 ae6e8fef15b92d247992627d7ced0e2b19dc3c2ccc1ffca27d35c9e98839940f9d3312d8437072504bf910e26859a204a3c85151989beda7761c08d5e8681279 WHIRLPOOL 9106b32c551058b5025ab1aa7fa233f7c3a12a8c5cceb9b52d0105cdeff2eeb704a38a8b66a7979bdac51a854d8ed123ea7134c3d714d4a9f0d22e24e2aa1f8e
+EBUILD qtbearer-4.8.7.ebuild 1448 SHA256 63669c82381ac856765a0482a3b24377c2596b4c45aa610c09118254ca2497ff SHA512 c3fb35eee3f74574bda39a17cc7c69b628e07c5893e7ea2890dabfeca2ba067a14fd45949018bb8b6ce4c7306318ff3010aac4d6dde246b404e6390d6a614bc3 WHIRLPOOL 0e19c5f7baf795b5a53a5e4edb6e825d9db9668ec6eb661ff4047c15215823e84d0c0bb3c89861b8ec852b7548d70506360635c9007bdaae97e29d3b5d667a3e
 MISC ChangeLog 2793 SHA256 66fa6f54c4efe6e6f97a13302ebe8afd847494ca26616b3577de3a2b8d023eeb SHA512 f4ac01bbc4c771b6579ac9f5ac75682a355f35a743c520cbb1c0f6f1917b891f3280799ea5f31b91cb5c9d429a9f6a3964699f5879f1e9398a98e2a5e7860823 WHIRLPOOL 4c96b70e3372fcda629ef1dcc2f0367ca198f1c7d7b8e4106e72d42a5ab659012517c6cf2788d1f949a0885e7b0f61fdd17280ccdfd8fb83bad94648e132c892
 MISC ChangeLog-2015 6316 SHA256 c36e53054a29343d402d1ad0e9f48952be2ad364edf8cf5277ce2d61934fc3af SHA512 9c79ad561fde6d80a07ce43395e5d48391da1526a481be30f3eddf70e64c222b399f140d87865a31eaca1b7b4ebda18f34fca6276941601f2b4b985bfac572a7 WHIRLPOOL f3e30f00095b515f244b4abe4e81393b95d7fccb64cc9f21beedec03c75af4901d4fc41b48ddcb33e838cde63ccf23a9783eb3d948200681a89831d930b27a6b
 MISC metadata.xml 498 SHA256 a6e7ad05200f205e05e05aa0e56ef87541f0d7390f69bce63223fdbc37b4cdb9 SHA512 c3a9a09447e5cce7d251073785f0692096497a10ba01ae6ba8769d0ac07b829ed6d5dc97daf83da128569346fd1bd679031aafe0f4644d33361e22403f47310a WHIRLPOOL eda950bc76526a7c719f1be6e380a27d184fe202716e200ea457e3ae6635394e1f60848e9d690c2f094dfd095deccc734073271ca03ba7dc982f3d7a7b909a6f
diff --git a/dev-qt/qtbearer/qtbearer-4.8.6-r1.ebuild b/dev-qt/qtbearer/qtbearer-4.8.6-r1.ebuild
deleted file mode 100644
index 785995366ca5..000000000000
--- a/dev-qt/qtbearer/qtbearer-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The network bearer plugins for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="connman networkmanager"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/plugins/bearer/generic
-		$(use connman && echo src/plugins/bearer/connman)
-		$(use networkmanager && echo src/plugins/bearer/networkmanager)"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use connman || use networkmanager || echo -no-dbus)
-		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-		-no-cups -no-gtkstyle -no-nas-sound -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild b/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
index bde97360a22b..515b3ccc88ca 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The network bearer plugins for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="connman networkmanager"