From 50e7f35640a5b6a963e509954c68d74f7376529c Mon Sep 17 00:00:00 2001 From: scardracs Date: Tue, 23 Mar 2021 16:12:37 +0100 Subject: [PATCH 1/4] app-editors/atom: fixed removed licenses/unused files Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Marco Scardovi --- app-editors/atom/atom-1.55.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-editors/atom/atom-1.55.0.ebuild b/app-editors/atom/atom-1.55.0.ebuild index 4bbaeb60f4..77036d433e 100644 --- a/app-editors/atom/atom-1.55.0.ebuild +++ b/app-editors/atom/atom-1.55.0.ebuild @@ -22,7 +22,7 @@ src_prepare(){ default # Remove useless license files. - rm LICENSE.electron.txt LICENSES.electron.html + rm LICENSE LICENSES.chromium.html version } src_install(){ From 13fb9bbf96bb12441d89fefb08979871d17b10af Mon Sep 17 00:00:00 2001 From: Andrea Postiglione Date: Tue, 23 Mar 2021 21:05:00 +0100 Subject: [PATCH 2/4] sys-cluster/pcs-0.10.8-r1: fix systemd service Signed-off-by: Andrea Postiglione --- sys-cluster/pcs/files/pcsd-daemon.service.patch | 17 +++++++++++++++++ sys-cluster/pcs/pcs-0.10.8-r1.ebuild | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 sys-cluster/pcs/files/pcsd-daemon.service.patch diff --git a/sys-cluster/pcs/files/pcsd-daemon.service.patch b/sys-cluster/pcs/files/pcsd-daemon.service.patch new file mode 100644 index 0000000000..00b61cf9ab --- /dev/null +++ b/sys-cluster/pcs/files/pcsd-daemon.service.patch @@ -0,0 +1,17 @@ +--- pcs-0.10.8/pcsd/pcsd-ruby.service 2021-02-01 10:22:26.000000000 +0100 ++++ pcs-0.10.8/pcsd/pcsd-ruby.service.new 2021-03-23 20:13:24.380792446 +0100 +@@ -6,12 +6,11 @@ + After=network-online.target + # Stop the service automatically if nothing that depends on it is running + StopWhenUnneeded=true +-# When stopping or restarting pcsd, stop or restart pcsd-ruby as well ++# When stopping or restarting pcsd, stop or restart pcsd-daemon as well + PartOf=pcsd.service + + [Service] +-EnvironmentFile=/etc/sysconfig/pcsd +-Environment=GEM_HOME=/usr/lib/pcsd/vendor/bundle/ruby ++EnvironmentFile=/etc/default/pcsd + # This file holds the selinux context + ExecStart=/usr/lib/pcsd/pcsd + Type=notify diff --git a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild index a6acdb4754..1af214e5f5 100644 --- a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild +++ b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild @@ -61,7 +61,9 @@ ruby_add_rdepend " www-servers/thin " -PATCHES=( "${FILESDIR}/remove-ruby-bundle-path.patch" "${FILESDIR}/openrc-${PV}.patch" ) +PATCHES=( "${FILESDIR}/remove-ruby-bundle-path.patch" + "${FILESDIR}/openrc-${PV}.patch" + "${FILESDIR}/pcsd-daemon.service.patch" ) S="${WORKDIR}/all/${P}" From ba3a93397818f16cbfac6ad5d10980f8b59ce0c6 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 24 Mar 2021 10:03:11 +0100 Subject: [PATCH 3/4] net-im/discord-canary-bin: sync with net-im/discord::gentoo fixes the desktop file Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan --- net-im/discord-canary-bin/Manifest | 2 +- .../discord-canary-bin-0.0.119-r1.ebuild | 89 +++++++++++++++++++ .../discord-canary-bin-0.0.119.ebuild | 89 ------------------- 3 files changed, 90 insertions(+), 90 deletions(-) create mode 100644 net-im/discord-canary-bin/discord-canary-bin-0.0.119-r1.ebuild delete mode 100644 net-im/discord-canary-bin/discord-canary-bin-0.0.119.ebuild diff --git a/net-im/discord-canary-bin/Manifest b/net-im/discord-canary-bin/Manifest index 52f5b1938f..d127675ddb 100644 --- a/net-im/discord-canary-bin/Manifest +++ b/net-im/discord-canary-bin/Manifest @@ -1 +1 @@ -DIST discord-canary-0.0.119.tar.gz 71822214 BLAKE2B 9c98f263f540bdb720597daa9ab7a77de4cdbeea45dfc47bb8bf14f8e7b4a69d2c366140efffeb6cfc951e9ee02f10e63007dfbc93eb58c3e8e45ff23ca261b7 SHA512 6f6d7175ecd6f2992caa8b29c28d1533fb15aa9b201fec9c5822500104f161c55cbbe3e698af8ab98a4bd152c96759f5d18583c5db472c777666a9c4eb72de83 +DIST discord-canary-0.0.119.deb 71512470 BLAKE2B a5c89940427b7d4fe228e1929cbe5d1e9f4bf47818b7e4f70fbdd772359c0db81bbfaa7b7b228a975bf73119084674cd03a902d668f189b995e94c2d97c39c8c SHA512 d19fe621ee13aecb19eacb4bda87d4e2e4342399173d1c1a4e9f9864fb8670f05254a966dc7f2f968b4dc7031e30f696d45c21affc83e7de8d96ca501da4482e diff --git a/net-im/discord-canary-bin/discord-canary-bin-0.0.119-r1.ebuild b/net-im/discord-canary-bin/discord-canary-bin-0.0.119-r1.ebuild new file mode 100644 index 0000000000..8f9b073480 --- /dev/null +++ b/net-im/discord-canary-bin/discord-canary-bin-0.0.119-r1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=${PN/-bin/} +MY_BIN="D${MY_PN/d/}" +MY_BIN="${MY_BIN/-canary/}Canary" + +inherit desktop linux-info pax-utils unpacker xdg + +DESCRIPTION="All-in-one voice and text chat" +HOMEPAGE="https://discordapp.com/" +SRC_URI="https://dl-canary.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb" + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="mirror bindist" + +RDEPEND=" + app-accessibility/at-spi2-atk:2 + app-accessibility/at-spi2-core:2 + dev-libs/atk + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/fontconfig:1.0 + media-libs/freetype:2 + net-print/cups + sys-apps/dbus + sys-apps/util-linux + 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-canary/${MY_BIN} + opt/discord-canary/chrome-sandbox + opt/discord-canary/libffmpeg.so + opt/discord-canary/libvk_swiftshader.so + opt/discord-canary/libvulkan.so + opt/discord-canary/libEGL.so + opt/discord-canary/libGLESv2.so + opt/discord-canary/libVkICD_mock_icd.so + opt/discord-canary/swiftshader/libEGL.so + opt/discord-canary/swiftshader/libGLESv2.so + opt/discord-canary/swiftshader/libvk_swiftshader.so +" + +CONFIG_CHECK="~USER_NS" + +src_prepare() { + default + + sed -i \ + -e "s:/usr/share/${MY_PN}/${MY_BIN}:/opt/${MY_PN}/${MY_BIN}:g" \ + usr/share/${MY_PN}/${MY_PN}.desktop || die +} + +src_install() { + newicon usr/share/${MY_PN}/${MY_PN//-canary}.png ${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} + + pax-mark -m "${ED}"/opt/${MY_PN}/${MY_PN} +} diff --git a/net-im/discord-canary-bin/discord-canary-bin-0.0.119.ebuild b/net-im/discord-canary-bin/discord-canary-bin-0.0.119.ebuild deleted file mode 100644 index 618be3f523..0000000000 --- a/net-im/discord-canary-bin/discord-canary-bin-0.0.119.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop eutils xdg - -DESCRIPTION="All-in-one voice and text chat" -HOMEPAGE="https://discordapp.com/" -SRC_URI="https://dl-canary.discordapp.net/apps/linux/${PV}/discord-canary-${PV}.tar.gz" - -SLOT="0" -LICENSE="all-rights-reserved" -KEYWORDS="~amd64" - -RESTRICT="mirror bindist" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-libs/atk - sys-libs/libcxx - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - gnome-base/gconf:2 - media-gfx/graphite2 - media-libs/alsa-lib - media-libs/fontconfig:1.0 - media-libs/libpng - media-libs/freetype:2 - net-print/cups - sys-apps/dbus - net-libs/gnutls - sys-libs/libcxx - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - sys-libs/zlib - x11-libs/gtk+:3 - x11-libs/libnotify - 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 - - x11-libs/libXtst - media-libs/opus" - -S=${WORKDIR}/DiscordCanary - -QA_PREBUILT=" - opt/discord-canary-bin/DiscordCanary - opt/discord-canary-bin/libEGL.so - opt/discord-canary-bin/libGLESv2.so - opt/discord-canary-bin/swiftshader/libEGL.so - opt/discord-canary-bin/swiftshader/libGLESv2.so - opt/discord-canary-bin/libVkICD_mock_icd.so - opt/discord-canary-bin/libffmpeg.so -" - -src_install() { - local destdir="/opt/${PN}" - - insinto $destdir - doins -r locales resources - doins \ - *.pak \ - *.png \ - *.dat \ - *.bin \ - *.so - - exeinto $destdir - doexe DiscordCanary - - dosym $destdir/DiscordCanary /usr/bin/discord-canary - make_desktop_entry discord Discord \ - "/opt/discord-canary/discord.png" \ - Network -} From d4bffb06707d70a6a532009231269d3675d71675 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 24 Mar 2021 10:04:57 +0100 Subject: [PATCH 4/4] sys-cluster/pcs: remove trailing whitespace Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan --- sys-cluster/pcs/pcs-0.10.8-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild index 1af214e5f5..fcfa0b7b8b 100644 --- a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild +++ b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild @@ -61,8 +61,8 @@ ruby_add_rdepend " www-servers/thin " -PATCHES=( "${FILESDIR}/remove-ruby-bundle-path.patch" - "${FILESDIR}/openrc-${PV}.patch" +PATCHES=( "${FILESDIR}/remove-ruby-bundle-path.patch" + "${FILESDIR}/openrc-${PV}.patch" "${FILESDIR}/pcsd-daemon.service.patch" ) S="${WORKDIR}/all/${P}"