From af488a293374244b9d66b2e8bf4fe0fc92b21b46 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 23 May 2022 15:31:58 +0200 Subject: [PATCH 1/5] media-gfx/bonzomatic: drop 2021.03.07-r1 Signed-off-by: Haelwenn (lanodan) Monnier --- media-gfx/bonzomatic/Manifest | 1 - .../bonzomatic-2021.03.07-r1.ebuild | 72 ------------------- 2 files changed, 73 deletions(-) delete mode 100644 media-gfx/bonzomatic/bonzomatic-2021.03.07-r1.ebuild diff --git a/media-gfx/bonzomatic/Manifest b/media-gfx/bonzomatic/Manifest index 7198612cb9..aafdf0bbe5 100644 --- a/media-gfx/bonzomatic/Manifest +++ b/media-gfx/bonzomatic/Manifest @@ -1,2 +1 @@ -DIST bonzomatic-2021.03.07.tar.gz 2721345 BLAKE2B ef943aea11bbeab18b21a95a589caceb2694512a17bbf7ec83019243b30ce2aa1c91a1eff688bfc277885bbf6c1dccad4d1e4ad866800c9020edd83093e3a7d8 SHA512 d462fc7c44a62a00dfe4af7fa2a16718b767317a9d3de5bf4599fc83f19a665575d041c88c0de90c036a0497ec8576700189bc813a057a97883d509f3b3fd4b6 DIST bonzomatic-2022.02.05.tar.gz 2721552 BLAKE2B 0c89a88e82c0eeb20d3b40f2107590ae37168a16327431d1e296c6e9cb0ae6dc661d669a0b4c91c8cd9124e2001defbf0bcf4840161efb64e20ee9b2fe93f495 SHA512 5a1ed8c2dd1b2f45de5a9cb3b859b6d599d833114a8bab95b25ac1f3ad62b536371fffd4e19ee317b79190afd1bacaa2a46000c9c5f17ff239068d13e6630bd1 diff --git a/media-gfx/bonzomatic/bonzomatic-2021.03.07-r1.ebuild b/media-gfx/bonzomatic/bonzomatic-2021.03.07-r1.ebuild deleted file mode 100644 index 6afe8200b7..0000000000 --- a/media-gfx/bonzomatic/bonzomatic-2021.03.07-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Live shader coding tool and Shader Showdown workhorse" -HOMEPAGE="https://github.com/Gargaj/Bonzomatic" -if [[ "${PV}" == "9999" ]] -then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Gargaj/Bonzomatic" -else - MY_PV="$(ver_rs 1- -)" - SRC_URI="https://github.com/Gargaj/Bonzomatic/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Bonzomatic-${MY_PV}" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Unlicense" -SLOT="0" -IUSE="system-glfw system-glew system-stb system-kissfft wayland" - -# TODO: system-miniaudio, system-jsonxx/json++, system-scintilla -# !system-glfw copied from media-libs/glfw-3.3.3::gentoo -# !system-glew copied from media-libs/glew-2.2.0::gentoo -DEPEND=" - system-glfw? ( media-libs/glfw ) - !system-glfw? ( - wayland? ( - dev-libs/wayland - media-libs/mesa[egl(+),wayland] - dev-libs/wayland-protocols - ) - !wayland? ( - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libXi - ) - ) - system-glew? ( media-libs/glew:= ) - !system-glew? ( - >=x11-libs/libX11-1.6.2 - >=x11-libs/libXext-1.3.2 - >=x11-libs/libXi-1.7.2 - >=x11-libs/libXmu-1.1.1-r1 - ) - system-stb? ( dev-libs/stb ) - system-kissfft? ( sci-libs/kissfft ) - virtual/opengl - virtual/glu - media-libs/alsa-lib - media-libs/fontconfig -" -RDEPEND="${DEPEND}" -BDEPEND="!system-glfw? ( wayland? ( dev-libs/wayland-protocols ) )" - -src_configure() { - local mycmakeargs=( - -DBONZOMATIC_USE_SYSTEM_GLFW=$(usex system-glfw) - -DGLFW_USE_WAYLAND="$(usex wayland)" - -DBONZOMATIC_USE_SYSTEM_GLEW=$(usex system-glew) - -DBONZOMATIC_USE_SYSTEM_STB=$(usex system-stb) - -DBONZOMATIC_USE_SYSTEM_KISSFFT=$(usex system-kissfft) - ) - - cmake_src_configure -} From 9f071d2b8a0a2b50f5819c2d97b4a3c76fb0380c Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 23 May 2022 15:32:44 +0200 Subject: [PATCH 2/5] media-gfx/bonzomatic: Remove broken USE=system-kissfft Signed-off-by: Haelwenn (lanodan) Monnier --- media-gfx/bonzomatic/bonzomatic-2022.02.05.ebuild | 7 ++++--- media-gfx/bonzomatic/bonzomatic-9999.ebuild | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/media-gfx/bonzomatic/bonzomatic-2022.02.05.ebuild b/media-gfx/bonzomatic/bonzomatic-2022.02.05.ebuild index 9582d65a30..adba07b55a 100644 --- a/media-gfx/bonzomatic/bonzomatic-2022.02.05.ebuild +++ b/media-gfx/bonzomatic/bonzomatic-2022.02.05.ebuild @@ -20,11 +20,13 @@ fi LICENSE="Unlicense" SLOT="0" -IUSE="system-glfw system-glew system-stb system-kissfft wayland" +IUSE="system-glfw system-glew system-stb wayland" # TODO: system-miniaudio, system-jsonxx/json++, system-scintilla # !system-glfw copied from media-libs/glfw-3.3.3::gentoo # !system-glew copied from media-libs/glew-2.2.0::gentoo +# kissfft: Bonzomatic targets non-existent `kissfft` pkg-config name +# system-kissfft? ( sci-libs/kissfft ) DEPEND=" system-glfw? ( media-libs/glfw ) !system-glfw? ( @@ -50,7 +52,6 @@ DEPEND=" >=x11-libs/libXmu-1.1.1-r1 ) system-stb? ( dev-libs/stb ) - system-kissfft? ( sci-libs/kissfft ) virtual/opengl virtual/glu media-libs/alsa-lib @@ -65,7 +66,7 @@ src_configure() { -DGLFW_USE_WAYLAND="$(usex wayland)" -DBONZOMATIC_USE_SYSTEM_GLEW=$(usex system-glew) -DBONZOMATIC_USE_SYSTEM_STB=$(usex system-stb) - -DBONZOMATIC_USE_SYSTEM_KISSFFT=$(usex system-kissfft) + -DBONZOMATIC_USE_SYSTEM_KISSFFT=OFF ) cmake_src_configure diff --git a/media-gfx/bonzomatic/bonzomatic-9999.ebuild b/media-gfx/bonzomatic/bonzomatic-9999.ebuild index 6afe8200b7..adba07b55a 100644 --- a/media-gfx/bonzomatic/bonzomatic-9999.ebuild +++ b/media-gfx/bonzomatic/bonzomatic-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,11 +20,13 @@ fi LICENSE="Unlicense" SLOT="0" -IUSE="system-glfw system-glew system-stb system-kissfft wayland" +IUSE="system-glfw system-glew system-stb wayland" # TODO: system-miniaudio, system-jsonxx/json++, system-scintilla # !system-glfw copied from media-libs/glfw-3.3.3::gentoo # !system-glew copied from media-libs/glew-2.2.0::gentoo +# kissfft: Bonzomatic targets non-existent `kissfft` pkg-config name +# system-kissfft? ( sci-libs/kissfft ) DEPEND=" system-glfw? ( media-libs/glfw ) !system-glfw? ( @@ -50,7 +52,6 @@ DEPEND=" >=x11-libs/libXmu-1.1.1-r1 ) system-stb? ( dev-libs/stb ) - system-kissfft? ( sci-libs/kissfft ) virtual/opengl virtual/glu media-libs/alsa-lib @@ -65,7 +66,7 @@ src_configure() { -DGLFW_USE_WAYLAND="$(usex wayland)" -DBONZOMATIC_USE_SYSTEM_GLEW=$(usex system-glew) -DBONZOMATIC_USE_SYSTEM_STB=$(usex system-stb) - -DBONZOMATIC_USE_SYSTEM_KISSFFT=$(usex system-kissfft) + -DBONZOMATIC_USE_SYSTEM_KISSFFT=OFF ) cmake_src_configure From 9070d23f2a68b615a79681e8bcd8785c7e5e5755 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 23 May 2022 20:51:35 +0200 Subject: [PATCH 3/5] sys-apps/sdate: Remove static lib and libtool *.la Fixes: https://bugs.gentoo.org/840637 Fixes: https://bugs.gentoo.org/840634 Signed-off-by: Haelwenn (lanodan) Monnier --- sys-apps/sdate/sdate-0.7.ebuild | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys-apps/sdate/sdate-0.7.ebuild b/sys-apps/sdate/sdate-0.7.ebuild index b862defc39..8810cbdb1a 100644 --- a/sys-apps/sdate/sdate-0.7.ebuild +++ b/sys-apps/sdate/sdate-0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,3 +17,9 @@ src_prepare() { default eautoreconf } + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + find "${ED}" -name '*.a' -delete || die +} From 721d2e323baab28be465845295610f2d9563da35 Mon Sep 17 00:00:00 2001 From: "Randall T. Vasquez" Date: Tue, 24 May 2022 06:03:48 -0700 Subject: [PATCH 4/5] dev-util/shfmt: fix BDEPEND statement This commits fixes the BDEPEND statement. Signed-off-by: Randall T. Vasquez --- dev-util/shfmt/shfmt-3.5.0.ebuild | 5 +---- dev-util/shfmt/shfmt-9999.ebuild | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dev-util/shfmt/shfmt-3.5.0.ebuild b/dev-util/shfmt/shfmt-3.5.0.ebuild index dbf998adfe..eacbfc8404 100644 --- a/dev-util/shfmt/shfmt-3.5.0.ebuild +++ b/dev-util/shfmt/shfmt-3.5.0.ebuild @@ -23,10 +23,7 @@ LICENSE="MIT" SLOT="0" IUSE="+man" -BDEPENDS=" - dev-lang/go - man? ( app-text/scdoc ) -" +BDEPEND="man? ( app-text/scdoc )" src_unpack() { if [[ ${PV} == *9999 ]]; then diff --git a/dev-util/shfmt/shfmt-9999.ebuild b/dev-util/shfmt/shfmt-9999.ebuild index dbf998adfe..eacbfc8404 100644 --- a/dev-util/shfmt/shfmt-9999.ebuild +++ b/dev-util/shfmt/shfmt-9999.ebuild @@ -23,10 +23,7 @@ LICENSE="MIT" SLOT="0" IUSE="+man" -BDEPENDS=" - dev-lang/go - man? ( app-text/scdoc ) -" +BDEPEND="man? ( app-text/scdoc )" src_unpack() { if [[ ${PV} == *9999 ]]; then From 1c284417dcdf7cfea290686cd77009f3e0754a94 Mon Sep 17 00:00:00 2001 From: Patrick Nicolas Date: Tue, 24 May 2022 16:48:49 +0200 Subject: [PATCH 5/5] sys-apps/asus-numpad: new package, add 0.1, 9999 Signed-off-by: Patrick Nicolas --- sys-apps/asus-numpad/Manifest | 1 + sys-apps/asus-numpad/asus-numpad-0.1.ebuild | 34 ++++++++++++++++++++ sys-apps/asus-numpad/asus-numpad-9999.ebuild | 34 ++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 sys-apps/asus-numpad/Manifest create mode 100644 sys-apps/asus-numpad/asus-numpad-0.1.ebuild create mode 100644 sys-apps/asus-numpad/asus-numpad-9999.ebuild diff --git a/sys-apps/asus-numpad/Manifest b/sys-apps/asus-numpad/Manifest new file mode 100644 index 0000000000..424fc25589 --- /dev/null +++ b/sys-apps/asus-numpad/Manifest @@ -0,0 +1 @@ +DIST asus-numpad-0.1.tar.gz 17307 BLAKE2B 9a6601d4a45c08ed09b283ff6011483878dd2e00949e304fc05804b35f9794728676bcdf580411bd13dfa2e0600807a22239672409994152d9cf60a7bb903e73 SHA512 97d92a03a96c23659a35d6e3d86027284ec5494174aec8cd775273d7981be94957355a6352d4e90aeebbfe19268f8787a272754cc09345d0107d77aab9dfdb73 diff --git a/sys-apps/asus-numpad/asus-numpad-0.1.ebuild b/sys-apps/asus-numpad/asus-numpad-0.1.ebuild new file mode 100644 index 0000000000..39edef631b --- /dev/null +++ b/sys-apps/asus-numpad/asus-numpad-0.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/xytovl/asus-numpad.git" + inherit git-r3 +else + TAG="v${PV}" + SRC_URI="https://github.com/xytovl/${PN}/archive/${TAG}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +inherit linux-info meson + +DESCRIPTION="User-space driver for Asus numpad" +HOMEPAGE="https://github.com/xytovl/asus-numpad" + +LICENSE="GPL-3" +SLOT="0" + +COMMON_DEPEND=">=dev-libs/libevdev-1.12.0" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +BDEPEND="" + +src_configure() { + meson_src_configure +} + +src_install() { + meson_src_install +} diff --git a/sys-apps/asus-numpad/asus-numpad-9999.ebuild b/sys-apps/asus-numpad/asus-numpad-9999.ebuild new file mode 100644 index 0000000000..39edef631b --- /dev/null +++ b/sys-apps/asus-numpad/asus-numpad-9999.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/xytovl/asus-numpad.git" + inherit git-r3 +else + TAG="v${PV}" + SRC_URI="https://github.com/xytovl/${PN}/archive/${TAG}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +inherit linux-info meson + +DESCRIPTION="User-space driver for Asus numpad" +HOMEPAGE="https://github.com/xytovl/asus-numpad" + +LICENSE="GPL-3" +SLOT="0" + +COMMON_DEPEND=">=dev-libs/libevdev-1.12.0" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +BDEPEND="" + +src_configure() { + meson_src_configure +} + +src_install() { + meson_src_install +}