7 files changed, 53 insertions, 123 deletions
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index ebea8d9f896a..ed55fc51accb 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1 +1,2 @@
 DIST cucumber-rails-2.6.1.tar.gz 43079 BLAKE2B c45211c8a2375fc2b488d22fb74041e5dcf56027d6644721b5023b8ad9e68f07593c448acb88b7c0e51dcad7da0213d48726e20175ecd5fd04f16174e44b848a SHA512 dd2ed4afecf74e8aac0fa360d81a27407df999b041b21c597e9ac141422cb0ece89eaa74d8da9a4fc2858efaf242837d8237a9ceee44875cff2c50d288fad480
+DIST cucumber-rails-3.0.0.tar.gz 37102 BLAKE2B 095b867916ccaf4ac30b6140045700002c0a83e16c86162c4891cfa21a74b2d4f2f05646f533e2b618d5c99ee74344d68042d2e47edfa6e0adfc35aa1ed31721 SHA512 66c045026b13dc94198e4095d41b8ca4bbde345f221443b834f020173b7b0bb82e5db3880691ad8adea7e39fd0ab6e987a97347712b7a0a9697825a151206beb
diff --git a/dev-util/cucumber-rails/cucumber-rails-3.0.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-3.0.0.ebuild
new file mode 100644
index 000000000000..575719557219
--- /dev/null
+++ b/dev-util/cucumber-rails/cucumber-rails-3.0.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+# There are also cucumber features. They require a Rails project with
+# factory girl which we don't have packaged yet.
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios for Rails"
+HOMEPAGE="https://cucumber.io/"
+SRC_URI="https://github.com/cucumber/cucumber-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+# Restrict tests since Appraisal is now mandatory to manage different
+# rails versions, even for the specs.
+RESTRICT="test"
+#ruby_add_bdepend "
+#	test? (
+#		>=dev-ruby/ammeter-0.2.2
+#		>=dev-ruby/rspec-rails-2.7.0:2
+#	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/capybara-3.11:3
+	>=dev-util/cucumber-5 <dev-util/cucumber-10
+	>=dev-ruby/rails-5.2:* <dev-ruby/rails-8:*
+"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -e 's/__dir__/"."/' \
+		-e '/cucumber/ s/< 9/< 10/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/cucumber-rails/metadata.xml b/dev-util/cucumber-rails/metadata.xml
index 0ffac7f6bb67..ce5549578197 100644
--- a/dev-util/cucumber-rails/metadata.xml
+++ b/dev-util/cucumber-rails/metadata.xml
@@ -4,6 +4,8 @@
  <maintainer type="person">
   <email>graaff@gentoo.org</email>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="rubygems">cucumber-rails</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-util/heaptrack/Manifest b/dev-util/heaptrack/Manifest
index 704ded416de6..08cdd294b831 100644
--- a/dev-util/heaptrack/Manifest
+++ b/dev-util/heaptrack/Manifest
@@ -1,2 +1 @@
-DIST heaptrack-1.4.0.tar.xz 5526100 BLAKE2B ffb912bc080cf966d670fcafcce682ddc5793878b73b8480b40aaf6b3c9596e892b646f9ca2ce40c195ed32d595e265e9c3a49095ac725b95a0845b2c4a7a81a SHA512 8d34356c9ecf2f9901e15ff7f24e6772e35d31ea9634d7b3ce5615df6f4f7ed024a7a4336f3b6fca648632c4c1693411641782fe60bf4cfeeb1d07d8607636a4
 DIST heaptrack-1.5.0.tar.xz 5447668 BLAKE2B f4a69311267daf9439e264bf8bb9802db41abb3fa766e5dfc8fcfe39c58feab2d0fe32710c6b5a2d63715e8b013e4a81e2984de425be871e253b1b2567a1dca2 SHA512 b52cc63a29d67dade85f40a7f9abb43e104762b9c853385f501d37fcbcef90fdcdfc93e2900c71b5a47c773bf98fe75f66f8b6a9e31a12610b6deec20d9736aa
diff --git a/dev-util/heaptrack/files/heaptrack-1.4.0-boost-1.81.patch b/dev-util/heaptrack/files/heaptrack-1.4.0-boost-1.81.patch
deleted file mode 100644
index 564f0925a9be..000000000000
--- a/dev-util/heaptrack/files/heaptrack-1.4.0-boost-1.81.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/887033
-https://invent.kde.org/sdk/heaptrack/-/commit/de3174aa1d1293636079473ff693d9a274a093a9
-
-From de3174aa1d1293636079473ff693d9a274a093a9 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-Date: Fri, 16 Dec 2022 00:01:15 +0100
-Subject: [PATCH] Add missing include
-
-This fixes the build with boost 1.81.0. <array> was included by one of
-the boost headers, however, it's no longer included as of Boost 1.81.0.
---- a/src/analyze/gui/histogrammodel.h
-+++ b/src/analyze/gui/histogrammodel.h
-@@ -9,6 +9,8 @@
- 
- #include <QAbstractTableModel>
- 
-+#include <array>
-+
- #include "treemodel.h"
- 
- struct HistogramColumn
--- 
-GitLab
diff --git a/dev-util/heaptrack/files/heaptrack-1.4.0-gcc-13.patch b/dev-util/heaptrack/files/heaptrack-1.4.0-gcc-13.patch
deleted file mode 100644
index 706d479f5275..000000000000
--- a/dev-util/heaptrack/files/heaptrack-1.4.0-gcc-13.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://invent.kde.org/sdk/heaptrack/-/commit/315aa7116d588f92b67c4bb84e1549529cb2fca0
-
-From 315aa7116d588f92b67c4bb84e1549529cb2fca0 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-Date: Mon, 23 Jan 2023 23:44:09 +0100
-Subject: [PATCH] Fix build with gcc 13 by including <cstdint>
-
-Like other versions before, gcc 13 moved some includes around and as a
-result <cstdint> is no longer transitively included [1]. Explicitly include
-it for uint{32,64}_t.
-
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
---- a/src/util/linereader.h
-+++ b/src/util/linereader.h
-@@ -7,6 +7,7 @@
- #ifndef LINEREADER_H
- #define LINEREADER_H
- 
-+#include <cstdint>
- #include <istream>
- #include <string>
- 
diff --git a/dev-util/heaptrack/heaptrack-1.4.0.ebuild b/dev-util/heaptrack/heaptrack-1.4.0.ebuild
deleted file mode 100644
index af58131c7b9f..000000000000
--- a/dev-util/heaptrack/heaptrack-1.4.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake kde.org xdg-utils
-
-DESCRIPTION="Fast heap memory profiler"
-HOMEPAGE="https://apps.kde.org/heaptrack/
-https://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gui test zstd"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/boost:=[zstd?,zlib]
-	sys-libs/libunwind:=
-	sys-libs/zlib
-	gui? (
-		dev-libs/kdiagram:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kconfigwidgets:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kitemmodels:5
-		kde-frameworks/kwidgetsaddons:5
-		kde-frameworks/threadweaver:5
-	)
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}
-	gui? ( >=kde-frameworks/kf-env-4 )
-"
-BDEPEND="gui? ( kde-frameworks/extra-cmake-modules:5 )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-boost-1.81.patch # bug #887033, in master
-	"${FILESDIR}"/${P}-gcc-13.patch # in master
-)
-
-src_prepare() {
-	cmake_src_prepare
-	rm -rf 3rdparty/boost-zstd || die # ensure no bundling
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHEAPTRACK_BUILD_GUI=$(usex gui)
-		-DBUILD_TESTING=$(usex test)
-		$(cmake_use_find_package zstd ZSTD)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}