gentoo resync : 19.03.2019

3 files changed, 29 insertions, 12 deletions

diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest
index 3a4c7c4a32d7..d6920ec12b2e 100644
--- a/mail-mta/protonmail-bridge-bin/Manifest
+++ b/mail-mta/protonmail-bridge-bin/Manifest
@@ -1,3 +1,3 @@
-DIST protonmail-bridge-1.1.0-1.x86_64.rpm 47088500 BLAKE2B 0970839501ced47f222bfdcb7dd26083eaa7d19d61da7c811bfe7e7544bd53c89b3e8879f544c474c9cdd92572a4ed051ae40d73fac031503ea23c8eb414eb2b SHA512 352abdc850244b00985084d708a34a73f83541753a37432bc024b5dbc5916d6514bc235f80bcd949a54517b2b3f4b3aac9b0d4592398cf206339a23b5bf8a355
-EBUILD protonmail-bridge-bin-1.1.0.ebuild 8215 BLAKE2B bc027e22b057a8eb9c44196dd672ec04f6e4235a4f1ec03b96a669af0fdb95e3a18ef775f7f35608fc1d6923c8ebd8c05b6e748d5de5cfbb4c8e8f8f08a46d78 SHA512 ecbfd03ce733a2524ace30d0fc17c7a5a192ad0bc111224f3dd5d1f30d52c5d78b0929b3e20be5f99a1dcbd2192c09d5e215fc9dbd3c0dc9069f2ca782fa799a
-MISC metadata.xml 364 BLAKE2B dd954ec6767c68a6ae792b545fe4a11b15630bb77445e146aef6577f71a05d01cf52a8b6afac6dd304ed0d9429453edb16b3f47008b411f331e786bd33c01efd SHA512 542d4cde25dd2756b2927d22dab88cfd2b086b01fcfeafe93aa9bddcbc7b2878e2e048d379572bd06a59440c2b5b255d43dfb7dc8e1e4ce59a07ae7622948845
+DIST protonmail-bridge-1.1.3-1.x86_64.rpm 53554820 BLAKE2B 2fb0eb7b1a1d95ed3cf5785e527692497429f73eeb37dd9a98da7b5b30cafde048898026c8934b76630976585eb43c0a9392efdcb10b8f2ae8002884312a9142 SHA512 61a4a28fe9efbeeaecd79392eb730916e67dfffc1bcc5bbee156e3dd786dfeae5b39092ccab4c6d5ff9719d0792752732b52bc87615a7922c16cf6203eb57f5b
+EBUILD protonmail-bridge-bin-1.1.3.ebuild 8914 BLAKE2B 832f25103989ba5c5e413435c63e960c5ae101b4f21d823991860ca8f6a8657b8471722c657dfc45f11c4f810e6baf1d11aaca79db7c623128c8b9f4fbb4ce69 SHA512 9e9b30a476e3d228323e69e047381beafc3346f62f46c60ecd1268d2804ad093440535c435a6cd461eb53a1d52813829af96865a135a90e4e9765b38fbeeb931
+MISC metadata.xml 477 BLAKE2B 8d29a65220a234802a25b8979e598393883a4e905ed6b114297801b93f82212165749f8317791459314afe1c59c6f5a7c2e871bc85637387bc3decae250cec21 SHA512 7d081e416b0bf6b91e6ba69a1de51c35839ff1512ab3c93be3f161ab5e6a4a554d58549460bb7fb73e1dbaf44f76b673067f0f33c4d775143f500416e096f0bc
diff --git a/mail-mta/protonmail-bridge-bin/metadata.xml b/mail-mta/protonmail-bridge-bin/metadata.xml
index 6bf484adc0d0..723b5af565f5 100644
--- a/mail-mta/protonmail-bridge-bin/metadata.xml
+++ b/mail-mta/protonmail-bridge-bin/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>lucianposton@pm.me</email>
 		<name>Lucian Poston</name>
 	</maintainer>
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.0.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.3.ebuild
index 02b7b4f8ddfd..35b2fe8b0702 100644
--- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.0.ebuild
+++ b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ DEPEND=""
 RDEPEND="
 	app-crypt/libsecret
 	dev-libs/glib:2
-	media-sound/pulseaudio
+	media-sound/pulseaudio[glib]
 	sys-apps/dbus
 	virtual/opengl
 	media-libs/fontconfig
