gentoo auto-resync : 02:07:2023 - 11:30:05

6 files changed, 126 insertions, 39 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index adb8fd5b6948..b18aa494bd26 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index f9f10e9d4564..30ccdae656ee 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,7 +1,5 @@
-DIST abcMIDI-2023.03.24.zip 623602 BLAKE2B 69c5bfa58fbded0cddb01dc405dcb0cc682182a42f40ae8acb8e5bc90ef6b0b9b5ffb13cb77dbe4634007d478e08b34839d62e5fae4deda73137720c5af794c4 SHA512 c552b4e515a9d2110adb3f4c460b2dbefb04cd16ebc2aa96ca452328988e502dcaa5cb933b3471f207a03a7ffb99b0a8f33118a347928aac8c8aca741582a513
 DIST abcMIDI-2023.05.30.zip 623737 BLAKE2B e8e9b36f7385f4de6e292ef7ba1f55c9e19e3fea6d4de811a049e66f0d4e452cf4ad29fe62795767eb70847d75e8ea299b457c54b9aef7dd9ac1fd24f15a8548 SHA512 aded10ae9f7f09f4424a6faf01588ccb2224f5371f0e481417c1e0cb4dd5273c65ee7478c2e099fc91f721def1cd31ff9b332548c849cc22494cc579b22be783
 DIST abcMIDI-2023.06.25.zip 623842 BLAKE2B bc50ef0b1ed8507ea2c3a1bb67920f052eb0f45236f75a8640aef02693790a74298c4b20305509b94ce6c698b99b8a796d7a174f02677df7efc0f1bea2e9acf0 SHA512 1f2c337e66a4072f0693260b3ff3caaa6ba7b7082566f7619966c794686c00915ad412c7c007bb839085ce54cb9cd860bbdf9fb1d3e8e58667c32cf1838866e3
-EBUILD abcmidi-2023.03.24.ebuild 676 BLAKE2B 31477b1343585fb2359f83e9bd3073bf381e7c3c58f72255acc221eccb88f56cb8b1312a50a11ebb1d7d922b237743f144178f524cc1bd02d421cefc6afedbcd SHA512 a0a9665494091ae1f38cd72327ab1b6544af3a9368b3c42ca57d23f9370af0f5469db1cc46d2ac0aefd0dc44a91e807249d7ea8b62ad98ba7c339bb75470eaf0
 EBUILD abcmidi-2023.05.30.ebuild 676 BLAKE2B 31477b1343585fb2359f83e9bd3073bf381e7c3c58f72255acc221eccb88f56cb8b1312a50a11ebb1d7d922b237743f144178f524cc1bd02d421cefc6afedbcd SHA512 a0a9665494091ae1f38cd72327ab1b6544af3a9368b3c42ca57d23f9370af0f5469db1cc46d2ac0aefd0dc44a91e807249d7ea8b62ad98ba7c339bb75470eaf0
 EBUILD abcmidi-2023.06.25.ebuild 678 BLAKE2B e80a5b9b4ab2b6b2f3a9100a759875547a3971d443d876db558a5abf5a323eb29f03cf318bd6ac2abb429648955d67cfee9bcdbaa43f13bacd2654ec6d1eef72 SHA512 3a687ee6c926bda64ab5b99d072505c88b949dab46b44fa7b34a002eceb8c9394eedd64def057d5ed99fc06b26776d519a88f77821dcd0ab4ca7f97dbafbc2d7
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2023.03.24.ebuild b/media-sound/abcmidi/abcmidi-2023.03.24.ebuild
deleted file mode 100644
index 3ca144cfe9f4..000000000000
--- a/media-sound/abcmidi/abcmidi-2023.03.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	sed -i "s:-O2::" configure.ac || die
-	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 105304ce66e6..8a82417aaa41 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,4 +1,6 @@
 DIST strawberry-1.0.17.tar.xz 11244908 BLAKE2B ad838be23bbf441e1617ccc45e48e54baa829f327fccfc8f3070fd211eaaaa00d690cecef36858f91b59a1114c4df84c9b72b98ec3affb56f9516167d6fb8484 SHA512 7629997f1734b537057b8e49ed443c48733ce5787ebf79939c77aa07f193d36e5ced15df62c03b784644fc058b3067d46e192a0de0cc9fb0a2338dc76d738973
