gentoo Easter resync : 12.04.2020

5 files changed, 19 insertions, 143 deletions

diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index f603439885d1..fbb806391cd6 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,7 +1,5 @@
-DIST skypeforlinux_8.55.0.123-1.x86_64.rpm 107310130 BLAKE2B ec97aeed0159eb91e1e5fa1acf7a9af28e29825e5ec4a422f25115e1daee7e8ad8b5bde11ad65c6b03bd2aecc192f0dfc14fd296ea3a35f077bc4f9e7864c0af SHA512 0bd0ac489f5d1790194146da9299e1e54be289325c0a15f85dfdb4a1a6c8c9a1a21ee36b09603615903d50ac1c389c6d182aa2f3344181503a2e80c2bb76e64c
-DIST skypeforlinux_8.55.0.141-1.x86_64.rpm 107313285 BLAKE2B 31c77745a410805a9e39e8ce708edf6735e1676d2c99451dab8faf012d32ecd5082e848ee24b2e1687f4b3a85422261f98f56c569fc48bb3e68e7853ffa16f6e SHA512 db5244abf4c00c7b05cdc54471e4fd235f9743d1f4493b886b021ebad064522a9157483e29c5bcfc6bf5b84905da4969f3997e9a8785fbcc3bca1bd1f1a0544e
-DIST skypeforlinux_8.56.0.103-1.x86_64.rpm 107196663 BLAKE2B 987d35fe670e0902db0d43bea1071f24e893613ec80db3fd2d41c1080f3ea1178a449687fe85384dad93955990afadf7144af31aec0f188e7da5d0ff85c51aca SHA512 2760cdcc0afbf626b603d6716fba201b726f58d5be4e17a90fff271769c99c5a9802b27d7c88d4307ddbd5844c0d705c5dd6ecb9834b7b754f2c5d987d6cbed0
-EBUILD skypeforlinux-8.55.0.123.ebuild 3385 BLAKE2B 937e32bac771265bbb705468f1a04bcd14b71eba9e51d8e517a91b7d512d3364aac17d05d38fc7a579313e6504467ffa3ef73526c6096189008c8346911dfc9e SHA512 2608b6eb1b8c3034f447dda811c9d9e8fc3a5ab6c4845065f8c95821f06ceb384fa41f68d2250eb3718341d823e0861158077d350a6b98ec83cb85d535ec6cb5
-EBUILD skypeforlinux-8.55.0.141.ebuild 3314 BLAKE2B c88fc1967bf929224e43665aef84eb786f938a51047c5e4fe554afd1daf7056705be84aa449ef881d2ce41b07892cf291607229e4698d51e2c5c968cad71f4b7 SHA512 1d4322b7833cd23737a54f7d9ef58a6cd745505929275b35b6b2089eeb064692e896e2ec253c545e0e7f3c5d3b000b4322aecac477857d59697d68a7b2f916d3
-EBUILD skypeforlinux-8.56.0.103-r2.ebuild 3314 BLAKE2B 05d310eecd9d4cab8f7cf724b8b8ecbbcd1844b39fbfe3fd6d2f48175bad402aa43b14c126528f2417cffd37210376b9b6a7acb67644f30698443a3fa63a1b8f SHA512 2751fc49a06bef341bc178becafa8ee70d9892a5115572f807e0eba8bc56a18bad14699cda8a11a20e0e5cba36c77dc794395583d3a710531d5274c7fa8efd07
-MISC metadata.xml 786 BLAKE2B 3041105c7b5f90dc5f058e92a8542550b1c07fe954a68c0fdad069b309f41a75d1885ef14d62b3bb8defa7b69a4478a3ec37abb09a16153614d498d82877958c SHA512 2332db6f8ec755f6b12c4bef3b7e5819438a38835ad764bbf3466f1560905024f2632fc7035904028fbddc6c368930fcea81bb10f29dec1b9725b658d81208ca
+DIST skypeforlinux_8.57.0.116-1.x86_64.rpm 107397354 BLAKE2B 22d1b41201087b3067e89e583734f0b195103dff52f2023e5cc812a977338f2af7eafe5e82bd3f34e263740a1c2791035ee6b75dc077865fa14f1dcc1189b9a6 SHA512 79b5019be9c4cdb28c3dd166aa76128385631e1bc4e31f0b0bfdb0c7af54494987faf4ab3ed05dc9f810b05e07de916d997d5fe4c722aff089e00789394ef3d3
+DIST skypeforlinux_8.58.0.93-1.x86_64.rpm 108966411 BLAKE2B b74dfe1758fbec9e000be7134d1b575a28077967c95b18955c6b90ac9b3bba1b69b19f91553185939f0e39a1ff80fa26020a383a42940c729d6256df01cf74cc SHA512 907159ac1fead3248114a9bf67a764df9f3ec7deb1b9008b6228d55deacbc6ee150e8496674a484c5be14a59ab33c163493b704c364c822177827fcacfba0452
+EBUILD skypeforlinux-8.57.0.116-r1.ebuild 3116 BLAKE2B b58a55dde3626b2bdb8b72a808e169cf784076fd4c2efa3e7ef5b2c856d117993eb3d045479c2b2a94602fb265c4391f883865b673a2c2a8423a07583121e7ea SHA512 e0c45e1ba64707ded404af3b4dbca7cec82033efbe31c39ea08f5a088b1e9bb713023a4e603bc2ef04b12ae6a70d1d67946c9a742cc2ee97522b337ad8769d62
+EBUILD skypeforlinux-8.58.0.93.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
+MISC metadata.xml 583 BLAKE2B 32b774591defdc54f366bca4b0479c4a7589bbfe97b2dc2c1f625a307abcfc26a3818913dd321a6de743ce6a854130478096665b4c924e29510095f742069f39 SHA512 64d055c9d084447e4c3dd25a2ed5954175b7e0f6df19f948d0b604cd450be8f569c763810c8687d91ed050d101330cc488fa61c8930f74dfc03c228e434ff673
diff --git a/net-im/skypeforlinux/metadata.xml b/net-im/skypeforlinux/metadata.xml
index 376761200504..1f095d189f8a 100644
--- a/net-im/skypeforlinux/metadata.xml
+++ b/net-im/skypeforlinux/metadata.xml
@@ -5,16 +5,9 @@
 		<email>onigino@protonmail.com</email>
 		<name>Gino McCarty</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>jano.vesely@gmail.com</email>
