From 48ec80ce6a8390b35b974e495091fc662d55553e Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Sat, 17 Sep 2016 22:45:46 +0300 Subject: media-sound/clementine: update dependencies upon media-libs/libmygpo-qt - depend on >=media-libs/libmygpo-qt-1.0.9 for recent clementine - update dependencies upon media-libs/libmygpo-qt to require qt4 if it optional. - also do the same for echonest in stable ebuilds. Thanks to Diogo Pereira for correcting the libechonest dependence. Closes: https://github.com/gentoo/gentoo/pull/2350 --- media-sound/clementine/clementine-1.2.3-r2.ebuild | 4 +- media-sound/clementine/clementine-1.2.3.ebuild | 4 +- media-sound/clementine/clementine-1.3.1-r3.ebuild | 169 ---------------------- media-sound/clementine/clementine-1.3.1-r4.ebuild | 169 ++++++++++++++++++++++ media-sound/clementine/clementine-9999.ebuild | 2 +- 5 files changed, 174 insertions(+), 174 deletions(-) delete mode 100644 media-sound/clementine/clementine-1.3.1-r3.ebuild create mode 100644 media-sound/clementine/clementine-1.3.1-r4.ebuild (limited to 'media-sound/clementine') diff --git a/media-sound/clementine/clementine-1.2.3-r2.ebuild b/media-sound/clementine/clementine-1.2.3-r2.ebuild index 0f889539aca0..7b9e87137853 100644 --- a/media-sound/clementine/clementine-1.2.3-r2.ebuild +++ b/media-sound/clementine/clementine-1.2.3-r2.ebuild @@ -42,8 +42,8 @@ COMMON_DEPEND=" dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson - media-libs/libechonest:= - >=media-libs/libmygpo-qt-1.0.7 + media-libs/libechonest:=[qt4(+)] + >=media-libs/libmygpo-qt-1.0.7[qt4(+)] >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 diff --git a/media-sound/clementine/clementine-1.2.3.ebuild b/media-sound/clementine/clementine-1.2.3.ebuild index fa386706c018..7c4c9565e9a1 100644 --- a/media-sound/clementine/clementine-1.2.3.ebuild +++ b/media-sound/clementine/clementine-1.2.3.ebuild @@ -42,8 +42,8 @@ COMMON_DEPEND=" dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson - media-libs/libechonest:= - >=media-libs/libmygpo-qt-1.0.7 + media-libs/libechonest:=[qt4(+)] + >=media-libs/libmygpo-qt-1.0.7[qt4(+)] >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 diff --git a/media-sound/clementine/clementine-1.3.1-r3.ebuild b/media-sound/clementine/clementine-1.3.1-r3.ebuild deleted file mode 100644 index d0baf97ed2ef..000000000000 --- a/media-sound/clementine/clementine-1.3.1-r3.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" - -LANGS=" af ar be bg bn br bs ca cs cy da de el 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 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-utils flag-o-matic fdo-mime gnome2-utils virtualx -[[ ${PV} == *9999* ]] && inherit git-r3 - -DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4" -HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine" -[[ ${PV} == *9999* ]] || \ -SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~x86" -IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote" -IUSE+="${LANGS// / linguas_}" - -REQUIRED_USE=" - udisks? ( dbus ) - wiimote? ( dbus ) -" - -COMMON_DEPEND=" - dev-db/sqlite:= - >=dev-libs/glib-2.24.1-r1 - dev-libs/libxml2 - dev-libs/protobuf:= - dev-libs/qjson - >=dev-qt/qtcore-4.5:4[ssl] - >=dev-qt/qtgui-4.5:4 - >=dev-qt/qtopengl-4.5:4 - >=dev-qt/qtsql-4.5:4 - >=media-libs/chromaprint-0.6 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-libs/libechonest:=[qt4] - >=media-libs/libmygpo-qt-1.0.8 - >=media-libs/taglib-1.8[mp4(+)] - sys-libs/zlib - dev-libs/crypto++ - virtual/glu - virtual/opengl - x11-libs/libX11 - cdda? ( dev-libs/libcdio ) - dbus? ( >=dev-qt/qtdbus-4.5:4 ) - ipod? ( >=media-libs/libgpod-0.8.0 ) - lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) - mtp? ( >=media-libs/libmtp-1.0.0 ) - moodbar? ( sci-libs/fftw:3.0 ) - projectm? ( media-libs/glew:= - >=media-libs/libprojectm-1.2.0 ) -" -# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; -# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches: -# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches -# Still possibly essential but not applied yet patches are: -# 06-fix-numeric-locale.patch -# 08-stdlib.h-for-rand.patch -RDEPEND="${COMMON_DEPEND} - dbus? ( udisks? ( sys-fs/udisks:0 ) ) - mms? ( media-plugins/gst-plugins-libmms:1.0 ) - mtp? ( gnome-base/gvfs[mtp] ) - media-plugins/gst-plugins-meta:1.0 - media-plugins/gst-plugins-soup:1.0 - media-plugins/gst-plugins-taglib:1.0 -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.39:= - virtual/pkgconfig - sys-devel/gettext - dev-qt/qttest:4 - dev-cpp/gmock - amazoncloud? ( dev-cpp/sparsehash ) - box? ( dev-cpp/sparsehash ) - dropbox? ( dev-cpp/sparsehash ) - googledrive? ( dev-cpp/sparsehash ) - pulseaudio? ( media-sound/pulseaudio ) - skydrive? ( dev-cpp/sparsehash ) - test? ( gnome-base/gsettings-desktop-schemas ) -" -DOCS=( Changelog README.md ) - -MY_P="${P/_}" -[[ ${PV} == *9999* ]] || \ -S="${WORKDIR}/${MY_P^}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch - "${FILESDIR}"/${P}-fix-desktop-file.patch -) - -src_prepare() { - cmake-utils_src_prepare - - # some tests fail or hang - sed -i \ - -e '/add_test_file(translations_test.cpp/d' \ - tests/CMakeLists.txt || die -} - -src_configure() { - local langs x - for x in ${LANGS}; do - use linguas_${x} && langs+=" ${x}" - done - - # spotify is not in portage - local mycmakeargs=( - -DBUILD_WERROR=OFF - -DLINGUAS="${langs}" - -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)" - -DENABLE_AUDIOCD="$(usex cdda)" - -DENABLE_DBUS="$(usex dbus)" - -DENABLE_DEVICEKIT="$(usex udisks)" - -DENABLE_LIBGPOD="$(usex ipod)" - -DENABLE_LIBLASTFM="$(usex lastfm)" - -DENABLE_LIBMTP="$(usex mtp)" - -DENABLE_MOODBAR="$(usex moodbar)" - -DENABLE_GIO=ON - -DENABLE_WIIMOTEDEV="$(usex wiimote)" - -DENABLE_VISUALISATIONS="$(usex projectm)" - -DENABLE_BOX="$(usex box)" - -DENABLE_DROPBOX="$(usex dropbox)" - -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" - -DENABLE_LIBPULSE="$(usex pulseaudio)" - -DENABLE_SKYDRIVE="$(usex skydrive)" - -DENABLE_VK="$(usex vkontakte)" - -DENABLE_SPOTIFY_BLOB=OFF - -DENABLE_BREAKPAD=OFF #< disable crash reporting - -DUSE_BUILTIN_TAGLIB=OFF - -DUSE_SYSTEM_GMOCK=ON - -DUSE_SYSTEM_PROJECTM=ON - -DBUNDLE_PROJECTM_PRESETS=OFF - # force to find crypto++ see bug #548544 - -DCRYPTOPP_LIBRARIES="crypto++" - -DCRYPTOPP_FOUND=ON - ) - - use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT - - cmake-utils_src_configure -} - -src_test() { - cd "${CMAKE_BUILD_DIR}" || die - virtx emake test -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-sound/clementine/clementine-1.3.1-r4.ebuild b/media-sound/clementine/clementine-1.3.1-r4.ebuild new file mode 100644 index 000000000000..ed118c2e4001 --- /dev/null +++ b/media-sound/clementine/clementine-1.3.1-r4.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" + +LANGS=" af ar be bg bn br bs ca cs cy da de el 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 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-utils flag-o-matic fdo-mime gnome2-utils virtualx +[[ ${PV} == *9999* ]] && inherit git-r3 + +DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4" +HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine" +[[ ${PV} == *9999* ]] || \ +SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +[[ ${PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~x86" +IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote" +IUSE+="${LANGS// / linguas_}" + +REQUIRED_USE=" + udisks? ( dbus ) + wiimote? ( dbus ) +" + +COMMON_DEPEND=" + dev-db/sqlite:= + >=dev-libs/glib-2.24.1-r1 + dev-libs/libxml2 + dev-libs/protobuf:= + dev-libs/qjson + >=dev-qt/qtcore-4.5:4[ssl] + >=dev-qt/qtgui-4.5:4 + >=dev-qt/qtopengl-4.5:4 + >=dev-qt/qtsql-4.5:4 + >=media-libs/chromaprint-0.6 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + media-libs/libechonest:=[qt4(+)] + >=media-libs/libmygpo-qt-1.0.9[qt4(+)] + >=media-libs/taglib-1.8[mp4(+)] + sys-libs/zlib + dev-libs/crypto++ + virtual/glu + virtual/opengl + x11-libs/libX11 + cdda? ( dev-libs/libcdio ) + dbus? ( >=dev-qt/qtdbus-4.5:4 ) + ipod? ( >=media-libs/libgpod-0.8.0 ) + lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) + mtp? ( >=media-libs/libmtp-1.0.0 ) + moodbar? ( sci-libs/fftw:3.0 ) + projectm? ( media-libs/glew:= + >=media-libs/libprojectm-1.2.0 ) +" +# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; +# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches: +# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches +# Still possibly essential but not applied yet patches are: +# 06-fix-numeric-locale.patch +# 08-stdlib.h-for-rand.patch +RDEPEND="${COMMON_DEPEND} + dbus? ( udisks? ( sys-fs/udisks:0 ) ) + mms? ( media-plugins/gst-plugins-libmms:1.0 ) + mtp? ( gnome-base/gvfs[mtp] ) + media-plugins/gst-plugins-meta:1.0 + media-plugins/gst-plugins-soup:1.0 + media-plugins/gst-plugins-taglib:1.0 +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/boost-1.39:= + virtual/pkgconfig + sys-devel/gettext + dev-qt/qttest:4 + dev-cpp/gmock + amazoncloud? ( dev-cpp/sparsehash ) + box? ( dev-cpp/sparsehash ) + dropbox? ( dev-cpp/sparsehash ) + googledrive? ( dev-cpp/sparsehash ) + pulseaudio? ( media-sound/pulseaudio ) + skydrive? ( dev-cpp/sparsehash ) + test? ( gnome-base/gsettings-desktop-schemas ) +" +DOCS=( Changelog README.md ) + +MY_P="${P/_}" +[[ ${PV} == *9999* ]] || \ +S="${WORKDIR}/${MY_P^}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch + "${FILESDIR}"/${P}-fix-desktop-file.patch +) + +src_prepare() { + cmake-utils_src_prepare + + # some tests fail or hang + sed -i \ + -e '/add_test_file(translations_test.cpp/d' \ + tests/CMakeLists.txt || die +} + +src_configure() { + local langs x + for x in ${LANGS}; do + use linguas_${x} && langs+=" ${x}" + done + + # spotify is not in portage + local mycmakeargs=( + -DBUILD_WERROR=OFF + -DLINGUAS="${langs}" + -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)" + -DENABLE_AUDIOCD="$(usex cdda)" + -DENABLE_DBUS="$(usex dbus)" + -DENABLE_DEVICEKIT="$(usex udisks)" + -DENABLE_LIBGPOD="$(usex ipod)" + -DENABLE_LIBLASTFM="$(usex lastfm)" + -DENABLE_LIBMTP="$(usex mtp)" + -DENABLE_MOODBAR="$(usex moodbar)" + -DENABLE_GIO=ON + -DENABLE_WIIMOTEDEV="$(usex wiimote)" + -DENABLE_VISUALISATIONS="$(usex projectm)" + -DENABLE_BOX="$(usex box)" + -DENABLE_DROPBOX="$(usex dropbox)" + -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" + -DENABLE_LIBPULSE="$(usex pulseaudio)" + -DENABLE_SKYDRIVE="$(usex skydrive)" + -DENABLE_VK="$(usex vkontakte)" + -DENABLE_SPOTIFY_BLOB=OFF + -DENABLE_BREAKPAD=OFF #< disable crash reporting + -DUSE_BUILTIN_TAGLIB=OFF + -DUSE_SYSTEM_GMOCK=ON + -DUSE_SYSTEM_PROJECTM=ON + -DBUNDLE_PROJECTM_PRESETS=OFF + # force to find crypto++ see bug #548544 + -DCRYPTOPP_LIBRARIES="crypto++" + -DCRYPTOPP_FOUND=ON + ) + + use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT + + cmake-utils_src_configure +} + +src_test() { + cd "${CMAKE_BUILD_DIR}" || die + virtx emake test +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild index d12f8ba02643..c3cd5393d8a3 100644 --- a/media-sound/clementine/clementine-9999.ebuild +++ b/media-sound/clementine/clementine-9999.ebuild @@ -42,7 +42,7 @@ COMMON_DEPEND=" >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 - >=media-libs/libmygpo-qt-1.0.8 + >=media-libs/libmygpo-qt-1.0.9[qt4(+)] >=media-libs/taglib-1.8[mp4(+)] sys-libs/zlib dev-libs/crypto++ -- cgit v1.2.3-65-gdbad