gentoo resync : 29.01.2021

3 files changed, 29 insertions, 34 deletions

diff --git a/net-im/gitter-bin/Manifest b/net-im/gitter-bin/Manifest
index 2aef8df8cd6f..b75878b11a6f 100644
--- a/net-im/gitter-bin/Manifest
+++ b/net-im/gitter-bin/Manifest
@@ -1,5 +1,7 @@
 DIST gitter_4.1.0_amd64.deb 98314502 BLAKE2B 3f14e044865c9af89dc6ac62dbe8f8221824c6f529418a31fd5236ecec45ddfd6013d734100a414a2bbca0db9e8c40cb7046868391d507ba5c9de9da0c66225d SHA512 2ea0ebbc05cbdc40e4e8cb07a68b3948477a61a81e550b8f131af46315c6fc7547c0954aa101260f93b63c557f3e00b1e23006a236b77be01ea4a82edd170f70
 DIST gitter_4.1.0_i386.deb 101820112 BLAKE2B 3d1ab270389da9c82440dc7a204d1973402de1648e0387a026601d34bd1f2b26469b0fab9be4ff4b596cbe257047e88446b5c36d08deeeae1aaea4f387c45ac3 SHA512 c76da19e6eaf79894319848b6121660dab0bd8f2d8cdfaf413a68bee0f4c62fdca25c19c24eeb226164b643582db9ed686c68a5f72701618d41b423df9c9cee8
+DIST gitter_5.0.1_amd64.deb 136453344 BLAKE2B 6e057fb04872f89961a8970d079b14fbaf416db126ac0596485936a069a85fb5e783b052e20af7fbce40bc4805313ad793873c6ad3cadf87fc2662fef39604f1 SHA512 9bca96a2e312e7893ea7e5faca4a6a3e343d0d3bf96b86e0353437517fc006eb917787cb872f305d1c843978cfd80f729474bd485070ec26d99d67d24ffbf4d1
+DIST gitter_5.0.1_i386.deb 141585750 BLAKE2B 464e3416085717702df605fefade3a5aabafbdbfa9274eb9da03832b9a5e442d0a92eacd5c4d757e64709b3ba39bfdc5a87d689bb24db1ede3aca43b187550ce SHA512 b340b161728530e6c397ad6d5fbd591393a893c73b29056094514514d3e0f3a30ebdab94bb19f6c78cf1c73a30c6cd145476e34db5eaea06ba061f8a410579f7
 EBUILD gitter-bin-4.1.0-r1.ebuild 2981 BLAKE2B 23fe433dfe977f02e6c8045242fb222e3506a6ad88616370bf6ec04de7488c5ee0ad8ab6f200d0ef2fa983656787fce2743313b0e50808b457a30f4c4e936120 SHA512 5689cf43a4486f5cc174e31116790b8249fe46629646bc1cebbcd41035b7ed45cbbb7356c6747dcb529fe328d408011abce63e831161c6bc21c9fb112162d663
-EBUILD gitter-bin-4.1.0.ebuild 2981 BLAKE2B aaefc6bb75db49afe0ac427f6a6a9ba6e5d2ea5b39b9e414bb07e5b07446ca67872d61776f25169bf0a3a0b0da128d6192358595cd55ab622f597ef06240dc93 SHA512 166da8759debf400970fb563730aa609505ec9fccd9360b222e5b6fb9188efffeb84626668fcaf8a59d186873c97587f2d93120980cb423130543fc84bb043c3
-MISC metadata.xml 710 BLAKE2B 3807b9843d68e224ccdae9ae618672f42243064cdef8aa4c7cd66eb5dd4e99575cb05ac8ee700b754e5eff28864e9641284363be4f92ba4a420f3dfc0740abd9 SHA512 b3b02d786643953704e204546384c0c48062eddae58c5314d8aa460e846753a6df796fece8f66abbf538f755fa767f021654346772a07a5cabbdd342991d892c
+EBUILD gitter-bin-5.0.1.ebuild 3149 BLAKE2B 8627a0810af923aa7247461ccec0487104dbff37a83d872a42d7c28953d8c1320fb2a9fc9fe7ced56bac856bd5241ea17b6c85451de16884c042a3e5148e7b39 SHA512 938cf82609ef0bac5b9d54f42073ecda56b530efbb2cd28334872421d704f66ab90c15f55f7c520b8541b0325c9b89c28e85277af39a62be14a0aa4d6b6bdccf
+MISC metadata.xml 626 BLAKE2B b50b6161a9e83a6ada4548c23a898b069ffc09c8818e9abb4040e6df0cb436e586074a9225b1160df55b8358dd9b28422e2c774ab3ddc3dc7fae2ce930a3a4e8 SHA512 5cf4563c5dc36d509ae10a1824bebbd1f559bb57ff642e0f11f55676c894e2fae49060f7e4c1fb5fec9c1bed4814eacb1ecab2bca31eca5de72cb670840e08eb
diff --git a/net-im/gitter-bin/gitter-bin-4.1.0.ebuild b/net-im/gitter-bin/gitter-bin-5.0.1.ebuild
index b0d7e485b685..df5c40ef1ebb 100644
--- a/net-im/gitter-bin/gitter-bin-4.1.0.ebuild
+++ b/net-im/gitter-bin/gitter-bin-5.0.1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 MY_PN="${PN/-bin/}"
 
-inherit desktop gnome2-utils multilib-build pax-utils unpacker
+inherit desktop multilib-build pax-utils unpacker xdg
 
