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

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2021-04-21 07:49:59 +00:00
parent b9a1fc3128 bb649a6596
commit fcff32d48d
28 changed files with 255 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev-libs/mtxclient/Manifest
View File

@@ -1,2 +1,3 @@
DIST mtxclient-0.4.1.tar.gz 572552 BLAKE2B 4d0facaffb0ce1fadc1011b7d557774bcd9ffcef7349894255b9522bcc4e9228739ad8da5a60b0addf6835cf5de3613bebc19842b6922ab9cf94f88c944d0091 SHA512 246c84bc8bc7dd6fd688c79601d16e931b5aaf5fe967d6ea226f1961df2b74ad70d4e790b7400051e007506f58ecd6594ccead31bd3c6308aa2c6727b122c203
DIST mtxclient-0.5.0.tar.gz 582236 BLAKE2B 5166c32127973e886adadb6ad8a2895ba5ac77f78e9a774f039b0c8d4329078c0b8de965b477ce1c3a7e4cd929de8ba9b8d4f8d8b0452f6c49c873285a4d8b3a SHA512 6e1e9f5ecb1e6911b5bee85569e4477f6ee4c86ef479a3f408c8bbd187750b3b78db1db0337b51e1df9b90fee3b486eaf909bb79b69a97919685074eee3a82cd
DIST mtxclient-0.5.1.tar.gz 582367 BLAKE2B d30a5e0e16d6783d8d1175e5f4144d845fe62897dcc7952cb1598470befa1da47a2b06cd70a60f511a1c2e7656eca2cf5a87734cbc61b79d2a05df295fd256e0 SHA512 f0a5e823bd7f3cccdf5f919c04c36a1a5ab4d2627a6f8f3fac78e4b300eda3b9e1f5060fb31e6e47267bbafc3a03f6c2a2d16c2323e63ce4889f551860e7703f

44
dev-libs/mtxclient/mtxclient-0.4.1.ebuild Normal file
View File

@@ -0,0 +1,44 @@
# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
DESCRIPTION="Client API library for Matrix, built on top of Boost.Asio"
HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient"
SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
>=dev-libs/boost-1.70.0
dev-libs/olm
>=dev-libs/openssl-1.1.0
dev-cpp/nlohmann_json
"
DEPEND="
${RDEPEND}
dev-libs/spdlog
test? ( dev-cpp/gtest )
"
# remove_failing_tests depends on remove_network_tests.
PATCHES=(
"${FILESDIR}/0.3.0_remove_network_tests.patch"
"${FILESDIR}/0.3.0_remove_failing_tests.patch"
)
src_configure() {
local -a mycmakeargs=(
-DBUILD_LIB_TESTS="$(usex test)"
-DBUILD_LIB_EXAMPLES=OFF
)
cmake_src_configure
}

2
mail-client/mailspring-bin/mailspring-bin-1.8.0.ebuild
View File

@@ -30,7 +30,7 @@ RDEPEND="
net-dns/c-ares
net-print/cups
sys-devel/libtool
sys-libs/db
sys-libs/db:5.3
virtual/udev
=x11-libs/gtk+-3*
x11-libs/libnotify

2
mail-client/mailspring-bin/mailspring-bin-1.9.0.ebuild
View File

@@ -30,7 +30,7 @@ RDEPEND="
net-dns/c-ares
net-print/cups
sys-devel/libtool
sys-libs/db
sys-libs/db:5.3
virtual/udev
=x11-libs/gtk+-3*
x11-libs/libnotify

2
mail-client/mailspring-bin/mailspring-bin-1.9.1.ebuild
View File

@@ -30,7 +30,7 @@ RDEPEND="
net-dns/c-ares
net-print/cups
sys-devel/libtool
sys-libs/db
sys-libs/db:5.3
virtual/udev
=x11-libs/gtk+-3*
x11-libs/libnotify

2
net-im/nheko/nheko-0.8.0.ebuild
View File

@@ -21,7 +21,7 @@ RDEPEND="
dev-qt/qtsvg:5
dev-qt/qtconcurrent:5
app-text/cmark
>=dev-libs/mtxclient-0.4.0
<dev-libs/mtxclient-0.5.0
dev-cpp/nlohmann_json
dev-libs/qtkeychain
"

