From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- net-im/discord-bin/Manifest | 5 +- net-im/discord-bin/discord-bin-0.0.9-r1.ebuild | 13 ++-- net-im/discord-bin/discord-bin-0.0.9.ebuild | 94 -------------------------- net-im/discord-bin/metadata.xml | 3 - 4 files changed, 8 insertions(+), 107 deletions(-) delete mode 100644 net-im/discord-bin/discord-bin-0.0.9.ebuild (limited to 'net-im/discord-bin') diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest index c4e2e003c923..c8f1a6ac5343 100644 --- a/net-im/discord-bin/Manifest +++ b/net-im/discord-bin/Manifest @@ -1,4 +1,3 @@ DIST discord-0.0.9.deb 44445792 BLAKE2B 0e2904282a6486f9d0aed8498dfa38233196d3e3c9b14d6064eefe770c061fd48c70f048972f58c911e5711b171e0a0702a2657ae6f6ee0c69f415ea7f641eb7 SHA512 3c9465566a340b9f6afcb47a3d2deec4b560c78d44e807742c660ab2d834ddf1d7b66958ae6ac1438ace21ccbcb81b11f9c72efb0ded2cbfce6b6e5631375b4a -EBUILD discord-bin-0.0.9-r1.ebuild 1898 BLAKE2B de27dabbd5f519dd9529b0147aeb75196fd045a85dc24005f88a7180713fca124d57f1aac6e717a1a1fb8edc5ce21adc1a80ce5d28334c0bc2cdcf879c5b4ed4 SHA512 3876255e3b6040b925294d41cb73bfb44d7ca4d0769c77b81cd9d444244f452620204cd2e9565f3f1e03fa5c64e7803bcb2a8b4485e85057a26acbe089bd2ea3 -EBUILD discord-bin-0.0.9.ebuild 1918 BLAKE2B 69062455533c7b54680f7dc715b9b3da2aeab967a37e04a85f832cfd74a3348c54d7587086544afd03b8db50e968c0909c9dbc957e7d692c9222118bf28cbbd7 SHA512 a56a743331ac9f01a49023a43669b2d1755d930b27a7025c7629c880d58adc8f69f686be0281cf4f625628b5205ee8593b6ca6999cf93f4cc3df5055881b2d1d -MISC metadata.xml 329 BLAKE2B 0fc0de1eedabe5050594ebb1fa5b5fe97625b52735ee17eb54618284128f8e9fe6e8a9229e2797d6b97c99c00cf72cfd9607824dafbfe91fb6079f3a2661a492 SHA512 32ea11474fb92d83dff6602e27d6b8434cf282635a5bec3e6ddcf2c8863b7f0df76fafe31a2e021c684df20cd5e29a551c06d74ee931f4bc0696061980f9d557 +EBUILD discord-bin-0.0.9-r1.ebuild 1839 BLAKE2B 56ccc90249e0bb27d14b13f9a09ea059859223b0b0f43f7d9a1d0f1690b57ebe4b07279240f8ce1cba92a4d8e029418ee4393c5d5c44c69441dd46e1d44c8c3a SHA512 7fab8a5ab00d511c4ab8322de40ada6957b0d6228decdd29ca8395f6fdd5957ffc4d0cc2e0d6cb1d9a4f3e9b9c134caab17fcbc6900fd1470bc28a737faf1f50 +MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4 diff --git a/net-im/discord-bin/discord-bin-0.0.9-r1.ebuild b/net-im/discord-bin/discord-bin-0.0.9-r1.ebuild index b7ee3f914d41..8299f57aaacf 100644 --- a/net-im/discord-bin/discord-bin-0.0.9-r1.ebuild +++ b/net-im/discord-bin/discord-bin-0.0.9-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 MY_PN=${PN/-bin/} MY_BIN="D${MY_PN/d/}" -inherit desktop gnome2-utils pax-utils unpacker xdg-utils +inherit desktop pax-utils unpacker xdg-utils DESCRIPTION="All-in-one voice and text chat for gamers" HOMEPAGE="https://discordapp.com" @@ -15,7 +15,6 @@ SRC_URI="https://dl.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb" LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="~amd64" -IUSE="pax_kernel" RESTRICT="mirror bindist" RDEPEND=" @@ -77,17 +76,17 @@ src_install() { fperms +x /opt/${MY_PN}/${MY_BIN} dosym ../../opt/${MY_PN}/${MY_BIN} usr/bin/${MY_PN} - use pax_kernel && pax-mark -m "${ED%/}"/opt/${MY_PN}/${MY_PN} + pax-mark -m "${ED}"/opt/${MY_PN}/${MY_PN} } pkg_postinst() { xdg_desktop_database_update xdg_mimeinfo_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { xdg_desktop_database_update xdg_mimeinfo_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } diff --git a/net-im/discord-bin/discord-bin-0.0.9.ebuild b/net-im/discord-bin/discord-bin-0.0.9.ebuild deleted file mode 100644 index 99ca345176a1..000000000000 --- a/net-im/discord-bin/discord-bin-0.0.9.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MY_PN=${PN/-bin/} -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" -SRC_URI="https://dl.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="~amd64" -IUSE="pax_kernel" -RESTRICT="mirror bindist" - -RDEPEND=" - dev-libs/atk - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - gnome-base/gconf:2 - media-libs/alsa-lib - media-libs/fontconfig:1.0 - media-libs/freetype:2 - net-print/cups - sys-apps/dbus - sys-libs/libcxx - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango -" - -S=${WORKDIR} - -QA_PREBUILT=" - 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/libffmpeg.so -" - -src_prepare() { - default - - sed -i \ - -e "s:/usr/share/discord/Discord:/opt/${MY_PN}/${MY_BIN}:g" \ - usr/share/${MY_PN}/${MY_PN}.desktop || die -} - -src_install() { - doicon usr/share/${MY_PN}/${MY_PN}.png - domenu usr/share/${MY_PN}/${MY_PN}.desktop - - 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} - - 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 6fc119fa9d04..15fd2f3a22be 100644 --- a/net-im/discord-bin/metadata.xml +++ b/net-im/discord-bin/metadata.xml @@ -5,7 +5,4 @@ johu@gentoo.org Johannes Huber - - Triggers a paxmarking of the binary - -- cgit v1.2.3