[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/ - gentoo-commits

From:	Daniel Pielmeier <billie@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/
Date:	Wed, 05 Aug 2020 17:40:38
Message-Id:	`1596649201.984a9dac7dbc2516494ca35c9a620dcf390bfd90.billie@gentoo`

1

commit:     984a9dac7dbc2516494ca35c9a620dcf390bfd90

2

Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>

3

AuthorDate: Wed Aug  5 17:40:01 2020 +0000

4

Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>

5

CommitDate: Wed Aug  5 17:40:01 2020 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=984a9dac

7

8

app-admin/conky: Version bump to conky-1.11.6.

9

10

Switch from cmake-utils to cmake eclass.

11

12

Package-Manager: Portage-2.3.103, Repoman-2.3.23

13

Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

14

15

 app-admin/conky/Manifest                                     |  1 +

16

 app-admin/conky/conky-1.10.8-r9.ebuild                       |  8 ++++----

17

 app-admin/conky/conky-1.11.5.ebuild                          | 10 +++++-----

18

 app-admin/conky/{conky-1.11.5.ebuild => conky-1.11.6.ebuild} | 10 +++++-----

19

 4 files changed, 15 insertions(+), 14 deletions(-)

20

21

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest

22

index 3014b5102be..927fdccfdb0 100644

23

--- a/app-admin/conky/Manifest

24

+++ b/app-admin/conky/Manifest

25

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

26

 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a

27

 DIST conky-1.11.5.tar.gz 2400965 BLAKE2B 06b6817ed3cb4bb638b5fa7f9a5f8544c9d274560dbef2bc8f8c10ed681b83d0ab27988f60bed70cd0c13cd4947a2bd9b70ad66c38dbb6f516f5d57165ef5765 SHA512 71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be

28

+DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a

29

30

diff --git a/app-admin/conky/conky-1.10.8-r9.ebuild b/app-admin/conky/conky-1.10.8-r9.ebuild

31

index ce6929a5495..647b0da5a8b 100644

32

--- a/app-admin/conky/conky-1.10.8-r9.ebuild

33

+++ b/app-admin/conky/conky-1.10.8-r9.ebuild

34

@@ -3,7 +3,7 @@

35

36

 EAPI=7

37

38

-inherit cmake-utils linux-info readme.gentoo-r1

39

+inherit cmake linux-info readme.gentoo-r1

40

41

 DESCRIPTION="An advanced, highly configurable system monitor for X"

42

 HOMEPAGE="https://github.com/brndnmtthws/conky"

43

@@ -87,7 +87,7 @@ pkg_setup() {

44

}

45

46

 src_prepare() {

47

-	cmake-utils_src_prepare

48

+	cmake_src_prepare

49

50

 	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \

51

 		cmake/ConkyPlatformChecks.cmake || die

52

@@ -158,11 +158,11 @@ src_configure() {

53

 		-DDOC_PATH=/usr/share/doc/${PF}

54

)

55

56

-	cmake-utils_src_configure

57

+	cmake_src_configure

58

}

59

60

 src_install() {

61

-	cmake-utils_src_install

62

+	cmake_src_install

63

64

 	if use vim-syntax; then

65

 		insinto /usr/share/vim/vimfiles/ftdetect

66

67

diff --git a/app-admin/conky/conky-1.11.5.ebuild b/app-admin/conky/conky-1.11.5.ebuild

68

index a52ce080d2f..fcd0a663770 100644

69

--- a/app-admin/conky/conky-1.11.5.ebuild

70

+++ b/app-admin/conky/conky-1.11.5.ebuild

71

@@ -1,9 +1,9 @@

72

-# Copyright 1999-2019 Gentoo Authors

73

+# Copyright 1999-2020 Gentoo Authors

74

 # Distributed under the terms of the GNU General Public License v2

75

76

 EAPI=7

77

78

-inherit cmake-utils linux-info readme.gentoo-r1 xdg

79

+inherit cmake linux-info readme.gentoo-r1 xdg

80

81

 DESCRIPTION="An advanced, highly configurable system monitor for X"

82

 HOMEPAGE="https://github.com/brndnmtthws/conky"

83

@@ -88,7 +88,7 @@ pkg_setup() {

84

}

85

86

 src_prepare() {

87

-	cmake-utils_src_prepare

88

+	cmake_src_prepare

89

90

 	xdg_environment_reset

91

92

@@ -155,11 +155,11 @@ src_configure() {

93

 		-DRELEASE=ON

94

)

95

96

-	cmake-utils_src_configure

97

+	cmake_src_configure

98

}

99

100

 src_install() {

101

-	cmake-utils_src_install

102

+	cmake_src_install

103

104

 	if use vim-syntax; then

105

 		insinto /usr/share/vim/vimfiles/ftdetect

106

107

diff --git a/app-admin/conky/conky-1.11.5.ebuild b/app-admin/conky/conky-1.11.6.ebuild

108

similarity index 96%

109

copy from app-admin/conky/conky-1.11.5.ebuild

110

copy to app-admin/conky/conky-1.11.6.ebuild

111

index a52ce080d2f..fcd0a663770 100644

112

--- a/app-admin/conky/conky-1.11.5.ebuild

113

+++ b/app-admin/conky/conky-1.11.6.ebuild

114

@@ -1,9 +1,9 @@

115

-# Copyright 1999-2019 Gentoo Authors

116

+# Copyright 1999-2020 Gentoo Authors

117

 # Distributed under the terms of the GNU General Public License v2

118

119

 EAPI=7

120

121

-inherit cmake-utils linux-info readme.gentoo-r1 xdg

122

+inherit cmake linux-info readme.gentoo-r1 xdg

123

124

 DESCRIPTION="An advanced, highly configurable system monitor for X"

125

 HOMEPAGE="https://github.com/brndnmtthws/conky"

126

@@ -88,7 +88,7 @@ pkg_setup() {

127

}

128

129

 src_prepare() {

130

-	cmake-utils_src_prepare

131

+	cmake_src_prepare

132

133

 	xdg_environment_reset

134

135

@@ -155,11 +155,11 @@ src_configure() {

136

 		-DRELEASE=ON

137

)

138

139

-	cmake-utils_src_configure

140

+	cmake_src_configure

141

}

142

143

 src_install() {

144

-	cmake-utils_src_install

145

+	cmake_src_install

146

147

 	if use vim-syntax; then

148

 		insinto /usr/share/vim/vimfiles/ftdetect

1	commit: 984a9dac7dbc2516494ca35c9a620dcf390bfd90
2	Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
3	AuthorDate: Wed Aug 5 17:40:01 2020 +0000
4	Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
5	CommitDate: Wed Aug 5 17:40:01 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=984a9dac
7
8	app-admin/conky: Version bump to conky-1.11.6.
9
10	Switch from cmake-utils to cmake eclass.
11
12	Package-Manager: Portage-2.3.103, Repoman-2.3.23
13	Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
14
15	app-admin/conky/Manifest \| 1 +
16	app-admin/conky/conky-1.10.8-r9.ebuild \| 8 ++++----
17	app-admin/conky/conky-1.11.5.ebuild \| 10 +++++-----
18	app-admin/conky/{conky-1.11.5.ebuild => conky-1.11.6.ebuild} \| 10 +++++-----
19	4 files changed, 15 insertions(+), 14 deletions(-)
20
21	diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
22	index 3014b5102be..927fdccfdb0 100644
23	--- a/app-admin/conky/Manifest
24	+++ b/app-admin/conky/Manifest
25	@@ -1,2 +1,3 @@
26	DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
27	DIST conky-1.11.5.tar.gz 2400965 BLAKE2B 06b6817ed3cb4bb638b5fa7f9a5f8544c9d274560dbef2bc8f8c10ed681b83d0ab27988f60bed70cd0c13cd4947a2bd9b70ad66c38dbb6f516f5d57165ef5765 SHA512 71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be
28	+DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
29
30	diff --git a/app-admin/conky/conky-1.10.8-r9.ebuild b/app-admin/conky/conky-1.10.8-r9.ebuild
31	index ce6929a5495..647b0da5a8b 100644
32	--- a/app-admin/conky/conky-1.10.8-r9.ebuild
33	+++ b/app-admin/conky/conky-1.10.8-r9.ebuild
34	@@ -3,7 +3,7 @@
35
36	EAPI=7
37
38	-inherit cmake-utils linux-info readme.gentoo-r1
39	+inherit cmake linux-info readme.gentoo-r1
40
41	DESCRIPTION="An advanced, highly configurable system monitor for X"
42	HOMEPAGE="https://github.com/brndnmtthws/conky"
43	@@ -87,7 +87,7 @@ pkg_setup() {
44	}
45
46	src_prepare() {
47	- cmake-utils_src_prepare
48	+ cmake_src_prepare
49
50	sed -i -e "s\|find_program(APP_MAN man)\|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)\|" \
51	cmake/ConkyPlatformChecks.cmake \|\| die
52	@@ -158,11 +158,11 @@ src_configure() {
53	-DDOC_PATH=/usr/share/doc/${PF}
54	)
55
56	- cmake-utils_src_configure
57	+ cmake_src_configure
58	}
59
60	src_install() {
61	- cmake-utils_src_install
62	+ cmake_src_install
63
64	if use vim-syntax; then
65	insinto /usr/share/vim/vimfiles/ftdetect
66
67	diff --git a/app-admin/conky/conky-1.11.5.ebuild b/app-admin/conky/conky-1.11.5.ebuild
68	index a52ce080d2f..fcd0a663770 100644
69	--- a/app-admin/conky/conky-1.11.5.ebuild
70	+++ b/app-admin/conky/conky-1.11.5.ebuild
71	@@ -1,9 +1,9 @@
72	-# Copyright 1999-2019 Gentoo Authors
73	+# Copyright 1999-2020 Gentoo Authors
74	# Distributed under the terms of the GNU General Public License v2
75
76	EAPI=7
77
78	-inherit cmake-utils linux-info readme.gentoo-r1 xdg
79	+inherit cmake linux-info readme.gentoo-r1 xdg
80
81	DESCRIPTION="An advanced, highly configurable system monitor for X"
82	HOMEPAGE="https://github.com/brndnmtthws/conky"
83	@@ -88,7 +88,7 @@ pkg_setup() {
84	}
85
86	src_prepare() {
87	- cmake-utils_src_prepare
88	+ cmake_src_prepare
89
90	xdg_environment_reset
91
92	@@ -155,11 +155,11 @@ src_configure() {
93	-DRELEASE=ON
94	)
95
96	- cmake-utils_src_configure
97	+ cmake_src_configure
98	}
99
100	src_install() {
101	- cmake-utils_src_install
102	+ cmake_src_install
103
104	if use vim-syntax; then
105	insinto /usr/share/vim/vimfiles/ftdetect
106
107	diff --git a/app-admin/conky/conky-1.11.5.ebuild b/app-admin/conky/conky-1.11.6.ebuild
108	similarity index 96%
109	copy from app-admin/conky/conky-1.11.5.ebuild
110	copy to app-admin/conky/conky-1.11.6.ebuild
111	index a52ce080d2f..fcd0a663770 100644
112	--- a/app-admin/conky/conky-1.11.5.ebuild
113	+++ b/app-admin/conky/conky-1.11.6.ebuild
114	@@ -1,9 +1,9 @@
115	-# Copyright 1999-2019 Gentoo Authors
116	+# Copyright 1999-2020 Gentoo Authors
117	# Distributed under the terms of the GNU General Public License v2
118
119	EAPI=7
120
121	-inherit cmake-utils linux-info readme.gentoo-r1 xdg
122	+inherit cmake linux-info readme.gentoo-r1 xdg
123
124	DESCRIPTION="An advanced, highly configurable system monitor for X"
125	HOMEPAGE="https://github.com/brndnmtthws/conky"
126	@@ -88,7 +88,7 @@ pkg_setup() {
127	}
128
129	src_prepare() {
130	- cmake-utils_src_prepare
131	+ cmake_src_prepare
132
133	xdg_environment_reset
134
135	@@ -155,11 +155,11 @@ src_configure() {
136	-DRELEASE=ON
137	)
138
139	- cmake-utils_src_configure
140	+ cmake_src_configure
141	}
142
143	src_install() {
144	- cmake-utils_src_install
145	+ cmake_src_install
146
147	if use vim-syntax; then
148	insinto /usr/share/vim/vimfiles/ftdetect

Gentoo Archives: gentoo-commits