2
net-im/nheko/nheko-0.8.1.ebuild
View File

@@ -21,7 +21,7 @@ RDEPEND="
dev-qt/qtsvg:5
dev-qt/qtconcurrent:5
app-text/cmark
>=dev-libs/mtxclient-0.4.1
<dev-libs/mtxclient-0.5.0
dev-cpp/nlohmann_json
dev-libs/qtkeychain
"

2
net-im/ruqola/ruqola-1.3.1.ebuild
View File

@@ -22,7 +22,7 @@ IUSE="speech telemetry"
DEPEND="
dev-libs/qtkeychain
>=dev-qt/qtmultimedia-${QTMIN}:5
>=dev-qt/qtmultimedia-${QTMIN}:5[widgets]
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtnetworkauth-${QTMIN}:5
>=dev-qt/qtwebsockets-${QTMIN}:5

1
net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild
View File

@@ -83,6 +83,7 @@ QA_PRESTRIPPED="
BDEPEND="
virtual/pkgconfig
dev-qt/linguist-tools
test? ( dev-qt/qttest )
"

4
sci-libs/kissfft/kissfft-131.ebuild
View File

@@ -21,8 +21,8 @@ else
KEYWORDS="~amd64 ~x86"
fi
DEPEND=""
RDEPEND=""
DEPEND="sci-libs/fftw:3.0"
RDEPEND="${DEPEND}"
src_install() {
dolib.so libkissfft.so

4
sci-libs/kissfft/kissfft-9999.ebuild
View File

@@ -21,8 +21,8 @@ else
KEYWORDS="~amd64 ~x86"
fi
DEPEND=""
RDEPEND=""
DEPEND="sci-libs/fftw:3.0"
RDEPEND="${DEPEND}"
src_install() {
dolib.so libkissfft.so

4
sys-cluster/AXL/files/no-install-readme.patch
View File

@@ -1,5 +1,5 @@
--- a/CMakeLists.txt 2021-04-15 02:41:40.120725634 +0200
+++ b/CMakeLists.txt 2021-04-15 02:42:14.146330416 +0200
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,9 +125,6 @@
SET_SOURCE_FILES_PROPERTIES(config.h.in PROPERTIES GENERATED FALSE)
SET_SOURCE_FILES_PROPERTIES(${PROJECT_BINARY_DIR}/config.h PROPERTIES GENERATED TRUE)

4
sys-cluster/AXL/files/no-static-0.4.0.patch
View File

@@ -1,5 +1,5 @@
--- a/src/CMakeLists.txt 2021-04-15 02:42:47.537923628 +0200
+++ b/src/CMakeLists.txt 2021-04-15 02:43:07.157272036 +0200
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,13 +29,3 @@
TARGET_LINK_LIBRARIES(axl ${AXL_EXTERNAL_LIBS})
SET_TARGET_PROPERTIES(axl PROPERTIES OUTPUT_NAME axl CLEAN_DIRECT_OUTPUT 1)

7
sys-cluster/dlb/files/dlb-2.1-pygen-python3.patch
View File

@@ -10,8 +10,6 @@ Subject: [PATCH] Run pygen script with either python2 or python3
3 files changed, 174 insertions(+), 1 deletion(-)
create mode 100755 scripts/pygen.py3
diff --git a/Makefile.am b/Makefile.am
index 7d575e7..b274011 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,7 +83,11 @@ nodist_include_HEADERS = src/LB_MPI/MPI_interface.h \
@@ -35,8 +33,6 @@ index 7d575e7..b274011 100644
scripts/viewer/dlb_cpu_usage.in \
scripts/viewer/dlb_viewer.py.in \
$(DEBIAN_EXTRA) \
diff --git a/configure.ac b/configure.ac
index 2200d23..8a587b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,6 +235,8 @@ AC_SUBST([INSTR_DEBUG_CPPFLAGS])
@@ -48,9 +44,6 @@ index 2200d23..8a587b9 100644
# check for OpenMP availability
AC_OPENMP
diff --git a/scripts/pygen.py3 b/scripts/pygen.py3
new file mode 100755
index 0000000..9748d96
--- /dev/null
+++ b/scripts/pygen.py3
@@ -0,0 +1,166 @@

4
sys-cluster/er/files/no-static-0.0.4.patch
View File

@@ -1,5 +1,5 @@
--- a/src/CMakeLists.txt 2021-04-16 03:54:24.548709584 +0200
+++ b/src/CMakeLists.txt 2021-04-16 03:54:48.685073637 +0200
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,13 +23,3 @@
TARGET_LINK_LIBRARIES(er ${ER_EXTERNAL_LIBS})
SET_TARGET_PROPERTIES(er PROPERTIES OUTPUT_NAME er CLEAN_DIRECT_OUTPUT 1)

16
sys-cluster/extrae/extrae-3.8.3.ebuild → sys-cluster/extrae/extrae-3.8.3-r1.ebuild
View File

@@ -13,17 +13,19 @@ SRC_URI="https://github.com/bsc-performance-tools/extrae/archive/${PV}.tar.gz ->
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64"
#TODO: correctly install python stuff
IUSE="boost doc dwarf elf fft heterogeneous inotify +instrument-dynamic-memory +instrument-io +instrument-syscall merge-in-trace opencl openmp +parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib smpss +xml"
IUSE="boost doc dwarf elf fft heterogeneous inotify +instrument-dynamic-memory +instrument-io +instrument-syscall merge-in-trace nanos opencl openmp +parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib smpss +xml"
#aspectj and aspectj-weaver needs to be enabled both at the same time but the aspectj package in gentoo doesn't have weaver
#TODO: find out who is pulling in libpfm
#TODO: find out which FFT library is used
#TODO: remove some useflags (boost fft elf dwarf)
#TODO: nanos pmapi online dyninst cuda spectral cupti openshmem gm mx synapse memkind sionlib aspectj
#TODO: pmapi online dyninst cuda spectral cupti openshmem gm mx synapse memkind sionlib aspectj
#TODO: support llvm libunwind, llvm rt, elftoolchain
CDEPEND="
${PYTHON_DEPS}
app-arch/xz-utils
dev-libs/icu
dev-libs/libpfm
sys-libs/libunwind
dev-libs/libxml2
dev-libs/papi
@@ -31,10 +33,13 @@ CDEPEND="
sys-libs/glibc
sys-libs/zlib
virtual/mpi
|| ( sys-devel/binutils:* sys-libs/binutils-libs )
boost? ( dev-libs/boost:= )
dwarf? ( dev-libs/libdwarf )
elf? ( virtual/libelf )
inotify? ( dev-libs/libevent )
opencl? ( dev-util/opencl-headers )
"
DEPEND="
@@ -67,10 +72,9 @@ src_configure() {
local myconf=(
--datadir="${T}"
--datarootdir="${T}"
--libdir="${EPREFIX}/usr/$(get_libdir)/extrae"
--libdir="${EPREFIX}/usr/$(get_libdir)/extrae/lib"
--disable-mic
--disable-nanos
--disable-online
--disable-peruse
--disable-pmapi
@@ -103,6 +107,7 @@ src_configure() {
$(use_enable instrument-io)
$(use_enable instrument-syscall)
$(use_enable merge-in-trace)
$(use_enable nanos)
$(use_enable openmp)
$(use_enable sampling)
$(use_enable parallel-merge)
@@ -113,7 +118,6 @@ src_configure() {
$(use_enable smpss)
$(use_enable xml)
)
# $(use_enable nanos)
# --without-sionlib
#--with-pmpi-hook (Choose method to call PMPI (dlsym or pmpi))

2
sys-cluster/extrae/metadata.xml
View File

@@ -31,7 +31,7 @@ process). Extrae generates trace files that can be later visualized with <pkg>sy
<flag name="instrument-syscall">Enables instrumentation for system calls (other than I/O and mallocs)</flag>
<flag name="java">Enable support for tracing Java. This is necessary to create the connectors between |TRACE| and Java applications.</flag>
<flag name="merge-in-trace">Embed the merging process in the tracing library so the final tracefile can be generated automatically from the application run</flag>
<!--<flag name="nanos">Enable support for tracing <pkg>sys-cluster/nanos</pkg> run-time</flag>-->
<flag name="nanos">Enable support for tracing <pkg>sys-cluster/nanos</pkg> run-time</flag>
<!--<flag name="online">Enable on-line analysis</flag>-->
<flag name="opencl">Enable support for tracing OpenCL</flag>
<flag name="openmp">Enable support for tracing OpenMP</flag>

1
sys-cluster/nanos6/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST nanos6-2.5.1.tar.gz 744260 BLAKE2B 6b294391ebb18806da76b4bc73aaf6f7082ab4a61693ab300e130f04942bf50c1da884e5271765465bedab863cb1ce545a43ac09727152c0a52d69852e60e373 SHA512 c7da862aa41fb0be1a992f4fde7306a02c4159c05a89055f0144bf6a815c10ff5f7e7ee11b4afaa4c468afdd538a99b3b5971a896221b20928805b45d35e0335

29
sys-cluster/nanos6/metadata.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<bugs-to>https://github.com/bsc-pm/nanos6/issues</bugs-to>
<remote-id type="github">bsc-pm/nanos6</remote-id>
</upstream>
<use>
<!--<flag name="chrono-arch">use an architecture-dependent chrono for timing instead of the default one</flag>-->
<flag name="cluster">Enable OmpSs@Cluster support. This requires an MPI version that supports MPI_THREAD_MULTIPLE to be present in your environment</flag>
<!--<flag name="cuda">enable CUDA</flag>-->
<flag name="debug">enable extra assertions and checks in debug - may cause significant slowdown</flag>
<flag name="dlb">enable dynamic management and sharing of computing resources</flag>
<flag name="embed-code-changes">embed into the runtime any code changes present in the source</flag>
<flag name="execution-workflow">Enable execution using the Execution Workflow</flag>
<flag name="extrae">to generate execution traces for offline performance analysis with paraver</flag>
<!--<flag name="jemalloc">use jemalloc as the default memory allocator, providing better performance than the default glibc implementation</flag>-->
<!--<flag name="k1om">specify the installation prefix of the k1om GNU compilers</flag>-->
<!--<flag name="memkind">specify the installation prefix of memkind</flag>-->
<!--<flag name="mercurium">specify the installation prefix of the Nanos6 Mercurium compiler</flag>-->
<flag name="papi">enable <pkg>dev-libs/papi</pkg> support</flag>
<!--<flag name="pqos"> to generate real-time statistics of hardware counters</flag>-->
<flag name="unwind">to generate sample-based profiling</flag>
</use>
</pkgmetadata>

111
sys-cluster/nanos6/nanos6-2.5.1-r1.ebuild Normal file
View File

@@ -0,0 +1,111 @@
# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools
DESCRIPTION="runtime that implements the OmpSs-2 parallel programming model"
HOMEPAGE="https://github.com/bsc-pm/nanos6"
SRC_URI="https://github.com/bsc-pm/nanos6/archive/refs/tags/version-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE="cluster debug dlb embed-code-changes execution-workflow extrae git papi unwind"
#chrono-arch build fail
#jemalloc require custom stuff
#TODO: cuda pqos mercurium memkind k1om
RDEPEND="
>=dev-libs/boost-1.59:=
sys-apps/hwloc
sys-process/numactl
virtual/libelf
cluster? ( virtual/mpi )
dlb? ( sys-cluster/dlb )
embed-code-changes? ( dev-vcs/git )
extrae? ( sys-cluster/extrae[nanos] )
papi? ( dev-libs/papi )
unwind? ( sys-libs/libunwind )
"
DEPEND="${RDEPEND}"
BDEPEND=""
REQUIRED_USE="cluster? ( execution-workflow )"
S="${WORKDIR}/${PN}-version-${PV}"
src_prepare() {
default
eautoreconf
}
src_configure() {
local myconf=(
--disable-chrono-arch
--disable-openacc
--disable-static
--enable-shared
--with-boost="${EPREFIX}/usr"
--with-libnuma="${EPREFIX}/usr"
--with-pic
--without-k1om
--without-nanos6-clang
--without-nanos6-mercurium
--without-pgi
$(use_enable cluster)
$(use_enable debug extra-debug)
$(use_enable embed-code-changes)
$(use_enable execution-workflow)
)
if use dlb; then
myconf+=( "--with-dlb=${EPREFIX}/usr" )
else
myconf+=( "--without-dlb" )
fi
if use embed-code-changes; then
myconf+=( "--with-git=${EPREFIX}/usr" )
else
myconf+=( "--without-git" )
fi
if use extrae; then
myconf+=( "--with-extrae=${EPREFIX}/usr/$(get_libdir)/extrae" )
else
myconf+=( "--without-extrae" )
fi
if use papi; then
myconf+=( "--with-papi=${EPREFIX}/usr" )
else
myconf+=( "--without-papi" )
fi
if use unwind; then
myconf+=( "--with-libunwind=${EPREFIX}/usr" )
else
myconf+=( "--without-libunwind" )
fi
econf "${myconf[@]}"
}
# --without-pqos
# --without-jemalloc
# --without-cuda
# --without-memkind
src_install() {
default
dodoc CHANGELOG.md
rm -r docs/Doxyfile* || die
dodoc -r docs/.
docompress -x "/usr/share/doc/${PF}/paraver-cfg"
docompress -x "/usr/share/doc/${PF}/scripts"
}
pkg_postinst() {
elog "install media-gfx/graphviz and app-text/pdfjam or >=app-text/texlive-core-2021 to generate graphical representations of the dependency graph"
elog "install sys-process/parallel to generate the graph representation in parallel"
}

40
sys-cluster/pcs/files/openrc-0.10.7.patch
View File

@@ -1,6 +1,5 @@
diff -uPNr a/pcs-0.10.7/pcs/lib/external.py b/pcs-0.10.7/pcs/lib/external.py
--- a/pcs-0.10.7/pcs/lib/external.py 2020-12-15 17:02:49.055879169 +0100
+++ b/pcs-0.10.7/pcs/lib/external.py 2020-12-15 21:13:41.878627331 +0100
--- a/pcs-0.10.7/pcs/lib/external.py
+++ b/pcs-0.10.7/pcs/lib/external.py
@@ -13,8 +13,8 @@
from pcs.lib.errors import LibraryError
@@ -82,9 +81,8 @@ diff -uPNr a/pcs-0.10.7/pcs/lib/external.py b/pcs-0.10.7/pcs/lib/external.py
if return_code != 0:
return []
diff -uPNr a/pcs-0.10.7/pcs/settings_default.py b/pcs-0.10.7/pcs/settings_default.py
--- a/pcs-0.10.7/pcs/settings_default.py 2020-12-15 17:02:49.056879154 +0100
+++ b/pcs-0.10.7/pcs/settings_default.py 2020-12-16 21:59:28.541361537 +0100
--- a/pcs-0.10.7/pcs/settings_default.py
+++ b/pcs-0.10.7/pcs/settings_default.py
@@ -1,8 +1,8 @@
import os.path
@@ -114,9 +112,8 @@ diff -uPNr a/pcs-0.10.7/pcs/settings_default.py b/pcs-0.10.7/pcs/settings_defaul
# this limit is also mentioned in docs, change there as well
sbd_max_device_num = 3
# message types are also mentioned in docs, change there as well
diff -uPNr a/pcs-0.10.7/pcs/settings.py.debian b/pcs-0.10.7/pcs/settings.py.debian
--- a/pcs-0.10.7/pcs/settings.py.debian 2020-12-15 17:02:49.055879169 +0100
+++ b/pcs-0.10.7/pcs/settings.py.debian 2020-12-16 09:36:10.493104892 +0100
--- a/pcs-0.10.7/pcs/settings.py.debian
+++ b/pcs-0.10.7/pcs/settings.py.debian
@@ -1,10 +1,10 @@
from pcs.settings_default import *
-service_binary = "/usr/sbin/service"
@@ -133,9 +130,8 @@ diff -uPNr a/pcs-0.10.7/pcs/settings.py.debian b/pcs-0.10.7/pcs/settings.py.debi
pcsd_exec_location = "/usr/share/pcsd/"
pcsd_gem_path = None
pcsd_config = "/etc/default/pcsd"
diff -uPNr a/pcs-0.10.7/pcs/utils.py b/pcs-0.10.7/pcs/utils.py
--- a/pcs-0.10.7/pcs/utils.py 2020-12-15 17:02:49.056879154 +0100
+++ b/pcs-0.10.7/pcs/utils.py 2020-12-16 21:57:09.487686936 +0100
--- a/pcs-0.10.7/pcs/utils.py
+++ b/pcs-0.10.7/pcs/utils.py
@@ -2187,7 +2187,7 @@
)
else:
@@ -154,9 +150,8 @@ diff -uPNr a/pcs-0.10.7/pcs/utils.py b/pcs-0.10.7/pcs/utils.py
)
return join_multilines([stderr, stdout]), retval
diff -uPNr a/pcs-0.10.7/pcsd/pcs.rb b/pcs-0.10.7/pcsd/pcs.rb
--- a/pcs-0.10.7/pcsd/pcs.rb 2020-12-15 17:02:49.063879050 +0100
+++ b/pcs-0.10.7/pcsd/pcs.rb 2020-12-16 21:54:52.337982100 +0100
--- a/pcs-0.10.7/pcsd/pcs.rb
+++ b/pcs-0.10.7/pcsd/pcs.rb
@@ -1708,11 +1708,22 @@
def is_service_enabled?(service)
if ISSYSTEMCTL
@@ -239,9 +234,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/pcs.rb b/pcs-0.10.7/pcsd/pcs.rb
_, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
return (retcode == 0)
I file binari a/pcs-0.10.7/pcsd/.pcs.rb.swp e b/pcs-0.10.7/pcsd/.pcs.rb.swp sono diversi
diff -uPNr a/pcs-0.10.7/pcsd/settings.rb b/pcs-0.10.7/pcsd/settings.rb
--- a/pcs-0.10.7/pcsd/settings.rb 2020-12-15 17:02:49.065879020 +0100
+++ b/pcs-0.10.7/pcsd/settings.rb 2020-12-16 09:26:46.782426991 +0100
--- a/pcs-0.10.7/pcsd/settings.rb
+++ b/pcs-0.10.7/pcsd/settings.rb
@@ -3,7 +3,7 @@
PCSD_EXEC_LOCATION = '/usr/lib/pcsd/'
PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -251,9 +245,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/settings.rb b/pcs-0.10.7/pcsd/settings.rb
CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
diff -uPNr a/pcs-0.10.7/pcsd/settings.rb.debian b/pcs-0.10.7/pcsd/settings.rb.debian
--- a/pcs-0.10.7/pcsd/settings.rb.debian 2020-12-15 17:02:49.065879020 +0100
+++ b/pcs-0.10.7/pcsd/settings.rb.debian 2020-12-16 18:52:24.289921676 +0100
--- a/pcs-0.10.7/pcsd/settings.rb.debian
+++ b/pcs-0.10.7/pcsd/settings.rb.debian
@@ -3,7 +3,7 @@
PCSD_EXEC_LOCATION = '/usr/share/pcsd/'
PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -263,9 +256,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/settings.rb.debian b/pcs-0.10.7/pcsd/settings.rb.de
CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
diff -uPNr a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py
--- a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py 2020-12-15 17:02:49.061879080 +0100
+++ b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py 2020-12-16 21:52:40.531155033 +0100
--- a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py
+++ b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py
@@ -16,8 +16,8 @@
import pcs.lib.external as lib

40
sys-cluster/pcs/files/openrc-0.10.8.patch
View File

@@ -1,6 +1,5 @@
diff -uPNr a/pcs-0.10.8/pcs/lib/external.py b/pcs-0.10.8/pcs/lib/external.py
--- a/pcs-0.10.8/pcs/lib/external.py 2020-12-15 17:02:49.055879169 +0100
+++ b/pcs-0.10.8/pcs/lib/external.py 2020-12-15 21:13:41.878627331 +0100
--- a/pcs-0.10.8/pcs/lib/external.py
+++ b/pcs-0.10.8/pcs/lib/external.py
@@ -13,8 +13,8 @@
from pcs.lib.errors import LibraryError
@@ -82,9 +81,8 @@ diff -uPNr a/pcs-0.10.8/pcs/lib/external.py b/pcs-0.10.8/pcs/lib/external.py
if return_code != 0:
return []
diff -uPNr a/pcs-0.10.8/pcs/settings_default.py b/pcs-0.10.8/pcs/settings_default.py
--- a/pcs-0.10.8/pcs/settings_default.py 2020-12-15 17:02:49.056879154 +0100
+++ b/pcs-0.10.8/pcs/settings_default.py 2020-12-16 21:59:28.541361537 +0100
--- a/pcs-0.10.8/pcs/settings_default.py
+++ b/pcs-0.10.8/pcs/settings_default.py
@@ -1,8 +1,8 @@
import os.path
@@ -114,9 +112,8 @@ diff -uPNr a/pcs-0.10.8/pcs/settings_default.py b/pcs-0.10.8/pcs/settings_defaul
# this limit is also mentioned in docs, change there as well
sbd_max_device_num = 3
# message types are also mentioned in docs, change there as well
diff -uPNr a/pcs-0.10.8/pcs/settings.py.debian b/pcs-0.10.8/pcs/settings.py.debian
--- a/pcs-0.10.8/pcs/settings.py.debian 2020-12-15 17:02:49.055879169 +0100
+++ b/pcs-0.10.8/pcs/settings.py.debian 2020-12-16 09:36:10.493104892 +0100
--- a/pcs-0.10.8/pcs/settings.py.debian
+++ b/pcs-0.10.8/pcs/settings.py.debian
@@ -1,10 +1,10 @@
from pcs.settings_default import *
-service_binary = "/usr/sbin/service"
@@ -133,9 +130,8 @@ diff -uPNr a/pcs-0.10.8/pcs/settings.py.debian b/pcs-0.10.8/pcs/settings.py.debi
pcsd_exec_location = "/usr/share/pcsd/"
pcsd_gem_path = None
pcsd_config = "/etc/default/pcsd"
diff -uPNr a/pcs-0.10.8/pcs/utils.py b/pcs-0.10.8/pcs/utils.py
--- a/pcs-0.10.8/pcs/utils.py 2020-12-15 17:02:49.056879154 +0100
+++ b/pcs-0.10.8/pcs/utils.py 2020-12-16 21:57:09.487686936 +0100
--- a/pcs-0.10.8/pcs/utils.py
+++ b/pcs-0.10.8/pcs/utils.py
@@ -2187,7 +2187,7 @@
)
else:
@@ -154,9 +150,8 @@ diff -uPNr a/pcs-0.10.8/pcs/utils.py b/pcs-0.10.8/pcs/utils.py
)
return join_multilines([stderr, stdout]), retval
diff -uPNr a/pcs-0.10.8/pcsd/pcs.rb b/pcs-0.10.8/pcsd/pcs.rb
--- a/pcs-0.10.8/pcsd/pcs.rb 2020-12-15 17:02:49.063879050 +0100
+++ b/pcs-0.10.8/pcsd/pcs.rb 2020-12-16 21:54:52.337982100 +0100
--- a/pcs-0.10.8/pcsd/pcs.rb
+++ b/pcs-0.10.8/pcsd/pcs.rb
@@ -1708,11 +1708,22 @@
def is_service_enabled?(service)
if ISSYSTEMCTL
@@ -238,9 +233,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/pcs.rb b/pcs-0.10.8/pcsd/pcs.rb
end
_, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
return (retcode == 0)
diff -uPNr a/pcs-0.10.8/pcsd/settings.rb b/pcs-0.10.8/pcsd/settings.rb
--- a/pcs-0.10.8/pcsd/settings.rb 2020-12-15 17:02:49.065879020 +0100
+++ b/pcs-0.10.8/pcsd/settings.rb 2020-12-16 09:26:46.782426991 +0100
--- a/pcs-0.10.8/pcsd/settings.rb
+++ b/pcs-0.10.8/pcsd/settings.rb
@@ -3,7 +3,7 @@
PCSD_EXEC_LOCATION = '/usr/lib/pcsd/'
PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -250,9 +244,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/settings.rb b/pcs-0.10.8/pcsd/settings.rb
CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
diff -uPNr a/pcs-0.10.8/pcsd/settings.rb.debian b/pcs-0.10.8/pcsd/settings.rb.debian
--- a/pcs-0.10.8/pcsd/settings.rb.debian 2020-12-15 17:02:49.065879020 +0100
+++ b/pcs-0.10.8/pcsd/settings.rb.debian 2020-12-16 18:52:24.289921676 +0100
--- a/pcs-0.10.8/pcsd/settings.rb.debian
+++ b/pcs-0.10.8/pcsd/settings.rb.debian
@@ -3,7 +3,7 @@
PCSD_EXEC_LOCATION = '/usr/share/pcsd/'
PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -262,9 +255,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/settings.rb.debian b/pcs-0.10.8/pcsd/settings.rb.de
CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
diff -uPNr a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py
--- a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py 2020-12-15 17:02:49.061879080 +0100
+++ b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py 2020-12-16 21:52:40.531155033 +0100
--- a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py
+++ b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py
@@ -16,8 +16,8 @@
import pcs.lib.external as lib