-		<name>Jan Vesely</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="pax_kernel">Triggers a paxmarking of the main skype binary</flag>
-	</use>
 	<longdescription>Skype is for doing things together, whenever you're apart. Skype's text, voice and video make it simple to share experiences with the people that matter to you, wherever they are.</longdescription>
 </pkgmetadata>
diff --git a/net-im/skypeforlinux/skypeforlinux-8.55.0.123.ebuild b/net-im/skypeforlinux/skypeforlinux-8.55.0.123.ebuild
deleted file mode 100644
index fc1efd19f67b..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.55.0.123.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit chromium-2 desktop pax-utils rpm multilib-build xdg
-
-DESCRIPTION="Instant messaging client, with support for audio and video"
-HOMEPAGE="https://www.skype.com/"
-SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
-
-LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="pax_kernel"
-
-S="${WORKDIR}"
-QA_PREBUILT="*"
-RESTRICT="mirror bindist strip" #299368
-
-RDEPEND="
-	|| (
-		sys-auth/elogind
-		sys-apps/systemd
-		net-im/skype-dbus-mock
-	)
-	app-crypt/libsecret[${MULTILIB_USEDEP}]
-	dev-libs/atk[${MULTILIB_USEDEP}]
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr[${MULTILIB_USEDEP}]
-	dev-libs/nss[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	media-libs/libv4l[${MULTILIB_USEDEP}]
-	net-print/cups[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-devel/gcc[cxx]
-	virtual/ttf-fonts
-	x11-libs/cairo[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXi[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]"
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	rpm_src_unpack ${A}
-}
-
-src_prepare() {
-	default
-	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
-		-i usr/bin/skypeforlinux || die
-	sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
-		-e "/^OnlyShowIn=/d" \
-		-i usr/share/applications/skypeforlinux.desktop || die
-}
-
-src_install() {
-	dodir /opt
-	cp -a usr/share/skypeforlinux "${D}"/opt || die
-
-	dobin usr/bin/skypeforlinux
-
-	dodoc usr/share/skypeforlinux/*.html
-	dodoc -r usr/share/doc/skypeforlinux/.
-	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
-	dosym ${PF} usr/share/doc/skypeforlinux
-
-	doicon usr/share/pixmaps/skypeforlinux.png
-
-	local res
-	for res in 16 32 256 512; do
-		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
-	done
-
-	domenu usr/share/applications/skypeforlinux.desktop
-
-	if use pax_kernel; then
-		pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
-		pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		ewarn "You have set USE=pax_kernel meaning that you intend to run"
-		ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		ewarn "you suspect that ${PN} is being broken by this modification,"
-		ewarn "please open a bug."
-	fi
-}
diff --git a/net-im/skypeforlinux/skypeforlinux-8.56.0.103-r2.ebuild b/net-im/skypeforlinux/skypeforlinux-8.57.0.116-r1.ebuild
index 941d1e6c04d5..6b1d41e5d34b 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.56.0.103-r2.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.57.0.116-r1.ebuild
@@ -14,7 +14,6 @@ SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
 LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="pax_kernel"
 
 S="${WORKDIR}"
 QA_PREBUILT="*"
@@ -74,6 +73,10 @@ src_install() {
 	dodir /opt
 	cp -a usr/share/skypeforlinux "${D}"/opt || die
 
+	# remove chrome-sandbox binary, users should use kernel namespaces
+	# https://bugs.gentoo.org/692692#c18
+	rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
+
 	dobin usr/bin/skypeforlinux
 
 	dodoc usr/share/skypeforlinux/*.html
@@ -90,13 +93,6 @@ src_install() {
 
 	domenu usr/share/applications/skypeforlinux.desktop
 
-	if use pax_kernel; then
-		pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
-		pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		ewarn "You have set USE=pax_kernel meaning that you intend to run"
-		ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		ewarn "you suspect that ${PN} is being broken by this modification,"
-		ewarn "please open a bug."
-	fi
+	pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
+	pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
 }
diff --git a/net-im/skypeforlinux/skypeforlinux-8.55.0.141.ebuild b/net-im/skypeforlinux/skypeforlinux-8.58.0.93.ebuild
index ef0860964454..c2755ee5b06c 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.55.0.141.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.58.0.93.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,6 @@ SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
 LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="pax_kernel"
 
 S="${WORKDIR}"
 QA_PREBUILT="*"
@@ -72,7 +71,11 @@ src_prepare() {
 
 src_install() {
 	dodir /opt
-	cp -a usr/share/skypeforlinux "${D}"/opt || die
+	cp -a usr/share/skypeforlinux "${ED}"/opt || die
+
+	# remove chrome-sandbox binary, users should use kernel namespaces
+	# https://bugs.gentoo.org/692692#c18
+	rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
 
 	dobin usr/bin/skypeforlinux
 
@@ -90,13 +93,6 @@ src_install() {
 
 	domenu usr/share/applications/skypeforlinux.desktop
 
-	if use pax_kernel; then
-		pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
-		pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		ewarn "You have set USE=pax_kernel meaning that you intend to run"
-		ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		ewarn "you suspect that ${PN} is being broken by this modification,"
-		ewarn "please open a bug."
-	fi
+	pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
+	pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
 }