9 files changed, 134 insertions, 131 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 622a936f9d0f..34c50ae44b2f 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest
index 141e057a3a6e..98bdccb60e0a 100644
--- a/media-sound/gigedit/Manifest
+++ b/media-sound/gigedit/Manifest
@@ -1,6 +1,4 @@
-DIST gigedit-1.2.0.tar.bz2 1174502 BLAKE2B 049e4c60b345c192255669a71588df1e2905590f95351d8a79134b210d03087ac9cc33f12cbf2e38208b95ad452f299c78877632989cd914d98a05c5967087d5 SHA512 b991a5193af34be70db6eb8c18fc58e01b822b6997bfc6c3ee06eca42f57375d341316e8abc594824668c7cb916b0643a1ee1b5c34426bf3ec5e202dfc565c8f
 DIST gigedit-1.2.1.tar.bz2 935868 BLAKE2B b448650a6200fd0f87d636518a61ef5a98601c0a6627e4a2cfd8658ad67c5f4f17b64f1913bb7b77d59874018ca24aceb590862dfc0b343a7111f50f357557b2 SHA512 f70b1887ea66acc26e8a1becabb424e66ee2dcdc726805b0e2f42fa28b5ff1a54e7b6bab8808ce84a02bcf8ea1aea13ab2cd891848d9bcc711944dcd312509b2
