commit: dda6c61790f0781c8954410f0085dacfa2abd21a Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Sun Aug 21 22:10:35 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Sep 14 06:08:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dda6c617
media-sound/clementine: version 1.4.0_rc2 Closes: https://bugs.gentoo.org/865939 Bug: https://bugs.gentoo.org/829307 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/26952 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-sound/clementine/Manifest | 1 + ...ine-9999.ebuild => clementine-1.4.0_rc2.ebuild} | 40 ++++++++-------------- media-sound/clementine/clementine-9999.ebuild | 40 ++++++++-------------- 3 files changed, 31 insertions(+), 50 deletions(-) diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest index 8f8f85717952..2c93e95fd8ee 100644 --- a/media-sound/clementine/Manifest +++ b/media-sound/clementine/Manifest @@ -1 +1,2 @@ +DIST clementine-1.4.0_rc2.tar.gz 9073685 BLAKE2B a2376f1a895c651c2eb089419e20b9ce6050739f1342a6fdf1ebad0a14b65a08f56cc846eb79ad7facb77d6ee2cac74f9e374bd8e284a2a7f87d7c117779a08d SHA512 403093386efabd52e649c0e379abbf4873c4b2f8d0af72cda2b7e0255f90c60259f961045e7b51d0e5bf35425d678ff6b018c9191845ebbd156d9216d8bd7722 DIST clementine-1.4.0rc1.tar.xz 5593564 BLAKE2B 894d86903df1ba43fca2f07c83d92bcb5d65a0103a4ecd1b321d44259534930c977f0caeaf0c93446dbec4422937f2ddc7f665daa7cb41e5c183fa7f16571809 SHA512 c74102a3ca4a99c3627b718389478e5ca79ba71ce45eccd232ca2eb3fb60a1632afa62908a2831244d6c35154ad6a8b4fa2b2485b4440b9685a0521bfacaabdb diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-1.4.0_rc2.ebuild similarity index 85% copy from media-sound/clementine/clementine-9999.ebuild copy to media-sound/clementine/clementine-1.4.0_rc2.ebuild index 3e4023b68ccd..8ae86de1f1b4 100644 --- a/media-sound/clementine/clementine-9999.ebuild +++ b/media-sound/clementine/clementine-1.4.0_rc2.ebuild @@ -1,36 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt" +HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"; PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW" inherit cmake flag-o-matic plocale virtualx xdg -MY_P="${P/_}" if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"; inherit git-r3 else - S="${WORKDIR}/${P/_}" - SRC_URI_BASE="https://github.com/clementine-player/${PN^}"; - COMMIT="" - if [[ -n "${COMMIT}" ]] ; then - SRC_URI="${SRC_URI_BASE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN^}-${COMMIT}" - elif [[ $(ver_cut 3) -gt 90 ]] ; then - SRC_URI="${SRC_URI_BASE}/archive/${PV}.tar.gz -> ${P}.tar.gz" - else - SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz" - fi + S="${WORKDIR}/Clementine-${PV/_}" + SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi -DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt" -HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"; LICENSE="GPL-3" SLOT="0" -IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" +IUSE="alsa box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" RESTRICT="!test? ( test )" REQUIRED_USE=" @@ -49,11 +40,9 @@ BDEPEND=" ) " COMMON_DEPEND=" - app-crypt/qca:2[qt5(+)] - dev-db/sqlite:= + dev-db/sqlite:3 dev-libs/crypto++:= dev-libs/glib:2 - dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 @@ -61,19 +50,20 @@ COMMON_DEPEND=" dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib - virtual/glu x11-libs/libX11 + alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) - moodbar? ( sci-libs/fftw:3.0 ) + moodbar? ( sci-libs/fftw:3.0= ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= @@ -91,9 +81,10 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND} dev-libs/boost + dev-libs/libxml2 dev-qt/qtopengl:5 - dev-qt/qtx11extras:5 dev-qt/qtxml:5 + virtual/glu box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) @@ -131,7 +122,6 @@ src_configure() { # avoid automagically enabling of ccache (bug #611010) -DCCACHE_EXECUTABLE=OFF -DENABLE_BREAKPAD=OFF #< disable crash reporting - -DENABLE_DEVICEKIT=OFF -DENABLE_GIO=ON -DENABLE_SPOTIFY_BLOB=OFF -DUSE_SYSTEM_GMOCK=ON @@ -162,7 +152,7 @@ src_configure() { src_test() { cd "${CMAKE_BUILD_DIR}" || die - virtx emake test + virtx cmake_build clementine_test } pkg_postinst() { diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild index 3e4023b68ccd..8ae86de1f1b4 100644 --- a/media-sound/clementine/clementine-9999.ebuild +++ b/media-sound/clementine/clementine-9999.ebuild @@ -1,36 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt" +HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"; PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW" inherit cmake flag-o-matic plocale virtualx xdg -MY_P="${P/_}" if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"; inherit git-r3 else - S="${WORKDIR}/${P/_}" - SRC_URI_BASE="https://github.com/clementine-player/${PN^}"; - COMMIT="" - if [[ -n "${COMMIT}" ]] ; then - SRC_URI="${SRC_URI_BASE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN^}-${COMMIT}" - elif [[ $(ver_cut 3) -gt 90 ]] ; then - SRC_URI="${SRC_URI_BASE}/archive/${PV}.tar.gz -> ${P}.tar.gz" - else - SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz" - fi + S="${WORKDIR}/Clementine-${PV/_}" + SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi -DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt" -HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"; LICENSE="GPL-3" SLOT="0" -IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" +IUSE="alsa box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" RESTRICT="!test? ( test )" REQUIRED_USE=" @@ -49,11 +40,9 @@ BDEPEND=" ) " COMMON_DEPEND=" - app-crypt/qca:2[qt5(+)] - dev-db/sqlite:= + dev-db/sqlite:3 dev-libs/crypto++:= dev-libs/glib:2 - dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 @@ -61,19 +50,20 @@ COMMON_DEPEND=" dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib - virtual/glu x11-libs/libX11 + alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) - moodbar? ( sci-libs/fftw:3.0 ) + moodbar? ( sci-libs/fftw:3.0= ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= @@ -91,9 +81,10 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND} dev-libs/boost + dev-libs/libxml2 dev-qt/qtopengl:5 - dev-qt/qtx11extras:5 dev-qt/qtxml:5 + virtual/glu box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) @@ -131,7 +122,6 @@ src_configure() { # avoid automagically enabling of ccache (bug #611010) -DCCACHE_EXECUTABLE=OFF -DENABLE_BREAKPAD=OFF #< disable crash reporting - -DENABLE_DEVICEKIT=OFF -DENABLE_GIO=ON -DENABLE_SPOTIFY_BLOB=OFF -DUSE_SYSTEM_GMOCK=ON @@ -162,7 +152,7 @@ src_configure() { src_test() { cd "${CMAKE_BUILD_DIR}" || die - virtx emake test + virtx cmake_build clementine_test } pkg_postinst() {
