Merge updates from master

7 files changed, 60 insertions, 108 deletions

diff --git a/media-plugins/x42-avldrums/Manifest b/media-plugins/x42-avldrums/Manifest
index f7933b93e67b..d364d787fd60 100644
--- a/media-plugins/x42-avldrums/Manifest
+++ b/media-plugins/x42-avldrums/Manifest
@@ -1,3 +1,2 @@
 DIST robtk-0.7.5.tar.gz 117218 BLAKE2B ed1d19644b0d1bbc072098971062b66810cf137499a6ac4a706865c3f7dbd1c4741fb7dc9d8fe7f9112a43744c9bc9dc97d9e53264bbf9625291c6b49724bd35 SHA512 93527d5c67af786f93338c722e10e8c71379372846d06905af1b10b7085c34c09ebf445e174c32206b06cac876ed8093b3631f8ed15c10fcbe44317b6b8e2559
-DIST x42-avldrums-0.7.2.tar.gz 101208843 BLAKE2B de27cf0fd83b24e6ca151ab4ef4282b3558e41f890ed93b25950cd3ab78da5c30ff990115c28df60b693fa06824c6330b3af7bec09d44b3a435442d91d61ffb5 SHA512 9034180e4ac68127368d91a32dbfd874692ce8152f7ee947d621d08519e4c005e6e06367f36b0e4e31d38bd2f766e6a7db40bbbac83c63c65ed0ff88c02a1a0b
 DIST x42-avldrums-0.7.3.tar.gz 101208525 BLAKE2B 33ae78ab339ef58f06bd89b0bfd4eaba9aeba175b6278d15de89f35002f6506c71f67542f6e5b053ffdf482f9328862eb6767dbde16f6548e3ca31a3a24efadb SHA512 7dd476c24f38ad241f2f19b10b561e7f9fd4f737ec1c186eaf55b9bfec1c3c1153beea95860e23d7ad2d160d97122127f0922f3ea2c2f0db083bb134362722e9
diff --git a/media-plugins/x42-avldrums/x42-avldrums-0.7.2.ebuild b/media-plugins/x42-avldrums/x42-avldrums-0.7.2.ebuild
deleted file mode 100644
index 9db167242963..000000000000
--- a/media-plugins/x42-avldrums/x42-avldrums-0.7.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="AVLinux Drumkits"
-HOMEPAGE="http://x42-plugins.com/x42/x42-avldrums https://github.com/x42/avldrums.lv2"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/x42/avldrums.lv2.git"
-	ROBTK_DIR="robtk/"
-else
-	ROBTK_PV="0.7.5"
-	SRC_URI="
-		https://github.com/x42/avldrums.lv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/x42/robtk/archive/refs/tags/v${ROBTK_PV}.tar.gz -> robtk-${ROBTK_PV}.tar.gz
-	"
-	KEYWORDS="amd64"
-	S="${WORKDIR}/avldrums.lv2-${PV}"
-	ROBTK_DIR="${WORKDIR}/robtk-${ROBTK_PV}/"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT="mirror"
-
-RDEPEND="dev-libs/glib
-	media-libs/glu
-	media-libs/lv2
-	x11-libs/cairo[X]
-	media-libs/libglvnd[X]
-	x11-libs/libX11
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake STRIP="#" RW="${ROBTK_DIR}"
-}
-
-src_install() {
-	emake RW="${ROBTK_DIR}" DESTDIR="${D}" PREFIX="/usr" LV2DIR="/usr/$(get_libdir)/lv2" install
-}
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 20b43f8003c6..e83bc2b196b8 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,2 +1 @@
-DIST rosegarden-23.12.tar.xz 5577476 BLAKE2B 7010657bdc3f159982b1f6eff83a5cbf1ca2c8300ccde786995645712471f31ed8b6ca1faa54e63748745de7731a29144a4144b59801d9c41bedfe4574ee4bdc SHA512 a51a5ddb1fe9c2ef0c2f7b16f8fbc4fd4fd727e7a3873bd744177a00188fa13d696fd800d38f0a67e16c33c3a98a8a924e72a4a6fa347ea68f1dd1cdf6492d24
 DIST rosegarden-24.06.tar.xz 5638668 BLAKE2B 82218675b9bf124ae2d5a1355b53b93ce7f8ceaeef0fe498038427f5248cf8cc687b1a34eca839f784eced496c9208ab8bca6c20821f6edd04238404ffc663b5 SHA512 345e6498dbed3bcefb6a8bca9b0f799ffb6c2031802901d4e649a764a7727f06fcbda5ef5e8e4375dcf0a6fac250419ac1e8f709767583564becf98af8dffdce
