From b9ef7cab6264f1838672efbbcb4ba3b3abd5323f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Dec 2017 09:14:02 +0000 Subject: gentoo resync : 09.12.2017 --- media-sound/clementine/Manifest | 4 +- media-sound/clementine/clementine-1.3.1-r6.ebuild | 180 --------------------- .../clementine/clementine-1.3.1_p20171113.ebuild | 2 +- ...ine-1.3.1-add-missing-functional-includes.patch | 51 ------ 4 files changed, 2 insertions(+), 235 deletions(-) delete mode 100644 media-sound/clementine/clementine-1.3.1-r6.ebuild delete mode 100644 media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch (limited to 'media-sound/clementine') diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest index 0dfd8cd69cd0..f22ed8a93b47 100644 --- a/media-sound/clementine/Manifest +++ b/media-sound/clementine/Manifest @@ -1,5 +1,4 @@ AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db134710f5aaf62c4e8105ab1b8ab0e69a0953b6177fb91dd89fcdcf5493dfc1e634f51658eea9f050689aa1e219dbd8db189 SHA512 4f520dcd4937634ebf5bb814ec64267d42473886fc5abd4924ac551bbae8ecc7643ddbacd9e2f9a5b0d8c7b0f67cf5aec420b5eb73162b248cbf6b3eafafbbd8 -AUX clementine-1.3.1-add-missing-functional-includes.patch 1377 BLAKE2B f409b81e27e99f2580f63c9940ef3f90212bc3d2d5e9fab2fc0b9a477c7bb283313d6e6c65efb1e6dfe40e547c6c0924c9363a93703da4116ec5b93a5b940f64 SHA512 bea6fa8d7213404e1d048ec866cbc6d8b60ce7ff76af7f8c2bbc2c89959f478ff3201ddf072691c3e4d5c007e2ea8ad5c07150076920516f82ae1956b1be4075 AUX clementine-1.3.1-chromaprint14.patch 1535 BLAKE2B 8253b27b759f8675d2d2368cc9ac4b220ae93770f7c09c5b290a3d29c1c58cba0ea8f32db061afbc902d5276238b141ef13c16b8fb8e379bca53a02bd115cb6c SHA512 21ceda98534e4fe7f860d869cf83387e6c2a5c4c1a0db75c29dc8c9de18a3a117cebcfb98ea816723370009dc08e1804ec2b46c118e657eb293fb45d1fba2601 AUX clementine-1.3.1-fix-desktop-file.patch 1488 BLAKE2B 45bd063f49868988bf5b37fbd3dd12f10f265e5f2309f68fa8a3ae8d3d903dddcbbf13755160c1da36db0cde105bb6ea3c441da89b67b79cc510449a8bdea9fa SHA512 55a787a63da9b1b4970e794d95233b22d704ff591e32cfc6c9b73023289e58a4cce2f2a43ec8186beb2feffe44b3cffa6b50f015a41cab5bba559087a868e826 AUX clementine-1.3.1-libechonest_removal.patch 23130 BLAKE2B 245fc8d2747bd3e3d65a8141e298e1e518b3857581297dcc35ef64bd38c43b11743be6f7fadbe1a01cab90d077f97dd9b16f50acab195ee06de65548083bcf05 SHA512 44f28096567d48446fdd5769d91e32d3987f121e04f8f8fec956892c3a42693863cd5c9ab878e88c0477353fd369a005047c04e5da4661c701ab85103893947a @@ -7,7 +6,6 @@ AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195 DIST clementine-1.3.1.tar.gz 8501827 SHA256 f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c SHA512 1942a046be24a583b5e2095dd39dc736c1b14a47dc4aad61d6252c1fccf745c26d7b35da907a220d5dc8c0736f5b589d050ed9582de343aa3cb5abc607001790 WHIRLPOOL 20a57177dc740865f35c407b981e146d9ddec6aff39e662a27dfe0e238f3baa87b331cc6dc50eebf848279c8860fb74454b4997924e2d4d93357a870364af1a7 DIST clementine-1.3.1_p20171113.tar.gz 8467904 SHA256 d0393deefe4cf385ef793935272169871be4080e03687251005385a7a19ea3e4 SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674 WHIRLPOOL 81580f4d1bdcec406e646c6121533089645234962aa16aaa4ea706e56b672cf01b10836514db05ed0007ca1eb0de11ebd69c6e1131d3e42589e91c45a9e15f11 EBUILD clementine-1.3.1-r5.ebuild 4962 BLAKE2B 061ffdab9f81560d33ba90271056824999d17b3219f3cd4fbea6e4cfa08435045172f3bd4f10bce3a98d4b89c647ee66fb63209fed2826d914494d45231603a6 SHA512 f1815b573a1e921d257a7f64579bb42f7cdf1e6d67075d4b490c71c4fe508c579ba3aedbd7a4e54df96dcdcdcf5e2e4de87067cf56433574ae7ba19e21d0785c -EBUILD clementine-1.3.1-r6.ebuild 5297 BLAKE2B 656fcbfaec471e5adb07bd569be65e721142cc81e4b20d1defb177477b21b9edb9dad2cdf7a2b20284c4602996184002e4d397646da7205708ddbb133df6381d SHA512 1edef30b329ad8b40c2b1ac53311fc02cb3e98f435cb8a412398f3484ae7bc897c691b4238685f19e75969bb6511d5193091644d9fdb25226775e4fce92f3370 -EBUILD clementine-1.3.1_p20171113.ebuild 4799 BLAKE2B 62f5799342dadfcce6fabca227d870e815c17e1b5e17227a699474b12fbbe6825b84ea1d8b03e4b44acbbaa0ecf022923ec80ee3b996688c494635f35cc74a7d SHA512 f34627e95778005ccc7b70827a2b5b87225e662c7034c242569e31a1bca0627dae6dc2817ff9921346f357f3b91507012979c2cf9b74a685d253d3a066017f6c +EBUILD clementine-1.3.1_p20171113.ebuild 4798 BLAKE2B dc4b86304c368b73f845645e050a944ba2d71915939784a41b36ae0ff0bd762a60ba71383d202fd46c62316f311a5c479b5c1f232ba9d8666b9d4311ce59abeb SHA512 4157bdd624dcf2e610af240051865aa88f4128730eeb62e5e725ce10022bc9c1f85978fe631ccffc2a4ae9706b23646f8b4de93d73c22ebc3e2f299f3d0a839f EBUILD clementine-9999.ebuild 5193 BLAKE2B aad0efc0d126ff29ccf3211db65be57bcba02fa24d8b4c682ad95e6001d9aea33ca12e47e52d66a7cdb627930545cb72f35416b50c7110aeb66c8843da721119 SHA512 6ec8c6e0a28f53326752500fbd4a1e247127d0ac720df94e93c15868ee5a7ce25e51651a58126b8acb57bb0b6c3150c0d38be202644648dae9d054c49bfe881b MISC metadata.xml 1537 BLAKE2B e63db763bbd9c013dd426a710bfb042335faf01f5cc8b3321a4e698e41313ba6994c059502e3f2113eaa3216d519c9f1a0b5a7467cecb27da94cd59d21bbe453 SHA512 cf5beb80417c4099a43e7f19bb06112159af557f17ce9c0da1226f5ee41cebc8e94c2c2aa6349d140ee291608d39511477a0aa54e586d11a52bc3f697283da3f diff --git a/media-sound/clementine/clementine-1.3.1-r6.ebuild b/media-sound/clementine/clementine-1.3.1-r6.ebuild deleted file mode 100644 index 13b223ccee98..000000000000 --- a/media-sound/clementine/clementine-1.3.1-r6.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 xdg-utils gnome2-utils virtualx -[[ ${PV} == *9999* ]] && inherit git-r3 - -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" -[[ ${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 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/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/gtest-1.8.0 - 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 - "${FILESDIR}"/${P}-chromaprint14.patch #603662 - "${FILESDIR}"/${P}-libechonest_removal.patch - "${FILESDIR}"/${P}-add-missing-functional-includes.patch #618214 -) - -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_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 - # avoid automagically enabling of ccache (bug #611010) - -DCCACHE_EXECUTABLE=OFF - # see https://github.com/clementine-player/Clementine/issues/5591 - -DENABLE_VK=OFF - ) - - 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() { - xdg_desktop_database_update - gnome2_icon_cache_update - - elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " - elog "USE flags. You may be intrested in setting aac, flac, mp3, ogg or wavpack USE flags " - elog "depending on your preferences" -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild index 598e7b1a0f6e..8522d19cb629 100644 --- a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild +++ b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P} LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" REQUIRED_USE=" diff --git a/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch b/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch deleted file mode 100644 index e480212b883b..000000000000 --- a/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001 -From: Morris Hafner -Date: Mon, 13 Feb 2017 17:46:46 +0100 -Subject: [PATCH] Add missing includes (#5630) - ---- - src/core/mergedproxymodel.cpp | 1 + - src/devices/giolister.cpp | 1 + - src/library/groupbydialog.cpp | 2 ++ - 3 files changed, 4 insertions(+) - -diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp -index 56217f6..8c210d3 100644 ---- a/src/core/mergedproxymodel.cpp -+++ b/src/core/mergedproxymodel.cpp -@@ -23,6 +23,7 @@ - - #include - -+#include - #include - - // boost::multi_index still relies on these being in the global namespace. -diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp -index aa3bddb..5f63ef2 100644 ---- a/src/devices/giolister.cpp -+++ b/src/devices/giolister.cpp -@@ -17,6 +17,7 @@ - - #include "config.h" - -+#include - #include - - #include -diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp -index 5efdc9f..e5f711b 100644 ---- a/src/library/groupbydialog.cpp -+++ b/src/library/groupbydialog.cpp -@@ -20,6 +20,8 @@ - - #include - -+#include -+ - // boost::multi_index still relies on these being in the global namespace. - using std::placeholders::_1; - using std::placeholders::_2; --- -2.10.2 - -- cgit v1.2.3