-EBUILD gigedit-1.2.0-r1.ebuild 1025 BLAKE2B 22cca2f1656e37e4ec48f6041d5d8d351a89c0faeec0aeb67d5de45b109e82fd6b74d7551e3a1d15b589a42f728e269d62cf091374d30619ad7f51faf035abf8 SHA512 4152161ec8cddaf658ddc0129f566258fc9cf43dd0ee69f56b2acf119baffff702e0bec6fcad45ff47781db0e6e471ac933f6aa42bb85d801e54c2813ca11941
-EBUILD gigedit-1.2.1.ebuild 1034 BLAKE2B d445631dbd484017d05a266ea8eabc0e0901109070178cb2719cf218a1aaf602a9d9549e56fa150824b61bd9a671e81a2d56958d91171bbe8692988c3184cb2e SHA512 d3a650a473ca9e494533bd107457924c2a9e7ef1866a364b314d67b20b4a2676469138be6115f0611786e37f8b78b278588b76670a43d3353da053e78b0961f6
+EBUILD gigedit-1.2.1.ebuild 1033 BLAKE2B 58765d7b00728e80267ec3ae983f7f50089259816df80fa9531c11a141cbd5f085f73518f31fb7db43ea12410fb064865cf330b79fceff9471c8244437bcfbb4 SHA512 73b519fc278bb32601f4110ce60e77d67f92fc76b32be2d54db2d2feeaf71c3e673d9f7887f413e06af2f5948ea86413db1d94f23d2a3035fee02ad7efee15f6
 EBUILD gigedit-9999.ebuild 1012 BLAKE2B 2e4386c35e558f128522add58d14b4422c20d166038ccb987ae51410b54a4c7684dfb7323b7a50062c6f5021ffbb94531fbd1219bcaf4cac1a0846ceb6fcc91b SHA512 a3eaad8a7e4c7cd524d16b6255601a3078ddd9f38977fd0ffd2c6ca9321bd59e717e26fdce844ed0856ae88876c2ebbe44344ceecaf4cb9c7cef04cac211ceaa
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/gigedit/gigedit-1.2.0-r1.ebuild b/media-sound/gigedit/gigedit-1.2.0-r1.ebuild
deleted file mode 100644
index fe1b62b19a5c..000000000000
--- a/media-sound/gigedit/gigedit-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic xdg
-
-DESCRIPTION="An instrument editor for gig files"
-HOMEPAGE="http://www.linuxsampler.org/"
-SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	dev-cpp/gtkmm:3.0
-	media-libs/libgig
-	media-libs/libsndfile
-	media-sound/linuxsampler"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	# docdir is not propagated there
-	sed -i '/docdir/d' doc/quickstart/Makefile.am || die
-	# file missing in pot file
-	echo src/gigedit/ScriptPatchVars.cpp >> "po/POTFILES.in" || die
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/linuxsampler"
-	econf --disable-static
-}
-
-src_install() {
-	default
-	make_desktop_entry gigedit GigEdit "" "AudioVideo;AudioVideoEditing"
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-sound/gigedit/gigedit-1.2.1.ebuild b/media-sound/gigedit/gigedit-1.2.1.ebuild
index a7e97b76e928..c6ed06ab1936 100644
--- a/media-sound/gigedit/gigedit-1.2.1.ebuild
+++ b/media-sound/gigedit/gigedit-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-cpp/gtkmm:3.0
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 4fe0846f1ffe..ba5ad421f7fa 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,9 +1,7 @@
 AUX linuxsampler-2.0.0-lv2-automagic.patch 929 BLAKE2B 11e2dac74d6e4bc76385544f9cfbf60defe7c3fdcac0f3e943c54dfc38e152df3beb71c5453c7e1df126a3415aa9ea9d75b2abba80efbbf65e64b10388f195c4 SHA512 4d7204b567e578efb3370e11ae69c631c49b01e864c7fb59d6eed309c7ff9ad9d2aa7832ef233f4c5b8e6a26af06c2d9d239cb361d69966e2556cb2816415de2
 AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
 AUX linuxsampler-2.1.1-fix-yyterror-not-declared.patch 427 BLAKE2B 017c8fd7e7343eb582a5fcbf083be3fa9fcb02fff69caace767534ee509215a835caf548cce73955295c39a6a42409e0caf3ec3e5752018235ccf2defe327b0f SHA512 6a89d17600eab3aac9b9a90899c441af1359b7798fe79ceed4e3acb624024e6285e56210b484f50fc03dfd7da4def2cfdb708adfd0526d84d9b041256fd6f4e6
-DIST linuxsampler-2.2.0.tar.bz2 1507276 BLAKE2B 9650938d0aace876e817884121b824713dd2f747505344d7895e7d99da62f2214fb4c4bf43c398f4e486202e23e7a57288e19734e8c565a917d823169deb717a SHA512 9015bb8d3af125e13c5c2ef3ae2d3987f7b7dda72e238cff25e622a3291019f5e392195dd27e7e783c70d877d9b267915fc443369eb17117e5eb7c54b8496c68
 DIST linuxsampler-2.3.0.tar.bz2 1267738 BLAKE2B 5f9e7bf2f6c0bfe8131cc04d79b3df5c08c16c7332315e5ff39c16aa3565f88bc3a58b63db4162c8e2f4430ae1a091c928cecba2385fc181f6c7b46a72c4ae88 SHA512 5a59e3443ee6d3056fc274386ae222e7db72a8c6e316a1c39c5d631bae86ec6a61745b20e594cf569c10f5a6bd6eb0d09b3956cce67072175ff60a770a4b7e5b
-EBUILD linuxsampler-2.2.0.ebuild 1755 BLAKE2B 71636eb48c83fe919b39b44136719b70408a5fa67f6b70f6a3e8be46b70951638f241da5647138eb34dda5f5379893b9f540f7a561cfaad91d43fa85550ba6b7 SHA512 58efe835ece28e1e1c840bb968167c3af67273fc2f3f2c5d5a705aceca514019210411805a1bf3e4a56ec25ebcc119629635d557bdd1b58ddda3f9abb8075361
 EBUILD linuxsampler-2.3.0.ebuild 1750 BLAKE2B 6747892f94b9e9cbc5b043dd3460fc3e611381957a4cd57e4edd27982ee6575fe9e358fd6b8e137177dfc248a184487bcff8986d24b59c052d580b329fef251d SHA512 0003ef928550d063af2b9e0ab96e2606e1ae3160cf4f2a50bafb6505562336763213cd91721dd9d0341f720edff31adc56da3282cd24433a40bef0d215fba95c
 EBUILD linuxsampler-9999.ebuild 1571 BLAKE2B 2282aa2f4a4496826a8e300070bebcb11f332ec6c9c7212cd4c59b5b2ff730e936efc50f131bf53828d827c37ec77d2bb734d649e6a56ed39d0b5ae8c27cf087 SHA512 bbb722c6629f2476737630c30401b7f14391643627619b73554576862e7d33d3836cb3747178a66a64bc7978473c3b9795c07d2e8cc3434d7b639c4fe645aeea
 MISC metadata.xml 392 BLAKE2B 4dad0ff3f6c461c9672da1cee3f37f78720a0d5dda462c385d96759e9adcf39367c6fba4a010793881aeb75efb4f0a78fae0e4acad2d82b2512deadc324307a5 SHA512 f3f5a5a0ed00efffbe1287e8014a1291d436c35fb03bff17c70ba23836b2a858fee9a9749ebeda9bf48b759c2f57553a8eb639751f99f60704e15e7cc5ca208c
diff --git a/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild b/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
deleted file mode 100644
index d02d83715759..000000000000
--- a/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Software audio sampler engine with professional grade features"
-HOMEPAGE="https://www.linuxsampler.org/"
-SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="alsa doc jack lv2 sf2 sqlite"
-REQUIRED_USE="|| ( alsa jack )"
-
-RDEPEND="
-	media-libs/libgig
-	media-libs/libsndfile[-minimal]
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	lv2? ( media-libs/lv2 )
-	sqlite? ( dev-db/sqlite )
-"
-DEPEND="${RDEPEND}
-	media-libs/dssi
-	media-libs/ladspa-sdk
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-nptl-hardened.patch"
-	"${FILESDIR}/${PN}-2.0.0-lv2-automagic.patch"
-	"${FILESDIR}/${PN}-2.1.1-fix-yyterror-not-declared.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	default
-	# Force regeneration of the file to let it build with all bison
-	# versions, bug #556204
-	rm src/network/lscpparser.cpp || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-arts-driver
-		--disable-static
-		$(use_enable alsa alsa-driver)
-		$(use_enable jack jack-driver)
-		$(use_enable lv2)
-		$(use_enable sqlite instruments-db)
-		$(use_enable sf2 sf2-engine)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# bug #666738
-	emake -j1
-	use doc && emake docs
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	# lscp files conflict with nilfs-utils, bug #556330
-	mv "${D}/usr/bin/lscp" "${D}/usr/bin/lscp-${PN}" || die
-	mv "${D}/usr/share/man/man1/lscp.1" "${D}/usr/share/man/man1/lscp-${PN}.1" || die
-}
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 5b24bca8f275..14519d010469 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,4 +1,5 @@
 DIST strawberry-1.0.23.tar.xz 11297440 BLAKE2B 4110a19ac27a254ec778bc46592f4b1b00ea8cb077a231d5dc0bb69c8ef78aca02a15339b888812c7cb31540f61647e2c8b15d416c68c4da4690407ac851dec4 SHA512 f3249e97b2f0130dadf2a5fcfc128d7054accd6b86cf088a3a45549c584529aefbadaf09e9ed074af85c679495b03ad700e78f6952e913a40b38eaf7c77d5adb