diff --git a/media-sound/rosegarden/rosegarden-23.12.ebuild b/media-sound/rosegarden/rosegarden-23.12.ebuild
deleted file mode 100644
index 8aeb311cb16a..000000000000
--- a/media-sound/rosegarden/rosegarden-23.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg virtualx
-
-DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="https://www.rosegardenmusic.com/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="lirc"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib:=
-	>=media-libs/dssi-1.0.0:=
-	media-libs/ladspa-sdk:=
-	media-libs/liblo:=
-	media-libs/liblrdf:=
-	media-libs/libsamplerate:=
-	media-libs/libsndfile:=
-	sci-libs/fftw:3.0
-	sys-libs/zlib:=
-	virtual/jack
-	x11-libs/libSM:=
-	lirc? ( app-misc/lirc:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_LIRC=$(usex !lirc)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# bug 701682, tries to open network socket and fails.
-	local myctestargs=(
-		-E "(test_notationview_selection)"
-	)
-	virtx cmake_src_test
-}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index eb4b5c7c4500..d4ccd3c0a119 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -30,6 +30,9 @@ DIST genpatches-6.1-107.extras.tar.xz 4052 BLAKE2B e37572e0575345470b87d07d8e3a0
 DIST genpatches-6.1-108.base.tar.xz 5541376 BLAKE2B 59ef9110b100cf6064c6c6e556bec827138f44dd636d55a976a1ec4af4699f95258962ce272867a1bf172b6a2e1d4f7b25025d5b6c48c9c6c7a6d8f13834b297 SHA512 f250359fd14e11ee176fedaf8bff84a553a7cc559e56c29fa2b6e04217d4e1a63b072e1c73a021a527e37101704b99136e06e008553220d7a35eee3848aadb90
 DIST genpatches-6.1-108.experimental.tar.xz 17440 BLAKE2B a484bab2cedf16ea83651c761d648712a6c60eb93e2cc997bf31b1d35b95c14c682775d31da84c858d99cdbe3b397b8781d916459ad3a06e80e971a958678fe2 SHA512 b06dcc92ef31ecc31cef9e088e64fd088d42e226b50861833d07114d95a2b1bff2dc4381ee365ee11159734cca55f30835457f19abd4fe95ad5a90af2cf8075b
 DIST genpatches-6.1-108.extras.tar.xz 4052 BLAKE2B b6ad898a5a66a1a6ef293bc4a4a886ea29f0a1f985b3b85beec7c4e935e90ac9f642e7811261e413cc39b5a0ae36fd257d0afeb4a9c52aa29956070b4b52c50e SHA512 6fbabfbcd35db0dd77da03c138a6a225f7255cc3566007368ee759ce154f23f11edb8434be82992f153deab19c6b5549d00a7cfd54c4d0e49eaf2e4d39b86597
