From 99927103a73478f41fca9b53bf324be6d5d8a34e Mon Sep 17 00:00:00 2001 From: Konstantin Tutsch Date: Fri, 25 Aug 2023 17:33:33 +0200 Subject: [PATCH 01/12] media-sound/g4music: add build dependency for appstream-util command Signed-off-by: Konstantin Tutsch --- media-sound/g4music/g4music-3.2.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/media-sound/g4music/g4music-3.2.ebuild b/media-sound/g4music/g4music-3.2.ebuild index 2f4669628e..402956a91e 100644 --- a/media-sound/g4music/g4music-3.2.ebuild +++ b/media-sound/g4music/g4music-3.2.ebuild @@ -21,6 +21,7 @@ IDEPEND=">=gui-libs/gtk-4.6 >=media-libs/gstreamer-1.20.6[introspection] >=media-plugins/gst-plugins-taglib-1.20.6 >=dev-lang/vala-0.56.8 +>=dev-libs/appstream-glib-0.8.2 pipewire? ( media-video/pipewire[gstreamer] )" DEPEND="" RDEPEND="${DEPEND}" From a79c2f29f634134343f1054d3592cf2e82114523 Mon Sep 17 00:00:00 2001 From: Konstantin Tutsch Date: Fri, 25 Aug 2023 19:33:21 +0200 Subject: [PATCH 02/12] media-sound/g4music: remove gnome.post_install() from meson.build Closes: https://bugs.gentoo.org/912991 Signed-off-by: Konstantin Tutsch --- media-sound/g4music/g4music-3.2.ebuild | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/media-sound/g4music/g4music-3.2.ebuild b/media-sound/g4music/g4music-3.2.ebuild index 402956a91e..8a3c1b796c 100644 --- a/media-sound/g4music/g4music-3.2.ebuild +++ b/media-sound/g4music/g4music-3.2.ebuild @@ -31,6 +31,11 @@ src_prepare() { default vala_setup xdg_environment_reset + + sed -i \ + -e '/^gnome.post_install(/,/)/d' \ + meson.build \ + || die } pkg_postinst() { From 1b8beb7834fcd1666329dd59018112d7a830ecb4 Mon Sep 17 00:00:00 2001 From: Konstantin Tutsch Date: Fri, 25 Aug 2023 20:11:34 +0200 Subject: [PATCH 03/12] media-video/kooha: remove gnome.post_install() from meson.build Closes: https://bugs.gentoo.org/912990 Signed-off-by: Konstantin Tutsch --- media-video/kooha/kooha-2.2.3.ebuild | 48 ++++++++++++++++++---------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/media-video/kooha/kooha-2.2.3.ebuild b/media-video/kooha/kooha-2.2.3.ebuild index 00c7b40734..12f1119c20 100644 --- a/media-video/kooha/kooha-2.2.3.ebuild +++ b/media-video/kooha/kooha-2.2.3.ebuild @@ -164,23 +164,25 @@ KEYWORDS="~amd64" IUSE="x264 vaapi test" RESTRICT="!test? ( test )" -IDEPEND=">=dev-util/meson-1.1.1 ->=dev-util/ninja-1.11.1-r2 ->=dev-libs/appstream-glib-0.8.2 ->=virtual/rust-1.69.0 -x264? ( >=media-libs/x264-0.0.20220222 - >=media-libs/gst-plugins-ugly-1.20.6 ) ->=media-libs/gstreamer-1.20.6 ->=media-libs/gst-plugins-base-1.20.6 -vaapi? ( >=media-plugins/gst-plugins-vaapi-1.20.6 ) ->=dev-libs/glib-2.76.3 ->=gui-libs/gtk-4.10.4 ->=gui-libs/libadwaita-1.3.3 ->=media-libs/libpulse-15.0[glib]" -DEPEND=">=media-video/pipewire-0.3.77-r1[gstreamer] ->=sys-apps/xdg-desktop-portal-1.16.0-r1" +DEPEND="x264? ( >=media-libs/x264-0.0.20220222 + >=media-libs/gst-plugins-ugly-1.20.6 ) + >=media-libs/gstreamer-1.20.6 + >=media-libs/gst-plugins-base-1.20.6 + vaapi? ( >=media-plugins/gst-plugins-vaapi-1.20.6 ) + >=dev-libs/glib-2.76.3 + >=gui-libs/gtk-4.10.4 + >=gui-libs/libadwaita-1.3.3 + >=media-libs/libpulse-15.0[glib] + >=media-video/pipewire-0.3.77-r1[gstreamer] + >=sys-apps/xdg-desktop-portal-1.16.0-r1 +" RDEPEND="${DEPEND}" -BDEPEND="" +BDEPEND=">=dev-util/meson-1.1.1 + >=dev-util/ninja-1.11.1-r2 + >=dev-libs/appstream-glib-0.8.2 + >=virtual/rust-1.69.0 +" + # rust does not use *FLAGS from make.conf, silence portage warning # update with proper path to binaries this crate installs, omit leading / @@ -188,6 +190,20 @@ QA_FLAGS_IGNORED="usr/bin/${PN}" BUILD_DIR="${S}/build" +src_prepare() { + default + + sed -i \ + -e '/^gnome.post_install(/,/)/d' \ + meson.build \ + || die + + sed -i \ + -e '/^test(/,/time\n\t)/d' \ + src/meson.build \ + || die +} + pkg_postinst() { xdg_pkg_postinst gnome2_schemas_update From 00d549ec0277a8a92c6d9f3b3076c11619e825e4 Mon Sep 17 00:00:00 2001 From: Konstantin Tutsch Date: Fri, 25 Aug 2023 20:12:58 +0200 Subject: [PATCH 04/12] media-video/kooha: remove unneeded line (QA) Signed-off-by: Konstantin Tutsch --- media-video/kooha/kooha-2.2.3.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/media-video/kooha/kooha-2.2.3.ebuild b/media-video/kooha/kooha-2.2.3.ebuild index 12f1119c20..8300a3ebb5 100644 --- a/media-video/kooha/kooha-2.2.3.ebuild +++ b/media-video/kooha/kooha-2.2.3.ebuild @@ -183,7 +183,6 @@ BDEPEND=">=dev-util/meson-1.1.1 >=virtual/rust-1.69.0 " - # rust does not use *FLAGS from make.conf, silence portage warning # update with proper path to binaries this crate installs, omit leading / QA_FLAGS_IGNORED="usr/bin/${PN}" From a8153d818bfc4c0e469721b67cf3a50fda6a6ee6 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 26 Aug 2023 13:55:50 +0800 Subject: [PATCH 05/12] dev-ruby/prawn-templates: enable ruby32 Signed-off-by: Huang Rui --- dev-ruby/prawn-templates/prawn-templates-0.1.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ruby/prawn-templates/prawn-templates-0.1.2-r1.ebuild b/dev-ruby/prawn-templates/prawn-templates-0.1.2-r1.ebuild index 38a8ae9cbf..6c54e594b7 100644 --- a/dev-ruby/prawn-templates/prawn-templates-0.1.2-r1.ebuild +++ b/dev-ruby/prawn-templates/prawn-templates-0.1.2-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby31" +USE_RUBY="ruby31 ruby32" RUBY_FAKEGEM_RECIPE_DOC="yard" RUBY_FAKEGEM_RECIPE_TEST="rspec3" From bd1e5ecd7b05e44a7ff74b5d131d1e532338ea7f Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 26 Aug 2023 13:56:23 +0800 Subject: [PATCH 06/12] dev-ruby/prawn-svg: enable ruby32 Signed-off-by: Huang Rui --- dev-ruby/prawn-svg/prawn-svg-0.32.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ruby/prawn-svg/prawn-svg-0.32.0.ebuild b/dev-ruby/prawn-svg/prawn-svg-0.32.0.ebuild index 4ab80437a9..db9d6a76e5 100644 --- a/dev-ruby/prawn-svg/prawn-svg-0.32.0.ebuild +++ b/dev-ruby/prawn-svg/prawn-svg-0.32.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby31" +USE_RUBY="ruby31 ruby32" RUBY_FAKEGEM_RECIPE_DOC="yard" RUBY_FAKEGEM_RECIPE_TEST="rspec3" From f16a08d3af0ea36c97fc7eab0794d10b1e29bd74 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 26 Aug 2023 13:56:40 +0800 Subject: [PATCH 07/12] dev-ruby/prawn-icon: enable ruby32 Signed-off-by: Huang Rui --- dev-ruby/prawn-icon/prawn-icon-3.1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ruby/prawn-icon/prawn-icon-3.1.0.ebuild b/dev-ruby/prawn-icon/prawn-icon-3.1.0.ebuild index 7052fe4ff2..2c4ac05619 100644 --- a/dev-ruby/prawn-icon/prawn-icon-3.1.0.ebuild +++ b/dev-ruby/prawn-icon/prawn-icon-3.1.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby31" +USE_RUBY="ruby31 ruby32" RUBY_FAKEGEM_RECIPE_DOC="yard" RUBY_FAKEGEM_RECIPE_TEST="rspec3" From 1d3d45ca125e6a7b991b05dbfc14221f108ad475 Mon Sep 17 00:00:00 2001 From: Konstantin Tutsch Date: Sat, 26 Aug 2023 08:02:51 +0200 Subject: [PATCH 08/12] media-video/kooha: remove sed for src/meson.build Signed-off-by: Konstantin Tutsch --- media-video/kooha/kooha-2.2.3.ebuild | 5 ----- 1 file changed, 5 deletions(-) diff --git a/media-video/kooha/kooha-2.2.3.ebuild b/media-video/kooha/kooha-2.2.3.ebuild index 8300a3ebb5..324f5886c5 100644 --- a/media-video/kooha/kooha-2.2.3.ebuild +++ b/media-video/kooha/kooha-2.2.3.ebuild @@ -196,11 +196,6 @@ src_prepare() { -e '/^gnome.post_install(/,/)/d' \ meson.build \ || die - - sed -i \ - -e '/^test(/,/time\n\t)/d' \ - src/meson.build \ - || die } pkg_postinst() { From 81a33e98ce823c015aee45bdb555868ceb6d2643 Mon Sep 17 00:00:00 2001 From: Konstantin Tutsch Date: Sat, 26 Aug 2023 08:05:47 +0200 Subject: [PATCH 09/12] media-sound/g4music: add tabs before depenedencies Signed-off-by: Konstantin Tutsch --- media-sound/g4music/g4music-3.2.ebuild | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/media-sound/g4music/g4music-3.2.ebuild b/media-sound/g4music/g4music-3.2.ebuild index 8a3c1b796c..4aef449d3d 100644 --- a/media-sound/g4music/g4music-3.2.ebuild +++ b/media-sound/g4music/g4music-3.2.ebuild @@ -16,13 +16,15 @@ KEYWORDS="~amd64" IUSE="pipewire" -IDEPEND=">=gui-libs/gtk-4.6 ->=gui-libs/libadwaita-1 ->=media-libs/gstreamer-1.20.6[introspection] ->=media-plugins/gst-plugins-taglib-1.20.6 ->=dev-lang/vala-0.56.8 ->=dev-libs/appstream-glib-0.8.2 -pipewire? ( media-video/pipewire[gstreamer] )" +IDEPEND=" + >=gui-libs/gtk-4.6 + >=gui-libs/libadwaita-1 + >=media-libs/gstreamer-1.20.6[introspection] + >=media-plugins/gst-plugins-taglib-1.20.6 + >=dev-lang/vala-0.56.8 + >=dev-libs/appstream-glib-0.8.2 + pipewire? ( media-video/pipewire[gstreamer] ) +" DEPEND="" RDEPEND="${DEPEND}" BDEPEND="$(vala_depend)" From c82e3b3cb7404e59a35b326c8f57f61641e19c74 Mon Sep 17 00:00:00 2001 From: Konstantin Tutsch Date: Sat, 26 Aug 2023 08:07:58 +0200 Subject: [PATCH 10/12] media-video/kooha: add tabs before depenedencies Signed-off-by: Konstantin Tutsch --- media-video/kooha/kooha-2.2.3.ebuild | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/media-video/kooha/kooha-2.2.3.ebuild b/media-video/kooha/kooha-2.2.3.ebuild index 324f5886c5..f4c2e19c6f 100644 --- a/media-video/kooha/kooha-2.2.3.ebuild +++ b/media-video/kooha/kooha-2.2.3.ebuild @@ -164,7 +164,8 @@ KEYWORDS="~amd64" IUSE="x264 vaapi test" RESTRICT="!test? ( test )" -DEPEND="x264? ( >=media-libs/x264-0.0.20220222 +DEPEND=" + x264? ( >=media-libs/x264-0.0.20220222 >=media-libs/gst-plugins-ugly-1.20.6 ) >=media-libs/gstreamer-1.20.6 >=media-libs/gst-plugins-base-1.20.6 @@ -177,10 +178,11 @@ DEPEND="x264? ( >=media-libs/x264-0.0.20220222 >=sys-apps/xdg-desktop-portal-1.16.0-r1 " RDEPEND="${DEPEND}" -BDEPEND=">=dev-util/meson-1.1.1 - >=dev-util/ninja-1.11.1-r2 - >=dev-libs/appstream-glib-0.8.2 - >=virtual/rust-1.69.0 +BDEPEND=" + >=dev-util/meson-1.1.1 + >=dev-util/ninja-1.11.1-r2 + >=dev-libs/appstream-glib-0.8.2 + >=virtual/rust-1.69.0 " # rust does not use *FLAGS from make.conf, silence portage warning From bb6173e142a5c3baeba42d88ee334131a2cad623 Mon Sep 17 00:00:00 2001 From: Konstantin Tutsch Date: Sat, 26 Aug 2023 08:09:01 +0200 Subject: [PATCH 11/12] net-misc/toot: add tabs before depenedencies Signed-off-by: Konstantin Tutsch --- net-misc/toot/toot-0.38.1.ebuild | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/net-misc/toot/toot-0.38.1.ebuild b/net-misc/toot/toot-0.38.1.ebuild index 6e1db62ccd..4e9ee26cad 100644 --- a/net-misc/toot/toot-0.38.1.ebuild +++ b/net-misc/toot/toot-0.38.1.ebuild @@ -16,13 +16,15 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -DEPEND=">=dev-python/urwid-2.1.2-r1 ->=dev-python/wcwidth-0.2.6 ->=media-fonts/symbola-13.00 ->=dev-python/beautifulsoup4-4.12.2 ->=dev-python/tomlkit-0.11.8 -test? ( dev-python/psycopg:2 - >=dev-python/pytest-7.4.0 )" +DEPEND=" + >=dev-python/urwid-2.1.2-r1 + >=dev-python/wcwidth-0.2.6 + >=media-fonts/symbola-13.00 + >=dev-python/beautifulsoup4-4.12.2 + >=dev-python/tomlkit-0.11.8 + test? ( dev-python/psycopg:2 + >=dev-python/pytest-7.4.0 ) +" RDEPEND="${DEPEND}" BDEPEND="" From 209077f51af2b21a4824f8e03abbc0bd21232d77 Mon Sep 17 00:00:00 2001 From: Konstantin Tutsch Date: Sat, 26 Aug 2023 08:28:33 +0200 Subject: [PATCH 12/12] media-video/kooha: add cargo clippy testing dependency Signed-off-by: Konstantin Tutsch --- media-video/kooha/kooha-2.2.3.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media-video/kooha/kooha-2.2.3.ebuild b/media-video/kooha/kooha-2.2.3.ebuild index f4c2e19c6f..712b882e16 100644 --- a/media-video/kooha/kooha-2.2.3.ebuild +++ b/media-video/kooha/kooha-2.2.3.ebuild @@ -183,6 +183,8 @@ BDEPEND=" >=dev-util/ninja-1.11.1-r2 >=dev-libs/appstream-glib-0.8.2 >=virtual/rust-1.69.0 + test? ( || ( dev-lang/rust[clippy] + dev-lang/rust-bin[clippy] ) ) " # rust does not use *FLAGS from make.conf, silence portage warning