From 24ea2d775870a3e03a4d8af839e1a78bab22507c Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 12 May 2021 11:59:11 +0200 Subject: [PATCH 1/6] net-analyzer/munin-plugins-mendix: add 23_p20210510 Signed-off-by: Alessandro Barbieri --- net-analyzer/munin-plugins-mendix/Manifest | 1 + .../munin-plugins-mendix-23_p20210510.ebuild | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 net-analyzer/munin-plugins-mendix/munin-plugins-mendix-23_p20210510.ebuild diff --git a/net-analyzer/munin-plugins-mendix/Manifest b/net-analyzer/munin-plugins-mendix/Manifest index 421d926ee3..75a5297c11 100644 --- a/net-analyzer/munin-plugins-mendix/Manifest +++ b/net-analyzer/munin-plugins-mendix/Manifest @@ -1 +1,2 @@ DIST munin-plugins-mendix-23.tar.gz 27443 BLAKE2B ff15f47ae8f540ad0080f76ee7e04451a5f6e5fa046444f5eac7994f3bd8aee4342b0c435951b370a7e14d1e25f5007d66aa8904be43c54e8b9cae4157494ebb SHA512 5ede0c389dec7ddc2148138643e020bbc2fb8ffcdbafb5cd959e3e0c1db2ad3d909b10608a26c34f6a3bc798c97e876f9175284d83266df72647a5c632960845 +DIST munin-plugins-mendix-23_p20210510.tar.gz 28229 BLAKE2B 4d7ea082d50f9db711631b6569bb196546c6591d1caed1e7af049f6b9e945153585d8ccf9dc70e2106a3113022620568cd2797501b4287f306929b7879ac89fc SHA512 57856527b33189824712cc939a60ecbe3b1b275e0349e457d03e146d324e88d20cf9162f40bf0f3ff447f05db8a6d1f96bb8b1c0a58ba18382d0e99af6bd350e diff --git a/net-analyzer/munin-plugins-mendix/munin-plugins-mendix-23_p20210510.ebuild b/net-analyzer/munin-plugins-mendix/munin-plugins-mendix-23_p20210510.ebuild new file mode 100644 index 0000000000..b9277d4f2d --- /dev/null +++ b/net-analyzer/munin-plugins-mendix/munin-plugins-mendix-23_p20210510.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +COMMIT="84f6a325fda18678cd08e9c3615d76e747a5ab51" + +DESCRIPTION="This package provides various plugins for Munin" +HOMEPAGE="https://github.com/mendix/munin-plugins-mendix" +SRC_URI="https://github.com/mendix/munin-plugins-mendix/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64" +LICENSE="BSD" +SLOT="0" +RDEPEND="net-analyzer/munin" + +src_prepare() { + default +} + +src_configure() { + return +} + +src_compile() { + return +} + +src_install() { + #install plugins without getting mad at preserving exec bit + mkdir -p "${ED}/usr/libexec/munin/plugins/mendix" || die + mv plugins/* "${ED}/usr/libexec/munin/plugins/mendix" || die + + insinto "/etc/munin/plugin-conf.d/" + doins -r plugin-conf/* +} From 4bcff8d3997b4919086238c1fbad226129e0c9bc Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 12 May 2021 12:17:16 +0200 Subject: [PATCH 2/6] net-analyzer/munin-plugins-mendix: fix S Signed-off-by: Alessandro Barbieri --- .../munin-plugins-mendix-23_p20210510.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/net-analyzer/munin-plugins-mendix/munin-plugins-mendix-23_p20210510.ebuild b/net-analyzer/munin-plugins-mendix/munin-plugins-mendix-23_p20210510.ebuild index b9277d4f2d..3c3e8b6ed2 100644 --- a/net-analyzer/munin-plugins-mendix/munin-plugins-mendix-23_p20210510.ebuild +++ b/net-analyzer/munin-plugins-mendix/munin-plugins-mendix-23_p20210510.ebuild @@ -8,6 +8,7 @@ COMMIT="84f6a325fda18678cd08e9c3615d76e747a5ab51" DESCRIPTION="This package provides various plugins for Munin" HOMEPAGE="https://github.com/mendix/munin-plugins-mendix" SRC_URI="https://github.com/mendix/munin-plugins-mendix/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" KEYWORDS="~amd64" LICENSE="BSD" SLOT="0" From 9c42327dd7e99c24595c265ee3174c425a61c52e Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 12 May 2021 12:19:00 +0200 Subject: [PATCH 3/6] dev-cpp/vexcl: new package WIP Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- dev-cpp/vexcl/Manifest | 1 + dev-cpp/vexcl/metadata.xml | 17 +++++++++++++++++ dev-cpp/vexcl/vexcl-1.4.2.ebuild | 30 ++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 dev-cpp/vexcl/Manifest create mode 100644 dev-cpp/vexcl/metadata.xml create mode 100644 dev-cpp/vexcl/vexcl-1.4.2.ebuild diff --git a/dev-cpp/vexcl/Manifest b/dev-cpp/vexcl/Manifest new file mode 100644 index 0000000000..4d66981379 --- /dev/null +++ b/dev-cpp/vexcl/Manifest @@ -0,0 +1 @@ +DIST vexcl-1.4.2.tar.gz 412861 BLAKE2B 145948d2c2e6712a30542eca6690fe9f260cc9fe2064ffd01aaa89c3ddae1e0826206ffedfc362a6fb128f2909fc22948957f40cb45dc963d703abdff2ddd386 SHA512 b8bc759269025be21865178485015eb8489596be80c505d4699efdb517cb610a2d5fed10545ec7888f4cb4c7b3e2db5e3c2dd879c0d2fd95d2d0e59d1d3b790f diff --git a/dev-cpp/vexcl/metadata.xml b/dev-cpp/vexcl/metadata.xml new file mode 100644 index 0000000000..7f91bd111f --- /dev/null +++ b/dev-cpp/vexcl/metadata.xml @@ -0,0 +1,17 @@ + + + + VexCL is a vector expression template library for OpenCL/CUDA. It has been created for ease of GPGPU development with C++. VexCL strives to reduce amount of boilerplate code needed to develop GPGPU applications. The library provides convenient and intuitive notation for vector arithmetic, reduction, sparse matrix-vector products, etc. Multi-device and even multi-platform computations are supported. The source code of the library is distributed under very permissive MIT license. + + comaintainers welcome + lssndrbarbieri@gmail.com + Alessandro Barbieri + + + + dennis.demidov@gmail.com + Denis Demidov + + ddemidov/vexcl + + diff --git a/dev-cpp/vexcl/vexcl-1.4.2.ebuild b/dev-cpp/vexcl/vexcl-1.4.2.ebuild new file mode 100644 index 0000000000..8190e38bb0 --- /dev/null +++ b/dev-cpp/vexcl/vexcl-1.4.2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="VexCL - Vector expression template library for OpenCL" +HOMEPAGE="https://github.com/ddemidov/vexcl" +SRC_URI="https://github.com/ddemidov/vexcl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +#TODO: cuda doc test +IUSE="examples" + +RDEPEND=" + dev-libs/boost:= + virtual/opencl +" +DEPEND="${RDEPEND}" + +src_install() { + cmake_src_install + if use examples; then + dodoc -r examples + docompress -x "/usr/share/doc/${P}/examples" + fi +} From 052f2c8bff49e935e7850ba112742cc9cdf4a9b4 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 12 May 2021 16:58:24 +0200 Subject: [PATCH 4/6] dev-cpp/vexcl: improvements someone practical with docs eclass should review Signed-off-by: Alessandro Barbieri --- dev-cpp/vexcl/metadata.xml | 9 ++++ dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild | 74 +++++++++++++++++++++++++++++ dev-cpp/vexcl/vexcl-1.4.2.ebuild | 30 ------------ 3 files changed, 83 insertions(+), 30 deletions(-) create mode 100644 dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild delete mode 100644 dev-cpp/vexcl/vexcl-1.4.2.ebuild diff --git a/dev-cpp/vexcl/metadata.xml b/dev-cpp/vexcl/metadata.xml index 7f91bd111f..f9645efc36 100644 --- a/dev-cpp/vexcl/metadata.xml +++ b/dev-cpp/vexcl/metadata.xml @@ -14,4 +14,13 @@ ddemidov/vexcl + + Implement workaround for AMD SI GPUs + Install the OpenCL C++ header provided by VexCL + + Use Boost.Compute algorithms + + Use the JIT backend + Use OpenCL as backend + diff --git a/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild b/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild new file mode 100644 index 0000000000..4385b24d4f --- /dev/null +++ b/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +#DOCS_AUTODOC=0 +DOCS_BUILDER="sphinx" +DOCS_DEPEND="dev-python/sphinx-bootstrap-theme" +DOCS_DIR="docs" +PYTHON_COMPAT=( python3_{7..9} ) + +inherit cmake python-any-r1 docs + +DESCRIPTION="VexCL - Vector expression template library for OpenCL" +HOMEPAGE="https://github.com/ddemidov/vexcl" +SRC_URI="https://github.com/ddemidov/vexcl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="amdsi clhpp compute examples jit +opencl test" #cuda clogs +REQUIRED_USE="^^ ( compute jit opencl )" #cuda +RESTRICT="!test? ( test )" + +RDEPEND=" + compute? ( dev-libs/boost:= ) + jit? ( virtual/opencl ) + opencl? ( virtual/opencl ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + sed -e "s|git_version()|${PV}|g" -i docs/conf.py || die + cmake_src_prepare +} + +src_configure() { + local backend +# use && backend="All" + use compute && backend="Compute" +# use cuda && backend="CUDA" + use jit && backend="JIT" + use opencl && backend="OpenCL" + + local mycmakeargs=( + -DVEXCL_BUILD_EXAMPLES=OFF + + -DVEXCL_AMD_SI_WORKAROUND=$(usex amdsi) + -DVEXCL_BACKEND="${backend}" + -DVEXCL_BUILD_TESTS=$(usex test) + -DVEXCL_INSTALL_CL_HPP=$(usex clhpp) + ) +# -DVEXCL_CLOGS=$(usex clogs) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + docs_compile +} + +src_install() { + cmake_src_install + if use doc; then + dodoc -r docs/html + docompress -x "/usr/share/doc/${P}/html" + fi + if use examples; then + dodoc -r examples + docompress -x "/usr/share/doc/${P}/examples" + fi +} diff --git a/dev-cpp/vexcl/vexcl-1.4.2.ebuild b/dev-cpp/vexcl/vexcl-1.4.2.ebuild deleted file mode 100644 index 8190e38bb0..0000000000 --- a/dev-cpp/vexcl/vexcl-1.4.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="VexCL - Vector expression template library for OpenCL" -HOMEPAGE="https://github.com/ddemidov/vexcl" -SRC_URI="https://github.com/ddemidov/vexcl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -#TODO: cuda doc test -IUSE="examples" - -RDEPEND=" - dev-libs/boost:= - virtual/opencl -" -DEPEND="${RDEPEND}" - -src_install() { - cmake_src_install - if use examples; then - dodoc -r examples - docompress -x "/usr/share/doc/${P}/examples" - fi -} From f6aa2dafa440157712e44494696feba910333f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Wed, 12 May 2021 19:03:28 +0200 Subject: [PATCH 5/6] gui-apps/paperde: requirement constraints - --- gui-apps/paperde/paperde-0.1.1.ebuild | 3 +++ gui-apps/paperde/paperde-9999.ebuild | 3 +++ 2 files changed, 6 insertions(+) diff --git a/gui-apps/paperde/paperde-0.1.1.ebuild b/gui-apps/paperde/paperde-0.1.1.ebuild index 7a7482b76f..18b6d99fcf 100644 --- a/gui-apps/paperde/paperde-0.1.1.ebuild +++ b/gui-apps/paperde/paperde-0.1.1.ebuild @@ -38,8 +38,11 @@ DEPEND=" gui-libs/libcprime gui-libs/libcsys " +# Because of gui-wm/wayfire build failure, also add requirement constraints here +# wlroots found: NO found 0.13.0 but need: '<0.12.0' ; matched: '>=0.11.0' RDEPEND=" ${DEPEND} + =gui-wm/wayfire-0.7.0[X] sys-apps/xdg-desktop-portal x11-misc/qt5ct diff --git a/gui-apps/paperde/paperde-9999.ebuild b/gui-apps/paperde/paperde-9999.ebuild index 7a7482b76f..18b6d99fcf 100644 --- a/gui-apps/paperde/paperde-9999.ebuild +++ b/gui-apps/paperde/paperde-9999.ebuild @@ -38,8 +38,11 @@ DEPEND=" gui-libs/libcprime gui-libs/libcsys " +# Because of gui-wm/wayfire build failure, also add requirement constraints here +# wlroots found: NO found 0.13.0 but need: '<0.12.0' ; matched: '>=0.11.0' RDEPEND=" ${DEPEND} + =gui-wm/wayfire-0.7.0[X] sys-apps/xdg-desktop-portal x11-misc/qt5ct From 4d7c6e9e247f58f11c239d724d02d836d572380a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Wed, 12 May 2021 19:04:44 +0200 Subject: [PATCH 6/6] gui-apps/paperde: drop old 0_p20210310 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Maciej Barć --- gui-apps/paperde/Manifest | 2 - .../files/paperde-0_p20201107-build.patch | 14 ----- gui-apps/paperde/paperde-0.1.0_alpha.ebuild | 59 ------------------- gui-apps/paperde/paperde-0_p20210310.ebuild | 53 ----------------- 4 files changed, 128 deletions(-) delete mode 100644 gui-apps/paperde/files/paperde-0_p20201107-build.patch delete mode 100644 gui-apps/paperde/paperde-0.1.0_alpha.ebuild delete mode 100644 gui-apps/paperde/paperde-0_p20210310.ebuild diff --git a/gui-apps/paperde/Manifest b/gui-apps/paperde/Manifest index 7ac1bb1b45..b20bb05756 100644 --- a/gui-apps/paperde/Manifest +++ b/gui-apps/paperde/Manifest @@ -1,3 +1 @@ -DIST paperde-0.1.0_alpha.tar.gz 2238045 BLAKE2B 90fa2948484e53c6c30e2b8258da037043e5e71915c77cbe5bf959b85aea87bbde6d9bdf0afa1d398a617f1062027a37c62d78b98429ffcc88ec61f819c26907 SHA512 85affe98ba697e7d79fcf9356ad485ed29c8a099bff773ebc01637ae34c9101ca82e63370b2298801173903bc1d7a257614ce82f58c2ea669b6f0496f3cc1400 DIST paperde-0.1.1.tar.gz 2238206 BLAKE2B 7d2ed32bc1c8f0914a39ee564565a4f9956e01d2cb4f6c11190792325c1a64ba2ca7006d8b263abb3be80b58734a798423406fd2b411a344f714988906e44c48 SHA512 45b1fcd8bc03ae34be7560fe8f369d1bde98da764870298a6f31b8465fd0fc24ace556bf7fadeab756dc4d86115aefc7c8d22eb84602472eeb2c60dc1539b85c -DIST paperde-0_p20210310.tar.gz 2239576 BLAKE2B 8aea8e44e845dbdf7c8e01841cd9d8b7897cfed32ddad9e86ef33afc40be19adf76db356fbc59927adf3e2c3fed91c76e8df4a73bffd836db465703f69c9c5dc SHA512 5e5f0ee83ccae6487608446440437e00718027322532afe81b5d173f9385d899686e7e2f008e4ac95ee9f6756d25dbf1b010d35c6e5f84cce198bf9c1c52c6ab diff --git a/gui-apps/paperde/files/paperde-0_p20201107-build.patch b/gui-apps/paperde/files/paperde-0_p20201107-build.patch deleted file mode 100644 index b3d4eea974..0000000000 --- a/gui-apps/paperde/files/paperde-0_p20201107-build.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libpaperprime/libpaperprime.pro b/libpaperprime/libpaperprime.pro -index 7ee9ec2..d5b89a2 100644 ---- a/libpaperprime/libpaperprime.pro -+++ b/libpaperprime/libpaperprime.pro -@@ -71,8 +71,7 @@ unix { - - INSTALLS += target includes themefiles - -- contains(DEFINES, LIB64): target.path = $$PREFIX/lib64 -- else: target.path = $$PREFIX/lib -+ target.path = $$PREFIX/lib/ - - includes.files = paperprime/*.h - includes.path = $$PREFIX/include/paperprime/ diff --git a/gui-apps/paperde/paperde-0.1.0_alpha.ebuild b/gui-apps/paperde/paperde-0.1.0_alpha.ebuild deleted file mode 100644 index 7a7482b76f..0000000000 --- a/gui-apps/paperde/paperde-0.1.0_alpha.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire" -HOMEPAGE="https://gitlab.com/cubocore/paper/paperde" - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git" -else - # _alpha -> -alpha - MY_PV="${PV/_/-}" - SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/v${MY_PV}/${PN}-v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/${PN}-v${MY_PV}" -fi - -LICENSE="GPL-3" -SLOT="0" - -BDEPEND=" - kde-frameworks/extra-cmake-modules:5 -" -DEPEND=" - dev-libs/libdbusmenu-qt - dev-libs/wayland - dev-libs/wayland-protocols - dev-qt/designer:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5[wayland,X] - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5[X] - gui-libs/libcprime - gui-libs/libcsys -" -RDEPEND=" - ${DEPEND} - >=gui-wm/wayfire-0.7.0[X] - sys-apps/xdg-desktop-portal - x11-misc/qt5ct -" - -src_prepare() { - cmake_src_prepare - xdg_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DPKGSHAREDPATH="${EPREFIX}/usr/share/paperde" - -DPKGCONFPATH="${EPREFIX}/etc/xdg/paperde" - ) - cmake_src_configure -} diff --git a/gui-apps/paperde/paperde-0_p20210310.ebuild b/gui-apps/paperde/paperde-0_p20210310.ebuild deleted file mode 100644 index ba465e435b..0000000000 --- a/gui-apps/paperde/paperde-0_p20210310.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire" - -HOMEPAGE="https://gitlab.com/cubocore/paper/paperde" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}" -else - COMMIT=65c755306688203ddc32bbc099ba1de03166cde9 - SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/${COMMIT}/paperde-${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="~amd64" -fi - -LICENSE="GPL-3" -SLOT="0" - -DEPEND=" - dev-libs/libdbusmenu-qt - dev-libs/wayland - dev-qt/designer:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5[wayland,X] - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5[X] - dev-qt/qtsvg:5 - gui-libs/libcprime - gui-libs/libcsys -" -RDEPEND="${DEPEND} - gui-wm/wayfire[X] - x11-misc/qt5ct -" - -src_prepare() { - cmake_src_prepare - xdg_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DPKGSHAREDPATH="${EPREFIX}/usr/share/paperde" - -DPKGCONFPATH="${EPREFIX}/etc/xdg/paperde" - ) - cmake_src_configure -}