+DIST genpatches-6.1-109.base.tar.xz 5540948 BLAKE2B b6fdb5f6641ca8617c976f69bb731147ae1d1d24f1da6686ac8cc2a1a9775c2a3c890c24609042617b9397a9abdf9abd6806fa5933e215de1dad6d0f67277a5e SHA512 e2f0837a9b5588df44a1936dc5dce2c1aeddf1d56795600513aa22a08195da4c358935e7d347ec09d4d25aa5db6c5a036e7a718bfc442796c4994736c6dc4daa
+DIST genpatches-6.1-109.experimental.tar.xz 17444 BLAKE2B c2c6122a6f009ab002c0f4b887f60bbb89c543e813e456fedf013cc984a8429df591b89c9168348c6436aa2516694630329f06ec8a6257f1d529a3ba17641193 SHA512 8181c0b8ad84ff5b40c848bf4eb934218795003caab65ee4be6de4af413433d7ba6b30af86868e7066da07e69670b58b363cf9613fea83d27d748774385824e2
+DIST genpatches-6.1-109.extras.tar.xz 4052 BLAKE2B 562d5137c87031ff9f43b4d081b26b35cf4bd3c5fe074ee826edc8ece2ed074eeecf55c8914ca728267a9f78d907a51354c3688186d442d9fc02340224a0c71e SHA512 0370a5cfd83a1c87828396e49f003b29fc68dea1568f6de417fe488aaf045e349f0b84695f3643ad9811b4f57ef31237ffb9a97c72294139aba94557e1f67a18
 DIST genpatches-6.1-99.base.tar.xz 5167668 BLAKE2B 0dfd80fa50e373b99b3ec8c2adcc80eabaa0df9606831465c2afbca34cc195f41902a5ad4472b822eb2e011356c51b257a39294ae1d123c7384f915bd0a6249a SHA512 39116b71b7da155596a158ebb1aeafb029bf5c0d1ec983efbbdb323af61fc505c3a67beac4e6f888b3b673cdc271ef1dbc3090580aa89f573a652ebe0d501ccf
 DIST genpatches-6.1-99.experimental.tar.xz 17444 BLAKE2B efc5c844d978f3478776e27faffc45a72745dcb14757963a57beacd3dec248f96600d3680592d7c1913cb7b6d05e5316490286d3a4467bf9f18260b69e2594b5 SHA512 b56195fc9a6b0ff5f20f46247ad7e61c45c278cbdc6c3cafb32984d6fb5eac5b35d21412ad2966c562e90b6f9a4057beb5cd19a47b05eb856f7c477dbcbbbf12
 DIST genpatches-6.1-99.extras.tar.xz 3848 BLAKE2B aaa18ac05550c0694e3a8051e41acbf7b135d593dbbe2ebf8f757996502d1721e96cf11edb5ae87337667f340640ee1ca55de0a8266b4a2fc929dc80065df746 SHA512 0528cbbeb530d0765af843db8479ab6ce011df60be5c3bdc913c81f1299868f772e9d751b973edd75d7020cef7ac0f5645528e50b87f4ae59fac2392cf86137d
@@ -54,6 +57,9 @@ DIST genpatches-6.6-45.extras.tar.xz 4048 BLAKE2B dd86fb162ed81abf47e1fe88e238d6
 DIST genpatches-6.6-46.base.tar.xz 2606596 BLAKE2B f8b284a798b7f734ae39e8ac349598f8a7ac0902dd66264c1de754fc43c275e8e785097f9ad479e63cab0705bc9c8f917b91fdb4acf196fc9e032675d2dd72d7 SHA512 d7b62bb4c570b5fcccbdb27ab0da65c2309038d3ac31ccbf48df0ac32ef057b52046ad502ba02ec6c0cb4f3ac2e6ac0d4f97ced6adb85c96a89f31881a34b848
 DIST genpatches-6.6-46.experimental.tar.xz 5752 BLAKE2B 92189f3b2b6750ac9135c149575be7090ec2559d0ffd6b57f73cefe9316d50dc93b82fa2c62e0f67bbfb8f229cec8bf8a1a6f4f3e1280a7ba8d69b4251dcc65e SHA512 f280306e4307eaae03e35bd3933c923e3b9ddffe86aa92a8772c8509bed89ce1550f9f26413f02c4b60da7024cba74b8fb5baab5f95b8106bef67b4e584dcf4d
 DIST genpatches-6.6-46.extras.tar.xz 4048 BLAKE2B 235f71efef27116556f2d7b6e7bd8c9ffcbfbc798fe87a59d69f672094830b13fa0e6ceb900eacc5ca250e92cfb410998af70939df9317c76f6291e2446020c9 SHA512 10f0f98d2c5a63371f8225e677f3e12a2e4f54b892dd6f64f3ed0c7cb8956671dc4bced0128d66bc0f2e61e1cb3c590a9d43270237d8457c2825cff1b8e236e1
