[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/

[Andreas Sturmlechner]

commit:     59544c24457e02d1767f2efe70ae1b407bfc381d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 17:53:24 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 18:02:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59544c24

media-sound/clementine: Add 1.3.1_p20180319 snapshot bump

Using new liblastfm5 headers location.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/clementine/Manifest                      |  1 +
 ...9999.ebuild => clementine-1.3.1_p20180319.ebuild} | 20 ++++----------------
 media-sound/clementine/clementine-9999.ebuild        | 14 +-------------
 3 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 9d0e502c185..c0358b6dd38 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1,3 @@
 DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B 
bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a
 SHA512 
39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
 DIST clementine-1.3.1_p20180314.tar.gz 8486396 BLAKE2B 
978651924c50ee3669f82a51f98978869103edac3f7f7cfef372dc1f1483caa2f543d9d626a4552647acaeabb4f329a69cb5c76d8c6e9b8d605de2f86025344c
 SHA512 
5c21540a91dae9f0db336947552548e44eec80fc9e6ebf95cbca3d2ab60cd096be963aec105f0c8d72d2628777cb6628e4a7e50f54a3edbcc22708c59f620e4a
+DIST clementine-1.3.1_p20180319.tar.gz 8488685 BLAKE2B 
2f4c412f9274a8957584bbc2d6482144fd6892adc629cdc0aeb750d592d8e4e62ad5b7bbb56288ecb993a9f5221b54e47e18c3f2b76c7a80670ead37ba5be3b0
 SHA512 
bbe288ca654ad0ed36abca288187abe452524e8fec23839973ff3f1d61ce479a979cbc45edcba10d6d15ff9baaaa23e95bb7e6d31a0090ca8e32bd547114e1ec

diff --git a/media-sound/clementine/clementine-9999.ebuild 
b/media-sound/clementine/clementine-1.3.1_p20180319.ebuild
similarity index 88%
copy from media-sound/clementine/clementine-9999.ebuild
copy to media-sound/clementine/clementine-1.3.1_p20180319.ebuild
index 16065b58a5a..d1601b41048 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20180319.ebuild
@@ -11,11 +11,11 @@ if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git";
        GIT_ECLASS="git-r3"
 else
-       
SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz 
-> ${P}.tar.gz"
+       COMMIT=804168edc74d7230a84e8937e2ea9a3b1ad2e9c2
+       
SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~amd64 ~x86"
-       S="${WORKDIR}/${MY_P^}"
 fi
-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils 
${GIT_ECLASS}
+inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils 
${GIT_ECLASS} vcs-snapshot
 unset GIT_ECLASS
 
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and 
Qt"
@@ -55,7 +55,7 @@ COMMON_DEPEND="
        cdda? ( dev-libs/libcdio:= )
        dbus? ( dev-qt/qtdbus:5 )
        ipod? ( >=media-libs/libgpod-0.8.0 )
-       lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )
+       lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
        moodbar? ( sci-libs/fftw:3.0 )
        mtp? ( >=media-libs/libmtp-1.0.0 )
        projectm? (
@@ -115,14 +115,6 @@ src_prepare() {
                sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
                cmake_comment_add_subdirectory tests
        fi
-
-       # Fix clementine relying on downstream renaming of lastfm header dir
-       sed -i -e "/^#include/s/lastfm5/lastfm/" \
-               tests/albumcoverfetcher_test.cpp \
-               
src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \
-               src/core/song.cpp || die "Failed to sed lastfm header suffix"
-       sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \
-               -i CMakeLists.txt || die "Failed to sed lastfm header suffix"
 }
 
 src_configure() {
@@ -170,10 +162,6 @@ src_test() {
        virtx emake test
 }
 
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
 pkg_postinst() {
        xdg_desktop_database_update
        gnome2_icon_cache_update

diff --git a/media-sound/clementine/clementine-9999.ebuild 
b/media-sound/clementine/clementine-9999.ebuild
index 16065b58a5a..6b168f373bf 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -55,7 +55,7 @@ COMMON_DEPEND="
        cdda? ( dev-libs/libcdio:= )
        dbus? ( dev-qt/qtdbus:5 )
        ipod? ( >=media-libs/libgpod-0.8.0 )
-       lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )
+       lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
        moodbar? ( sci-libs/fftw:3.0 )
        mtp? ( >=media-libs/libmtp-1.0.0 )
        projectm? (
@@ -115,14 +115,6 @@ src_prepare() {
                sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
                cmake_comment_add_subdirectory tests
        fi
-
-       # Fix clementine relying on downstream renaming of lastfm header dir
-       sed -i -e "/^#include/s/lastfm5/lastfm/" \
-               tests/albumcoverfetcher_test.cpp \
-               
src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \
-               src/core/song.cpp || die "Failed to sed lastfm header suffix"
-       sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \
-               -i CMakeLists.txt || die "Failed to sed lastfm header suffix"
 }
 
 src_configure() {
@@ -170,10 +162,6 @@ src_test() {
        virtx emake test
 }
 
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
 pkg_postinst() {
        xdg_desktop_database_update
        gnome2_icon_cache_update