+EBUILD strawberry-1.0.23-r1.ebuild 3293 BLAKE2B 1f79c549d984c610ecd2dc7c3f0c82fd4f57381dda5cabd41946ec9a237ae24c2d165e8d42c8ed1b552fc34bb272599ff20edc693b0c0256568876f58ed54589 SHA512 f58ba5fec1957adec1e869227dca67e5cf4342a0045bb50c807425e08fd3b74225d628f6842ff522506be025fe32c7d906c6d79a6b8e3fdb1de0e0ebbcdf036f
 EBUILD strawberry-1.0.23.ebuild 3042 BLAKE2B 6b91de595b351e4eac774aeae042b3753bf77fbd7ae126f6ddfcf98470f513bf62ecd71e5f186e7116110f06f61d1a6cd854a9c3f51d19deed9233814d807d42 SHA512 a29598ebcaac8a56ae5480a8545b6ca7ec6dbcd193273a8b2ea3f76de08f80cf4f22a7c0abaa413e6bd6aad3860d74532ef60e523ab172922cc55e05ce14d545
 EBUILD strawberry-9999.ebuild 3044 BLAKE2B ac6d5bd75207a1e25fafaae64f23e00086f45568bdc777a2a2ec925814485d681203d75ef7a33d170d0c4a19bc55a19df8a6d9542665140dde0c5a9555cdc987 SHA512 d864e9d29034f6c0605ffbde348e64235216e6656363b5e11d28b49411e26084d5acf1ea601f0120a0facbd10169472909f95acfdfe9cee3933dba469ded61e0