+DIST genpatches-6.6-47.base.tar.xz 2606912 BLAKE2B 9ab2547e43d9d17ce67824dbb5eacfd25d1c0ea314c440d925b53a89362f47d9d1ffe853b12bb3fcd3761745306914678b33261e56c4df2ebfe3ce65035ccc61 SHA512 109d430209ab4f02428ccd6357047742da383791a3ada574ddfb6a25f28dd0df1b0a376a895e0c624a7da4d34519ba895992c7cf7e3c83c03f6f7f8cb9ed787f
+DIST genpatches-6.6-47.experimental.tar.xz 5752 BLAKE2B 2fa4ec93f8502c6c10edc865c7448457b783cb09c6354e2b7c73e061830e05a59183553083e9165255f058b2e6806fba1104839e8968a4dabbe664aa16acb53e SHA512 13089e9bda61438d693f4ddae556744c622e8a61285c23c4ffac25f7d681e44fa47931512397a534bce6094d3082ea470f8665539ee12c776d616de76edc3533
+DIST genpatches-6.6-47.extras.tar.xz 4052 BLAKE2B 8cb744f165c0ebb88d4a8eb097c6f45c550d6eb984fa06902980c7276863fb6b5b7c1e760a9f6904f58178977f7e10a12626a20f83df4a2121379a26d1182ca7 SHA512 9f7c53624e9ca9bad3f36a114b3da3aa5d3c1a7c92bfb85d862814900303a58d2a6280a9ab9a0c3f342930a1354b579e94cf5eecbb379d31c7666925c1ae9cfd
 DIST genpatches-6.9-10.base.tar.xz 602768 BLAKE2B 614634ed1d1132be830e91a13dc509022a6a476b678f63dd4f3c428e7c37eec46f47a32f927f3895ff65a6ab5b046a3b0ca2df88a94678f898292d0970859734 SHA512 7826d46d8faaf64fb268f8dc940621f434f8729e706b4178adac2a2c353bccd854e5fea6c3489d5d0c48d469d6f6e26befa01d5a0deaba48f3e6140eb096de5e
 DIST genpatches-6.9-10.experimental.tar.xz 79916 BLAKE2B 40eea12d03fc985ddf4a1d8112a72e7afe246f6c043747ead7e326a35d866f329ab0325c3f49dcb404ddfa311c285daa2af80dafae26dec9ed5195a8f13a98ce SHA512 e960c163cd364d149acc4abfd7f8663ce67e23eab8e68d8a4ba4e77e0ed8bc0bbb8c939db570a196a33ccbfba5c50abc30c12c83f25ed0b2121c10196a389bcf
 DIST genpatches-6.9-10.extras.tar.xz 4052 BLAKE2B 607bede5f0c3d38f72fba841861caf6f90e7f0068373d951a6aa21a29cb7523bcd6faeeb5602c6a7395a802d35e657aaee1172582ecddd0c4143fc21ea9c4b3c SHA512 b9e59d200cb06ea3287557e1ca1cf7116df61019f423fa8149195d36d7d2b143265341bef5430c4f761b0926ad823775cb2c83c852d22dc4acdb0d9628da12bc
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.99.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.99.ebuild
new file mode 100644
index 000000000000..b8b9018c9b63
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.99.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="109"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="experimental"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.6.40.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.40.ebuild
new file mode 100644
index 000000000000..cd382a01d864
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.6.40.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="47"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="experimental"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}