4
sys-cluster/pcs/files/remove-ruby-bundle-path.patch
View File

@@ -1,5 +1,5 @@
--- a/pcs/settings_default.py 2018-11-23 12:57:53.000000000 +0000
+++ b/pcs/settings_default.py 2019-05-11 20:07:19.080000000 +0000
--- a/pcs/settings_default.py
+++ b/pcs/settings_default.py
@@ -81,7 +81,7 @@
])
# Set pcsd_gem_path to None if there are no bundled ruby gems and the path does

4
sys-cluster/redset/files/no-static-0.0.5.patch
View File

@@ -1,5 +1,5 @@
--- a/src/CMakeLists.txt 2021-04-13 00:58:19.047554716 +0200
+++ b/src/CMakeLists.txt 2021-04-13 00:58:58.326053601 +0200
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -44,26 +44,11 @@
SET_TARGET_PROPERTIES(redset PROPERTIES OUTPUT_NAME redset CLEAN_DIRECT_OUTPUT 1)
INSTALL(TARGETS redset DESTINATION ${CMAKE_INSTALL_LIBDIR})

4
sys-cluster/shuffile/files/no-static-0.0.4.patch
View File

@@ -1,5 +1,5 @@
--- a/src/CMakeLists.txt 2021-04-13 01:07:33.798593182 +0200
+++ b/src/CMakeLists.txt 2021-04-13 01:08:02.110951981 +0200
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,13 +24,3 @@
TARGET_LINK_LIBRARIES(shuffile ${SHUFFILE_EXTERNAL_LIBS})
SET_TARGET_PROPERTIES(shuffile PROPERTIES OUTPUT_NAME shuffile CLEAN_DIRECT_OUTPUT 1)

