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

From:	Andreas Sturmlechner <asturm@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/
Date:	Thu, 22 Mar 2018 18:02:46
Message-Id:	`1521741744.59544c24457e02d1767f2efe70ae1b407bfc381d.asturm@gentoo`

1

commit:     59544c24457e02d1767f2efe70ae1b407bfc381d

2

Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>

3

AuthorDate: Thu Mar 22 17:53:24 2018 +0000

4

Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>

5

CommitDate: Thu Mar 22 18:02:24 2018 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59544c24

7

8

media-sound/clementine: Add 1.3.1_p20180319 snapshot bump

9

10

Using new liblastfm5 headers location.

11

12

Package-Manager: Portage-2.3.24, Repoman-2.3.6

13

14

 media-sound/clementine/Manifest                      |  1 +

15

 ...9999.ebuild => clementine-1.3.1_p20180319.ebuild} | 20 ++++----------------

16

 media-sound/clementine/clementine-9999.ebuild        | 14 +-------------

17

 3 files changed, 6 insertions(+), 29 deletions(-)

18

19

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest

20

index 9d0e502c185..c0358b6dd38 100644

21

--- a/media-sound/clementine/Manifest

22

+++ b/media-sound/clementine/Manifest

23

@@ -1,2 +1,3 @@

24

 DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674

25

 DIST clementine-1.3.1_p20180314.tar.gz 8486396 BLAKE2B 978651924c50ee3669f82a51f98978869103edac3f7f7cfef372dc1f1483caa2f543d9d626a4552647acaeabb4f329a69cb5c76d8c6e9b8d605de2f86025344c SHA512 5c21540a91dae9f0db336947552548e44eec80fc9e6ebf95cbca3d2ab60cd096be963aec105f0c8d72d2628777cb6628e4a7e50f54a3edbcc22708c59f620e4a

26

+DIST clementine-1.3.1_p20180319.tar.gz 8488685 BLAKE2B 2f4c412f9274a8957584bbc2d6482144fd6892adc629cdc0aeb750d592d8e4e62ad5b7bbb56288ecb993a9f5221b54e47e18c3f2b76c7a80670ead37ba5be3b0 SHA512 bbe288ca654ad0ed36abca288187abe452524e8fec23839973ff3f1d61ce479a979cbc45edcba10d6d15ff9baaaa23e95bb7e6d31a0090ca8e32bd547114e1ec

27

28

diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-1.3.1_p20180319.ebuild

29

similarity index 88%

30

copy from media-sound/clementine/clementine-9999.ebuild

31

copy to media-sound/clementine/clementine-1.3.1_p20180319.ebuild

32

index 16065b58a5a..d1601b41048 100644

33

--- a/media-sound/clementine/clementine-9999.ebuild

34

+++ b/media-sound/clementine/clementine-1.3.1_p20180319.ebuild

35

@@ -11,11 +11,11 @@ if [[ ${PV} == *9999* ]]; then

36

 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"

37

 	GIT_ECLASS="git-r3"

38

 else

39

-	SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"

40

+	COMMIT=804168edc74d7230a84e8937e2ea9a3b1ad2e9c2

41

+	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"

42

 	KEYWORDS="~amd64 ~x86"

43

-	S="${WORKDIR}/${MY_P^}"

44

fi

45

-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS}

46

+inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} vcs-snapshot

47

 unset GIT_ECLASS

48

49

 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"

50

@@ -55,7 +55,7 @@ COMMON_DEPEND="

51

 	cdda? ( dev-libs/libcdio:= )

52

 	dbus? ( dev-qt/qtdbus:5 )

53

 	ipod? ( >=media-libs/libgpod-0.8.0 )

54

-	lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )

55

+	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )

56

 	moodbar? ( sci-libs/fftw:3.0 )

57

 	mtp? ( >=media-libs/libmtp-1.0.0 )

