mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-18 03:23:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2021-03-24 09:20:34 +00:00
parent 052cc2d7d4 d4bffb0670
commit 6c9386261b
6 changed files with 111 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app-editors/atom/atom-1.55.0.ebuild
View File

@@ -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(){

2
net-im/discord-canary-bin/Manifest
View File

@@ -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

89
net-im/discord-canary-bin/discord-canary-bin-0.0.119-r1.ebuild Normal file
View File

@@ -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}
}

89
net-im/discord-canary-bin/discord-canary-bin-0.0.119.ebuild
View File

@@ -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
}

17
sys-cluster/pcs/files/pcsd-daemon.service.patch Normal file
View File

@@ -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

4
sys-cluster/pcs/pcs-0.10.8-r1.ebuild
View File

@@ -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}"