@@ -39,9 +39,12 @@ S="${WORKDIR}"
 QA_PREBUILT="*"
 
 src_prepare() {
+	# Some bogus files got into package.
+	rm -rf usr/lib/.build-id
+
 	# Bug #660366. To workaround preserving libs, set RUNPATH and rm unused libs
 	cd "${S}/usr/lib/protonmail/bridge" || die
-	patchelf --set-rpath '$ORIGIN/lib' Desktop-Bridge || die "patchelf failed"
+	patchelf --set-rpath '$ORIGIN/lib' protonmail-bridge || die "patchelf failed"
 	patchelf --set-rpath '$ORIGIN' lib/libicui18n.so.56 || die "patchelf failed"
 	patchelf --set-rpath '$ORIGIN' lib/libicuuc.so.56 || die "patchelf failed"
 
@@ -57,7 +60,6 @@ src_prepare() {
 	rm "lib/libQt5Concurrent.so.5" || die
 	rm "lib/libQt5Gamepad.so.5" || die
 	rm "lib/libQt5QuickParticles.so.5" || die
-	rm "lib/libqgsttools_p.so.1" || die
 	rm "plugins/audio/libqtaudio_alsa.so" || die
 	rm "plugins/audio/libqtmedia_pulse.so" || die
 	rm "plugins/bearer/libqconnmanbearer.so" || die
@@ -85,7 +87,6 @@ src_prepare() {
 	rm "plugins/geoservices/libqtgeoservices_nokia.so" || die
 	rm "plugins/geoservices/libqtgeoservices_osm.so" || die
 	rm "plugins/iconengines/libqsvgicon.so" || die
-	rm "plugins/imageformats/libqjp2.so" || die
 	rm "plugins/mediaservice/libgstaudiodecoder.so" || die
 	rm "plugins/mediaservice/libgstcamerabin.so" || die
 	rm "plugins/mediaservice/libgstmediacapture.so" || die
@@ -139,14 +140,11 @@ src_prepare() {
 	rm "qml/Qt3D/Render/libquick3drenderplugin.so" || die
 	rm "qml/QtBluetooth/libdeclarative_bluetooth.so" || die
 	rm "qml/QtCanvas3D/libqtcanvas3d.so" || die
-	rm "qml/QtCharts/libqtchartsqml2.so" || die
-	rm "qml/QtDataVisualization/libdatavisualizationqml2.so" || die
 	rm "qml/QtGamepad/libdeclarative_gamepad.so" || die
 	rm "qml/QtLocation/libdeclarative_location.so" || die
 	rm "qml/QtMultimedia/libdeclarative_multimedia.so" || die
 	rm "qml/QtNfc/libdeclarative_nfc.so" || die
 	rm "qml/QtPositioning/libdeclarative_positioning.so" || die
-	rm "qml/QtPurchasing/libdeclarative_purchasing.so" || die
 	rm "qml/QtQml/Models.2/libmodelsplugin.so" || die
 	rm "qml/QtQml/StateMachine/libqtqmlstatemachine.so" || die
 	rm "qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so" || die
@@ -170,6 +168,21 @@ src_prepare() {
 	rm "qml/QtWebEngine/libqtwebengineplugin.so" || die
 	rm "qml/QtWebSockets/libdeclarative_qmlwebsockets.so" || die
 	rm "qml/QtWebView/libdeclarative_webview.so" || die
+	rm "lib/libQt5MultimediaGstTools.so.5" || die
+	rm "lib/libQt5OpenGL.so.5" || die
+	rm "lib/libQt5QuickWidgets.so.5" || die
+	rm "lib/libQt5EglFsKmsSupport.so.5" || die
+	rm "plugins/position/libqtposition_serialnmea.so" || die
+	rm "plugins/webview/libqtwebview_webengine.so" || die
+	rm "plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so" || die
+	rm "plugins/texttospeech/libqtexttospeech_speechd.so" || die
+	rm "plugins/canbus/libqtpassthrucanbus.so" || die
+	rm "qml/QtQuick/Shapes/libqmlshapesplugin.so" || die
+	rm "qml/QtQuick/Controls.2/Fusion/libqtquickcontrols2fusionstyleplugin.so" || die
+	rm "qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so" || die
+	rm "qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so" || die
+	rm "qml/Qt/labs/handlers/libhandlersplugin.so" || die
+	rm "qml/Qt/labs/location/liblocationlabsplugin.so" || die
 
 	default
 }
@@ -178,7 +191,7 @@ src_install() {
 	# Using doins -r would strip executable bits from all binaries
 	cp -pPR usr "${D}"/ || die "Failed to copy files"
 
-	dosym "Desktop-Bridge" "/usr/bin/${PN}"
+	dosym "protonmail-bridge" "/usr/bin/${PN}"
 
 	insinto /etc/revdep-rebuild
 	newins - "50-${PN}" <<-EOF