gentoo resync : 22.01.2019

3 files changed, 33 insertions, 28 deletions

diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index 407c3ed9228e..1ff515647e24 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.5.deb 52100102 BLAKE2B d8b28386d83fd63e47f11af06bc9858a3877565785c97588dad0ade197d70a8d3635137a66024a3b82c4c65acc6e806981a2d9e0e5f20b17745d9123a2cf5d4a SHA512 8b2ef353d393644e450452060449c633487ff344f2e9e0711029bbb3012c364211edc30507976ec218f8a573aefd603ea1681b4e37fe9561f39c5eaa5fd6e29a
-EBUILD discord-bin-0.0.5.ebuild 1745 BLAKE2B e02af48f1c374ff8c2f8ef55531c84c147cb3397f0e3759ea54a3f48c3b8d8e2ba60eb45e5d8d35b34a6817da0dbe6a9a33358e5b5410fe0d1ebc70d1e4e551a SHA512 c9b46295b7764d7c15e088ec3e17f09786c49fa70c26156ac70a3bac2c02f58c7f90b74ef251aa994eb861473c738ee272484b63418645fec63b53583f3b34a1
-MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
+DIST discord-0.0.8.deb 44221304 BLAKE2B 3b40f03a3398e1041c0b532df8bc1326df2564a2744d05529db9ba9191bb647eed4ebc28e08cdfa69b98336b2b0619f5898367c3497a704a7bec4309f7f2eb36 SHA512 5d228f0d36306d35ae8d76385a82cbfef32da2ee405292062972c4c2df453f0d329d91127d55ce81e79fa398de9be839b77125fc8a7e9958fa3409c29ee4880a
+EBUILD discord-bin-0.0.8.ebuild 1925 BLAKE2B 3b66146ad2e85747a869b45872c1a7a53d8f36a1332be1d785977d80c34618fa7966fcce327d63fbef7262a4103c1c5bf740e1f101d5fe1bd1686c56fca3a13f SHA512 3aed6ff6fb4a8fd5ac1b90bcf1894cfa2d1236ad9e5b37c0f7d0c662b093be06ccda1bf927532647769891ce0da675b9266197328fbae12d38c804b7376c1d41
+MISC metadata.xml 329 BLAKE2B 0fc0de1eedabe5050594ebb1fa5b5fe97625b52735ee17eb54618284128f8e9fe6e8a9229e2797d6b97c99c00cf72cfd9607824dafbfe91fb6079f3a2661a492 SHA512 32ea11474fb92d83dff6602e27d6b8434cf282635a5bec3e6ddcf2c8863b7f0df76fafe31a2e021c684df20cd5e29a551c06d74ee931f4bc0696061980f9d557
diff --git a/net-im/discord-bin/discord-bin-0.0.5.ebuild b/net-im/discord-bin/discord-bin-0.0.8.ebuild
index aebe7f5fee12..190284c78c90 100644
--- a/net-im/discord-bin/discord-bin-0.0.5.ebuild
+++ b/net-im/discord-bin/discord-bin-0.0.8.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
 MY_PN=${PN/-bin/}
-inherit eutils gnome2-utils unpacker
+MY_BIN="D${MY_PN/d/}"
+
+inherit desktop gnome2-utils pax-utils unpacker xdg-utils
 
 DESCRIPTION="All-in-one voice and text chat for gamers"
 HOMEPAGE="https://discordapp.com"
@@ -13,7 +15,8 @@ SRC_URI="https://dl.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="pax_kernel"
+RESTRICT="mirror bindist"
 
 RDEPEND="
 	dev-libs/atk
@@ -47,46 +50,45 @@ RDEPEND="
 
 S=${WORKDIR}
 
-RESTRICT="mirror bindist"
-
 QA_PREBUILT="
-	opt/discord/share/discord/Discord
-	opt/discord/share/discord/libnode.so
-	opt/discord/share/discord/libffmpeg.so
+	opt/discord/${MY_BIN}
+	opt/discord/libEGL.so
+	opt/discord/libGLESv2.so
+	opt/discord/swiftshader/libEGL.so
+	opt/discord/swiftshader/libGLESv2.so
+	opt/discord/libVkICD_mock_icd.so
+	opt/discord/libnode.so
+	opt/discord/libffmpeg.so
 "
 
-src_unpack() {
-	unpack_deb ${A}
-}
-
 src_prepare() {
 	default
 
 	sed -i \
-		-e "s:/usr/share/discord/Discord:discord:g" \
+		-e "s:/usr/share/discord/Discord:/opt/${MY_PN}/${MY_BIN}:g" \
 		usr/share/${MY_PN}/${MY_PN}.desktop || die
 }
 
 src_install() {
-	insinto /opt/${MY_PN}
-	doins -r usr/.
+	doicon usr/share/${MY_PN}/${MY_PN}.png
+	domenu usr/share/${MY_PN}/${MY_PN}.desktop
 
-	fperms +x /opt/${MY_PN}/bin/${MY_PN}
-	dosym ../../opt/${MY_PN}/bin/${MY_PN} /usr/bin/${MY_PN}
-	dosym ../../../opt/${MY_PN}/share/applications/${MY_PN}.desktop \
-		/usr/share/applications/${MY_PN}.desktop
-	dosym ../../../opt/${MY_PN}/share/pixmaps/${MY_PN}.png \
-		/usr/share/pixmaps/${MY_PN}.png
-}
+	insinto /opt/${MY_PN}
+	doins -r usr/share/${MY_PN}/.
+	fperms +x /opt/${MY_PN}/${MY_BIN}
+	dosym ../../opt/${MY_PN}/${MY_BIN} usr/bin/${MY_PN}
 
-pkg_preinst() {
-	gnome2_icon_savelist
+	use pax_kernel && pax-mark -m "${ED%/}"/opt/${MY_PN}/${MY_PN}
 }
 
 pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/net-im/discord-bin/metadata.xml b/net-im/discord-bin/metadata.xml
index 15fd2f3a22be..6fc119fa9d04 100644
--- a/net-im/discord-bin/metadata.xml
+++ b/net-im/discord-bin/metadata.xml
@@ -5,4 +5,7 @@
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
+	<use>
+		<flag name="pax_kernel">Triggers a paxmarking of the binary</flag>
+	</use>
 </pkgmetadata>