+DIST strawberry-1.0.18.tar.xz 11241608 BLAKE2B 5fae022302bfba1ab9bf01e8af7bd8b18a7eb2bce536b965458a04056479541e24648aa9ed70177aca968acf68471cada06b7879db71d770b965d38e4b6f5dfa SHA512 3a4c38198ac71384bfadb336b77fb316009836340fe763a7fc00c7d084ca219797512f30fe8487a086ca37860c707c661865eea00a89f6d8058c063380ed7a94
 EBUILD strawberry-1.0.17.ebuild 3081 BLAKE2B 3a14c7500566e9c00fb42ab2997b590162cabdefbf23aaa10a358ff294b6d2561b42a67229fc336b5f806035c8e8b368b36f35b61ef90c3d8a8d4a776c17ff4d SHA512 d0767dfd5c4e941a9b0ecf351e04764003a2ecd44d5d41c4e5a7230ec3257a399c29e2a123ff8f5bb92d89603d9bf5ad275d4f794dd769aab05cf19832171d29
-EBUILD strawberry-9999.ebuild 3073 BLAKE2B 9b06f96fe01e164fda396fdb6a1f18aa71d2ac18a420e09d233541c56f29da0236e0660c5d40165366625aad2f339f4a858dfd0f161b3b6c3d70e3d1c28cd251 SHA512 ee63854ba9c986d7f619d7a7452e09ce7102efe288f6b175ef3628b34397fb39105ad7f56a0b01fced069c07b9cad11b8b77a576098d483b9d60a7a26e32d9aa
+EBUILD strawberry-1.0.18.ebuild 3080 BLAKE2B 21232e1c567c55e0e702f7db638595be0edfe0fa14d1267ecb7b2510696c8387c278914c5b67f70bbfc971742c1875765f0170dd454e3cd5c0b40ae2a6c88e10 SHA512 689951341ad4299e447383e007b8c3da5b1ed0613acf0b3ff9c2cc736e9407a5d593b4abe0330bc81d4cc9104c2b9fd03943ca55192d282dc221f88064061d03
+EBUILD strawberry-9999.ebuild 3080 BLAKE2B 21232e1c567c55e0e702f7db638595be0edfe0fa14d1267ecb7b2510696c8387c278914c5b67f70bbfc971742c1875765f0170dd454e3cd5c0b40ae2a6c88e10 SHA512 689951341ad4299e447383e007b8c3da5b1ed0613acf0b3ff9c2cc736e9407a5d593b4abe0330bc81d4cc9104c2b9fd03943ca55192d282dc221f88064061d03
 MISC metadata.xml 473 BLAKE2B 87bfc0758ce3a886e370384baf5bf4832c0e94f27a1789bce62c73f69c8f6ceda5c2cf36295412b751ae55aeb7c5c52f695e96b363e72d91f4019fe4a81af945 SHA512 88779d17c969b36adc7cc1ead94940643e1842e081d5c370c9190da1bbe1b0b152211d249a1b06d99a9638930a44e48e54a89c6b4139793cb23bcaf136e24813
diff --git a/media-sound/strawberry/strawberry-1.0.18.ebuild b/media-sound/strawberry/strawberry-1.0.18.ebuild
new file mode 100644
index 000000000000..d228a9e4d370
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.0.18.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2023 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 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda debug +gstreamer icu ipod moodbar mtp pulseaudio +udisks vlc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/protobuf:=
+	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
+	media-libs/alsa-lib
+	media-libs/taglib
+	x11-libs/libX11
+	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
+		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
+	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)"
+		# Disable until we have qt6 in the tree
+		-DWITH_QT6=OFF
+	)
+
+	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
+}
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index bb7e0e2f1956..d228a9e4d370 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"