2
x11-misc/gammy/gammy-0.9.60.ebuild
View File

@@ -37,7 +37,7 @@ src_configure() {
}
src_install() {
default
emake INSTALL_ROOT="${D}" install
local sizes="128 16 32 64"
cd ./icons || die

11
x11-misc/gammy/gammy-0.9.64.ebuild
View File

@@ -37,14 +37,5 @@ src_configure() {
}
src_install() {
default
local sizes="128 16 32 64"
cd ./icons || die
for size in ${sizes}; do
convert "${size}x${size}ball.ico" "${size}x${size}ball.png" || die
newicon -s "${size}" "${size}x${size}ball.png" "${PN}.png"
done
make_desktop_entry "${PN}" "${PN^}" "${PN}" "Graphics;Settings"
emake INSTALL_ROOT="${D}" install
}

11
x11-misc/gammy/gammy-9999.ebuild
View File

@@ -37,14 +37,5 @@ src_configure() {
}
src_install() {
default
local sizes="128 16 32 64"
cd ./icons || die
for size in ${sizes}; do
convert "${size}x${size}ball.ico" "${size}x${size}ball.png" || die
newicon -s "${size}" "${size}x${size}ball.png" "${PN}.png"
done
make_desktop_entry "${PN}" "${PN^}" "${PN}" "Graphics;Settings"
emake INSTALL_ROOT="${D}" install
}