-MISC metadata.xml 473 BLAKE2B 87bfc0758ce3a886e370384baf5bf4832c0e94f27a1789bce62c73f69c8f6ceda5c2cf36295412b751ae55aeb7c5c52f695e96b363e72d91f4019fe4a81af945 SHA512 88779d17c969b36adc7cc1ead94940643e1842e081d5c370c9190da1bbe1b0b152211d249a1b06d99a9638930a44e48e54a89c6b4139793cb23bcaf136e24813
+MISC metadata.xml 520 BLAKE2B 4ccf0012addc2359fcfd904dff7298e6e98bce0c4eac1bb008ff20b7365157ecf21618e97935215bf2a9486391c43e11995720d26b487a08dffc81215e95c589 SHA512 f705eba2dbd7cc207feff8546cf6105c9f4d73ec759e1fe93ba71f5e394e811ced3943413b774a1784c739fc5e1f1bb13e34378d3266eed6650205f1f15e32c4
diff --git a/media-sound/strawberry/metadata.xml b/media-sound/strawberry/metadata.xml
index aab0f751f907..c5351200e084 100644
--- a/media-sound/strawberry/metadata.xml
+++ b/media-sound/strawberry/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> backend</flag>
 		<flag name="moodbar">Enable moodbar support</flag>
+		<flag name="soup">Enable soup support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">jonaski/strawberry</remote-id>
diff --git a/media-sound/strawberry/strawberry-1.0.23-r1.ebuild b/media-sound/strawberry/strawberry-1.0.23-r1.ebuild
new file mode 100644
index 000000000000..e074219d1e18
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.0.23-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic plocale xdg
+
+PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda debug +gstreamer icu ipod moodbar mtp pulseaudio qt6 soup +udisks vlc"
+
+BDEPEND="
+	!qt6? ( dev-qt/linguist-tools:5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/protobuf:=
+	media-libs/alsa-lib
+	media-libs/taglib
+	!qt6? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)
+	qt6? (
+		dev-qt/qtbase[concurrent,dbus,gui,network,ssl,sql,sqlite,widgets]
+		dev-qt/kdsingleapplication[qt6]
+	)
+	cdda? ( dev-libs/libcdio:= )
+	gstreamer? (
+		media-libs/chromaprint:=
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	icu? ( dev-libs/icu:= )
+	ipod? ( media-libs/libgpod )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( media-libs/libmtp )
+	pulseaudio? ( media-libs/libpulse )
+	vlc? ( media-video/vlc )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? (
+		media-plugins/gst-plugins-meta:1.0
+		soup? ( media-plugins/gst-plugins-soup:1.0 )
+		media-plugins/gst-plugins-taglib:1.0
+	)
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/gtest
+	dev-libs/boost
+	!qt6? ( dev-qt/qttest:5 )
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	cdda? ( gstreamer )
+	|| ( gstreamer vlc )
+"
+
+src_prepare() {
+	plocale_find_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(plocale_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
+		-DUSE_ICU="$(usex icu)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
+		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_VLC="$(usex vlc)"
+		-DBUILD_WITH_QT6="$(usex qt6)"
+		-DBUILD_WITH_QT5="$(usex !qt6)"
+		-DQT_VERSION_MAJOR="$(usex qt6 6 5)"
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use gstreamer ; then
+		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+		elog "depending on your preferences"
+	fi
+}