-QA_PREBUILT="opt/gitter/pnacl/pnacl_public_x86_64_libcrt_platform_a
-	opt/gitter/pnacl/pnacl_public_x86_64_pnacl_llc_nexe
+QA_PREBUILT="opt/gitter/pnacl/pnacl_public_x86_64_pnacl_llc_nexe
 	opt/gitter/pnacl/pnacl_public_x86_64_ld_nexe
 	opt/gitter/pnacl/pnacl_public_x86_64_pnacl_sz_nexe
 	opt/gitter/payload
@@ -23,9 +22,14 @@ QA_PREBUILT="opt/gitter/pnacl/pnacl_public_x86_64_libcrt_platform_a
 	opt/gitter/nwjc
 	opt/gitter/nacl_irt_x86_64.nexe
 	opt/gitter/Gitter"
+QA_FLAGS_IGNORED="opt/gitter/minidump_stackwalk
+	opt/gitter/nacl_helper_bootstrap
+	opt/gitter/crashpad_handler
+	opt/gitter/lib/libEGL.so
+	opt/gitter/lib/libGLESv2.so"
 
 DESCRIPTION="Chat and network platform"
-HOMEPAGE="http://www.gitter.im/"
+HOMEPAGE="https://www.gitter.im"
 SRC_URI="
 	amd64? ( https://update.gitter.im/linux64/${MY_PN}_${PV}_amd64.deb )
 	x86? ( https://update.gitter.im/linux32/${MY_PN}_${PV}_i386.deb )"
@@ -33,19 +37,22 @@ SRC_URI="
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="pax_kernel"
+IUSE=""
 RESTRICT="bindist mirror"
 
-RDEPEND="dev-libs/atk:0[${MULTILIB_USEDEP}]
+RDEPEND="app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
+	dev-libs/atk:0[${MULTILIB_USEDEP}]
 	dev-libs/expat:0[${MULTILIB_USEDEP}]
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
 	dev-libs/nspr:0[${MULTILIB_USEDEP}]
 	dev-libs/nss:0[${MULTILIB_USEDEP}]
 	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
+	net-print/cups:0[${MULTILIB_USEDEP}]
 	sys-apps/dbus:0[${MULTILIB_USEDEP}]
 	x11-libs/cairo:0[${MULTILIB_USEDEP}]
 	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
 	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libdrm:0[${MULTILIB_USEDEP}]
 	x11-libs/libX11:0[${MULTILIB_USEDEP}]
 	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
 	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
@@ -56,9 +63,9 @@ RDEPEND="dev-libs/atk:0[${MULTILIB_USEDEP}]
 	x11-libs/libXi:0[${MULTILIB_USEDEP}]
 	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
 	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
 	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
 	x11-libs/pango:0[${MULTILIB_USEDEP}]"
-DEPEND="sys-apps/fix-gnustack"
 
 S="${WORKDIR}"
 
@@ -68,10 +75,10 @@ src_prepare() {
 	local arch
 	arch="$(usex amd64 "64" "32")"
 
-	# Modify desktop file to use common paths
+	# Remove hardcoded paths
 	sed -i \
-		-e '/Exec/s/=.*/=\/usr\/bin\/gitter/' \
-		-e '/Icon/s/=.*/=\/usr\/share\/pixmaps\/gitter.png/' \
+		-e '/Exec/s/=.*/=gitter/' \
+		-e '/Icon/s/=.*/=gitter/' \
 		opt/Gitter/linux"${arch}"/gitter.desktop || die "sed failed"
 }
 
@@ -79,29 +86,18 @@ src_install() {
 	local arch
 	arch="$(usex amd64 "64" "32")"
 
-	fix-gnustack -f opt/Gitter/linux"${arch}"/nacl_irt_x86_64.nexe > /dev/null \
-		|| die "removing execstack flag failed"
-
 	newicon opt/Gitter/linux"${arch}"/logo.png gitter.png
 	newicon -s 256 opt/Gitter/linux"${arch}"/logo.png gitter.png
 	domenu opt/Gitter/linux"${arch}"/gitter.desktop
 
 	insinto /opt/gitter
 	doins -r opt/Gitter/linux"${arch}"/.
-	fperms +x /opt/gitter/Gitter
-	dosym ../../opt/gitter/Gitter /usr/bin/gitter
-
-	use pax_kernel && pax-mark -m "${ED%/}"/opt/gitter/Gitter
-}
+	fperms -R +x /opt/gitter/lib/ /opt/gitter/swiftshader/ \
+		/opt/gitter/pnacl/pnacl_public_x86_64_{ld_nexe,pnacl_llc_nexe,pnacl_sz_nexe} \
+		/opt/gitter/{Gitter,chromedriver,crashpad_handler,minidump_stackwalk,nwjc,payload} \
+		/opt/gitter/nacl_{helper,helper_bootstrap,irt_x86_64.nexe}
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
+	dosym ../../opt/gitter/Gitter /usr/bin/gitter
 
-pkg_postrm() {
-	gnome2_icon_cache_update
+	pax-mark -m "${ED}"/opt/gitter/Gitter
 }
diff --git a/net-im/gitter-bin/metadata.xml b/net-im/gitter-bin/metadata.xml
index 88b44ca0dc0c..2aa6d30c64dc 100644
--- a/net-im/gitter-bin/metadata.xml
+++ b/net-im/gitter-bin/metadata.xml
@@ -14,9 +14,6 @@
 	grow and connect communities through messaging, content
 	and discovery.
 	</longdescription>
-	<use>
-		<flag name="pax_kernel">Triggers a paxmarking of the binary</flag>
-	</use>
 	<upstream>
 		<doc>https://gitter.zendesk.com/hc/en-us</doc>
 	</upstream>