58

 	projectm? (

59

@@ -115,14 +115,6 @@ src_prepare() {

60

 		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die

61

 		cmake_comment_add_subdirectory tests

62

fi

63

-

64

-	# Fix clementine relying on downstream renaming of lastfm header dir

65

-	sed -i -e "/^#include/s/lastfm5/lastfm/" \

66

-		tests/albumcoverfetcher_test.cpp \

67

-		src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \

68

-		src/core/song.cpp || die "Failed to sed lastfm header suffix"

69

-	sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \

70

-		-i CMakeLists.txt || die "Failed to sed lastfm header suffix"

71

}

72

73

 src_configure() {

74

@@ -170,10 +162,6 @@ src_test() {

75

 	virtx emake test

76

}

77

78

-pkg_preinst() {

79

-	gnome2_icon_savelist

80

-}

81

-

82

 pkg_postinst() {

83

 	xdg_desktop_database_update

84

 	gnome2_icon_cache_update

85

86

diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild

87

index 16065b58a5a..6b168f373bf 100644

88

--- a/media-sound/clementine/clementine-9999.ebuild

89

+++ b/media-sound/clementine/clementine-9999.ebuild

90

@@ -55,7 +55,7 @@ COMMON_DEPEND="

91

 	cdda? ( dev-libs/libcdio:= )

92

 	dbus? ( dev-qt/qtdbus:5 )

93

 	ipod? ( >=media-libs/libgpod-0.8.0 )

94

-	lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )

95

+	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )

96

 	moodbar? ( sci-libs/fftw:3.0 )

97

 	mtp? ( >=media-libs/libmtp-1.0.0 )

98

 	projectm? (

99

@@ -115,14 +115,6 @@ src_prepare() {

100

 		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die

101

 		cmake_comment_add_subdirectory tests

102

fi

103

-

104

-	# Fix clementine relying on downstream renaming of lastfm header dir

105

-	sed -i -e "/^#include/s/lastfm5/lastfm/" \

106

-		tests/albumcoverfetcher_test.cpp \

107

-		src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \

108

-		src/core/song.cpp || die "Failed to sed lastfm header suffix"

109

-	sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \

110

-		-i CMakeLists.txt || die "Failed to sed lastfm header suffix"

111

}

112

113

 src_configure() {

114

@@ -170,10 +162,6 @@ src_test() {

115

 	virtx emake test

116

}

117

118

-pkg_preinst() {

119

-	gnome2_icon_savelist

120

-}

121

-

122

 pkg_postinst() {

123

 	xdg_desktop_database_update

124

 	gnome2_icon_cache_update

1	commit: 59544c24457e02d1767f2efe70ae1b407bfc381d
2	Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3	AuthorDate: Thu Mar 22 17:53:24 2018 +0000
4	Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5	CommitDate: Thu Mar 22 18:02:24 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59544c24
7
8	media-sound/clementine: Add 1.3.1_p20180319 snapshot bump
9
10	Using new liblastfm5 headers location.
11
12	Package-Manager: Portage-2.3.24, Repoman-2.3.6
13
14	media-sound/clementine/Manifest \| 1 +
15	...9999.ebuild => clementine-1.3.1_p20180319.ebuild} \| 20 ++++----------------
16	media-sound/clementine/clementine-9999.ebuild \| 14 +-------------
17	3 files changed, 6 insertions(+), 29 deletions(-)
18
19	diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
20	index 9d0e502c185..c0358b6dd38 100644
21	--- a/media-sound/clementine/Manifest
22	+++ b/media-sound/clementine/Manifest
23	@@ -1,2 +1,3 @@
24	DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
25	DIST clementine-1.3.1_p20180314.tar.gz 8486396 BLAKE2B 978651924c50ee3669f82a51f98978869103edac3f7f7cfef372dc1f1483caa2f543d9d626a4552647acaeabb4f329a69cb5c76d8c6e9b8d605de2f86025344c SHA512 5c21540a91dae9f0db336947552548e44eec80fc9e6ebf95cbca3d2ab60cd096be963aec105f0c8d72d2628777cb6628e4a7e50f54a3edbcc22708c59f620e4a
26	+DIST clementine-1.3.1_p20180319.tar.gz 8488685 BLAKE2B 2f4c412f9274a8957584bbc2d6482144fd6892adc629cdc0aeb750d592d8e4e62ad5b7bbb56288ecb993a9f5221b54e47e18c3f2b76c7a80670ead37ba5be3b0 SHA512 bbe288ca654ad0ed36abca288187abe452524e8fec23839973ff3f1d61ce479a979cbc45edcba10d6d15ff9baaaa23e95bb7e6d31a0090ca8e32bd547114e1ec
27
28	diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-1.3.1_p20180319.ebuild
29	similarity index 88%
30	copy from media-sound/clementine/clementine-9999.ebuild
31	copy to media-sound/clementine/clementine-1.3.1_p20180319.ebuild
32	index 16065b58a5a..d1601b41048 100644
33	--- a/media-sound/clementine/clementine-9999.ebuild
34	+++ b/media-sound/clementine/clementine-1.3.1_p20180319.ebuild
35	@@ -11,11 +11,11 @@ if [[ ${PV} == 9999 ]]; then
36	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
37	GIT_ECLASS="git-r3"
38	else
39	- SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
40	+ COMMIT=804168edc74d7230a84e8937e2ea9a3b1ad2e9c2
41	+ SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
42	KEYWORDS="~amd64 ~x86"
43	- S="${WORKDIR}/${MY_P^}"
44	fi
45	-inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS}
46	+inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} vcs-snapshot
47	unset GIT_ECLASS
48
49	DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
50	@@ -55,7 +55,7 @@ COMMON_DEPEND="
51	cdda? ( dev-libs/libcdio:= )
52	dbus? ( dev-qt/qtdbus:5 )
53	ipod? ( >=media-libs/libgpod-0.8.0 )
54	- lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )
55	+ lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
56	moodbar? ( sci-libs/fftw:3.0 )
57	mtp? ( >=media-libs/libmtp-1.0.0 )
58	projectm? (
59	@@ -115,14 +115,6 @@ src_prepare() {
60	sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt \|\| die
61	cmake_comment_add_subdirectory tests
62	fi
63	-
64	- # Fix clementine relying on downstream renaming of lastfm header dir
65	- sed -i -e "/^#include/s/lastfm5/lastfm/" \
66	- tests/albumcoverfetcher_test.cpp \
67	- src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \
68	- src/core/song.cpp \|\| die "Failed to sed lastfm header suffix"
69	- sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \
70	- -i CMakeLists.txt \|\| die "Failed to sed lastfm header suffix"
71	}
72
73	src_configure() {
74	@@ -170,10 +162,6 @@ src_test() {
75	virtx emake test
76	}
77
78	-pkg_preinst() {
79	- gnome2_icon_savelist
80	-}
81	-
82	pkg_postinst() {
83	xdg_desktop_database_update
84	gnome2_icon_cache_update
85
86	diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
87	index 16065b58a5a..6b168f373bf 100644
88	--- a/media-sound/clementine/clementine-9999.ebuild
89	+++ b/media-sound/clementine/clementine-9999.ebuild
90	@@ -55,7 +55,7 @@ COMMON_DEPEND="
91	cdda? ( dev-libs/libcdio:= )
92	dbus? ( dev-qt/qtdbus:5 )
93	ipod? ( >=media-libs/libgpod-0.8.0 )
94	- lastfm? ( >=media-libs/liblastfm-1[qt5(+)] )
95	+ lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
96	moodbar? ( sci-libs/fftw:3.0 )
97	mtp? ( >=media-libs/libmtp-1.0.0 )
98	projectm? (
99	@@ -115,14 +115,6 @@ src_prepare() {
100	sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt \|\| die
101	cmake_comment_add_subdirectory tests
102	fi
103	-
104	- # Fix clementine relying on downstream renaming of lastfm header dir
105	- sed -i -e "/^#include/s/lastfm5/lastfm/" \
106	- tests/albumcoverfetcher_test.cpp \
107	- src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \
108	- src/core/song.cpp \|\| die "Failed to sed lastfm header suffix"
109	- sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \
110	- -i CMakeLists.txt \|\| die "Failed to sed lastfm header suffix"
111	}
112
113	src_configure() {
114	@@ -170,10 +162,6 @@ src_test() {
115	virtx emake test
116	}
117
118	-pkg_preinst() {
119	- gnome2_icon_savelist
120	-}
121	-
122	pkg_postinst() {
123	xdg_desktop_database_update
124	gnome2_icon_cache_update

Gentoo Archives: gentoo-commits