gentoo resync : 22.01.2021

3 files changed, 100 insertions, 91 deletions

diff --git a/net-im/gitter-bin/Manifest b/net-im/gitter-bin/Manifest
index 52200e854b50..2aef8df8cd6f 100644
--- a/net-im/gitter-bin/Manifest
+++ b/net-im/gitter-bin/Manifest
@@ -1,7 +1,5 @@
-DIST gitter_3.1.0_amd64.deb 43340316 BLAKE2B 18682a8f467159fc3a0f765505a53982ba3bf0c7992782e256388076f6fba82e4e895d915376f9dfd333af57288d66f93e58bc9e48ecbfb1a5d11f060ac2df41 SHA512 b2888a2c9ed399102e2e80a2ec1ffafe093bdbe2f11d74753052c14841201cf586e0bb2a42ff8e67517d000a7c0b6f6aed30c32b3a7ecc683a18f8433b0bfa1c
-DIST gitter_3.1.0_i386.deb 45251440 BLAKE2B 01ea8b670e95496b7b4015ad6a31f546cf00a615dc562255b5761e797fd65ac00c5a89dd6353522359cbb5abf299aed50e3461fd1d2364e7667f4f748a288137 SHA512 4e58f5ca1a5db9139bef29eff2ffd7d599268844c11be65f98e9a78ad7a602c5d115e633c02519d025fe3d81f3174c478d5590bb2beaa92697617dc11fc141f6
 DIST gitter_4.1.0_amd64.deb 98314502 BLAKE2B 3f14e044865c9af89dc6ac62dbe8f8221824c6f529418a31fd5236ecec45ddfd6013d734100a414a2bbca0db9e8c40cb7046868391d507ba5c9de9da0c66225d SHA512 2ea0ebbc05cbdc40e4e8cb07a68b3948477a61a81e550b8f131af46315c6fc7547c0954aa101260f93b63c557f3e00b1e23006a236b77be01ea4a82edd170f70
 DIST gitter_4.1.0_i386.deb 101820112 BLAKE2B 3d1ab270389da9c82440dc7a204d1973402de1648e0387a026601d34bd1f2b26469b0fab9be4ff4b596cbe257047e88446b5c36d08deeeae1aaea4f387c45ac3 SHA512 c76da19e6eaf79894319848b6121660dab0bd8f2d8cdfaf413a68bee0f4c62fdca25c19c24eeb226164b643582db9ed686c68a5f72701618d41b423df9c9cee8
-EBUILD gitter-bin-3.1.0.ebuild 1985 BLAKE2B 7f69bef7a3671176a3726db655fbc6284808b7e0334054f3367de4864bb0f1ac09fd4e7df11a723dc3ba55d666632375f6aea2cdb2c3c0e12b1850d1b7217ac5 SHA512 e4d2682456914309183e14840cdb4bdc8544216439ac30b673d73ca4b1aeaa43adcdd5c37c1e5fca3dbb96c27a3739ba42e3be1d1d2f8a340dbd2ab8b996cf66
+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
diff --git a/net-im/gitter-bin/gitter-bin-3.1.0.ebuild b/net-im/gitter-bin/gitter-bin-3.1.0.ebuild
deleted file mode 100644
index e6e41ad17b2a..000000000000
--- a/net-im/gitter-bin/gitter-bin-3.1.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin/}"
-
-inherit eutils gnome2-utils unpacker
-
-DESCRIPTION="Chat and network platform"
-HOMEPAGE="http://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 )"
-LICENSE="MIT no-source-code"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist mirror"
-
-RDEPEND="dev-libs/expat:0
-	dev-libs/glib:2
-	dev-libs/nspr:0
-	dev-libs/nss:0
-	gnome-base/gconf:2
-	media-libs/alsa-lib:0
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	sys-apps/dbus:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libnotify:0
-	x11-libs/libX11:0
-	x11-libs/libXcomposite:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXi:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXtst:0
-	x11-libs/pango:0"
-
-QA_PREBUILT="/opt/${MY_PN}/${MY_PN^}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	local arch=$(usex amd64 "64" "32")
-
-	default
-	# Modify desktop file to use common paths
-	sed -i \
-		-e '/Exec/s/=.*/=\/usr\/bin\/gitter/' \
-		-e '/Icon/s/=.*/=\/usr\/share\/pixmaps\/gitter.png/' \
-		opt/${MY_PN^}/linux${arch}/${MY_PN}.desktop || die "sed failed"
-}
-
-src_install() {
-	local arch=$(usex amd64 "64" "32")
-
-	insinto /usr/share/pixmaps
-	newins opt/${MY_PN^}/linux${arch}/logo.png ${MY_PN}.png
-
-	newicon -s 256 opt/${MY_PN^}/linux${arch}/logo.png ${MY_PN}.png
-	domenu opt/${MY_PN^}/linux${arch}/${MY_PN}.desktop
-
-	insinto /opt/${MY_PN}
-	doins opt/${MY_PN^}/linux${arch}/{Gitter,icudtl.dat,libffmpegsumo.so,nw.pak}
-	insinto /opt/${MY_PN}/locales
-	doins -r opt/${MY_PN^}/linux${arch}/locales/.
-	fperms +x /opt/${MY_PN}/${MY_PN^}
-	dosym /opt/${MY_PN}/${MY_PN^} /usr/bin/${MY_PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-im/gitter-bin/gitter-bin-4.1.0-r1.ebuild b/net-im/gitter-bin/gitter-bin-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..cff11e1e4799
--- /dev/null
+++ b/net-im/gitter-bin/gitter-bin-4.1.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+MY_PN="${PN/-bin/}"
+
+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
+	opt/gitter/pnacl/pnacl_public_x86_64_ld_nexe
+	opt/gitter/pnacl/pnacl_public_x86_64_pnacl_sz_nexe
+	opt/gitter/payload
+	opt/gitter/swiftshader/libEGL.so
+	opt/gitter/swiftshader/libGLESv2.so
+	opt/gitter/chromedriver
+	opt/gitter/lib/libnw.so
+	opt/gitter/lib/libnode.so
+	opt/gitter/lib/libffmpeg.so
+	opt/gitter/nacl_helper
+	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"
+
+DESCRIPTION="Chat and network platform"
+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 )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="bindist mirror"
+
+RDEPEND="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/libX11:0[${MULTILIB_USEDEP}]
+	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
+	x11-libs/libXext:0[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes: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}]"
+BDEPEND="sys-apps/fix-gnustack"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	local arch
+	arch="$(usex amd64 "64" "32")"
+
+	# Modify desktop file to use common paths
+	sed -i \
+		-e '/Exec/s/=.*/=\/usr\/bin\/gitter/' \
+		-e '/Icon/s/=.*/=\/usr\/share\/pixmaps\/gitter.png/' \
+		opt/Gitter/linux"${arch}"/gitter.desktop || die "sed failed"
+}
+
+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
+
+	pax-mark -m "${ED}"/opt/gitter/Gitter
+}