gentoo resync : 20.10.2021

3 files changed, 132 insertions, 3 deletions

diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index e5c6af5a650a..5457603aa19e 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,4 +1,6 @@
 DIST strawberry-0.9.3.tar.xz 10928116 BLAKE2B 3edb80065876d63b79292c6b75660aaaeaa6ea294bb84011124fa8aee3163717b8ab4f0e8d6e7aff321466d3cfbc214b5e8b987c9ae9b0823f8d3c681aae6e9e SHA512 d253ffaa6cf0412eb135bc792c31458816fc0a1ae7070d6885487da4fb4855ffeeeeddd285b853fd10220c797c3beb73a91059514d76b1b1638350fdff17107c
+DIST strawberry-1.0.0.tar.xz 11149316 BLAKE2B db500acb75c1e206c7eb2b5b668fc850444da8383ea98926e05d3eaee46a477f9b7c24017c75a1ea8d0ac8d89287a137aa65ef9098527b0449e3b5b14e37fa9e SHA512 e7f03eb068bd2de22b83b0bdd493dabbbe054bb0f7d3f4d237ff38955e382a13d7c42f60c9a257c906ded46567b6f4ca9139920291df8a7688fb4025cdfec488
 EBUILD strawberry-0.9.3.ebuild 2936 BLAKE2B 9fcac1154c3e5531cfd8ac2739c16034ddfa85336775cf1d6f18d49dd4d2f23b604e7224642349c7c2f88f78c596fdfb09ead197ad255cb60665c113d627b614 SHA512 ac75150dcb913b7f9c6ad3a34cb6362584268aadb890f89bf73fb432fcd7dd3b8c997c61c24afed01f76e37c2dc2eb53ae1b6157448bb0398de7ac1cbcb2363c
-EBUILD strawberry-9999.ebuild 2938 BLAKE2B f79e21f451040357b84c61a94662c00b672c2d8d85bceb1ea249eaa9860f903d43bbc5047c750a22980ae0291b17d8eaf1398162b06252903786f7f5a963601a SHA512 1a2d5dad2ce62f4bf3330b736fce01c0edd82ba221aee3e2ccb0f3781962e9216ddb5682fd7b01d76ff9bf770086e4fa0c64cbaa10fe7f73a9e2205022d5bf38
+EBUILD strawberry-1.0.0.ebuild 2986 BLAKE2B 51c17f06060909737f468d1f3d94757a2c29dd3147f0c5146ba45354783eebb13d90f9dd271d0c8c7241b1a97e637dbbc9e9eeb8ef5f2d58e33590a45e3752e6 SHA512 acffcdd97fbf71b254918ee836653d0088c702138dcd71df4a88de0dc880308819aa1f62d9cb6dea2c449a7783e8756b5c508b689a94cb498861abe1f0251abe
+EBUILD strawberry-9999.ebuild 2986 BLAKE2B 51c17f06060909737f468d1f3d94757a2c29dd3147f0c5146ba45354783eebb13d90f9dd271d0c8c7241b1a97e637dbbc9e9eeb8ef5f2d58e33590a45e3752e6 SHA512 acffcdd97fbf71b254918ee836653d0088c702138dcd71df4a88de0dc880308819aa1f62d9cb6dea2c449a7783e8756b5c508b689a94cb498861abe1f0251abe
 MISC metadata.xml 532 BLAKE2B 92c28967a4c323a7fa04309336fb52f7625701cbf965828ace4359452801ed36683e4fc20e7fc6f691d0cdb56bc027fc5ff758233c3f8a7aac214f36c8565b70 SHA512 569814f4eee1fd43e75e5ddfd7935b7d503b6127a2d3c276237e5237d9de571b18037484893d05dc44c5ba95ae9ac2f95d6715c5280f0da37443f16972b4e627
diff --git a/media-sound/strawberry/strawberry-1.0.0.ebuild b/media-sound/strawberry/strawberry-1.0.0.ebuild
new file mode 100644
index 000000000000..b79659cf7e03
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.0.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic plocale virtualx xdg
+
+PLOCALES="cs de es fr hu id it ko nb pl ru sv"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawbs.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/libxml2
+	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
+	media-libs/alsa-lib
+	>=media-libs/chromaprint-1.4:=
+	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	>=media-libs/taglib-1.11.1_p20181028
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	pulseaudio? ( media-sound/pulseaudio )
+	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-1.8.0
+	dev-libs/boost
+	dev-qt/qtopengl:5
+	dev-qt/qttest:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	|| ( 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)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-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 ccbe95c4a8c1..b79659cf7e03 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake flag-o-matic plocale virtualx xdg
 
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
 	media-libs/alsa-lib
-	media-libs/chromaprint:=
+	>=media-libs/chromaprint-1.4:=
 	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
 	>=media-libs/taglib-1.11.1_p20181028
 	sys-libs/zlib
@@ -106,6 +106,7 @@ src_configure() {
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_VLC="$(usex vlc)"
+		# Disable until we have qt6 in the tree
 		-DWITH_QT6=OFF
 	)