1 |
commit: 025bd37b199d3ade31e6b2fee9e450fc7352ef6e |
2 |
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 7 19:30:40 2018 +0000 |
4 |
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 7 19:31:58 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=025bd37b |
7 |
|
8 |
app-admin/conky: Version bump. |
9 |
|
10 |
Also fixes bug #646342. Thanks to Leonid Kopylov for the report and |
11 |
onun23 for the initial patch. |
12 |
|
13 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
14 |
|
15 |
app-admin/conky/Manifest | 1 + |
16 |
app-admin/conky/conky-1.10.8.ebuild | 188 ++++++++++++++++++++++++++++++++++++ |
17 |
2 files changed, 189 insertions(+) |
18 |
|
19 |
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest |
20 |
index dfd7445295a..6dc1b1d0d73 100644 |
21 |
--- a/app-admin/conky/Manifest |
22 |
+++ b/app-admin/conky/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
DIST conky-1.10.4.tar.gz 365145 BLAKE2B 60f6f53ef67a9958d4dd4c3f1ab53886235927ed457ad3e98d2f6f61568a14baa7cd2afa0d3ddde9ed5e16aae17891213d906f49c308269f678adf37ea627329 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c |
25 |
DIST conky-1.10.6.tar.gz 365669 BLAKE2B 4f072b950083a1352904e9fbc2de016dbb3af93291e308ad2db799381f14880da4e32fa1da5ea1dab568bb782352c249d6200d581916ef3174e222f7a8294cc1 SHA512 ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9 |
26 |
DIST conky-1.10.7.tar.gz 371881 BLAKE2B f1a1dd0d67efe1658d3a3da7ddb121c31ae34c347f7bce7fcecb57d7311ddcf80fb391055fefb92fd235b702c3e5b17362821565aba7a911931542ea714d8d76 SHA512 4da501c7c7613e8b9b26a691a1c0118c05cec818e944d4a30e250ecba26956d6f3103ec5731f082a095173dbfe0713137ded92043cc4c1eb3821c0943f1744f4 |
27 |
+DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a |
28 |
|
29 |
diff --git a/app-admin/conky/conky-1.10.8.ebuild b/app-admin/conky/conky-1.10.8.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..2679d661162 |
32 |
--- /dev/null |
33 |
+++ b/app-admin/conky/conky-1.10.8.ebuild |
34 |
@@ -0,0 +1,188 @@ |
35 |
+# Copyright 1999-2018 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=6 |
39 |
+ |
40 |
+inherit cmake-utils linux-info readme.gentoo-r1 |
41 |
+ |
42 |
+DESCRIPTION="An advanced, highly configurable system monitor for X" |
43 |
+HOMEPAGE="https://github.com/brndnmtthws/conky" |
44 |
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
45 |
+ |
46 |
+LICENSE="GPL-3 BSD LGPL-2.1 MIT" |
47 |
+SLOT="0" |
48 |
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" |
49 |
+IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc |
50 |
+ lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses |
51 |
+ nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax |
52 |
+ weather-metar weather-xoap webserver wifi X xmms2" |
53 |
+ |
54 |
+DEPEND_COMMON=" |
55 |
+ X? ( |
56 |
+ imlib? ( media-libs/imlib2[X] ) |
57 |
+ lua-cairo? ( |
58 |
+ >=dev-lua/toluapp-1.0.93 |
59 |
+ x11-libs/cairo[X] ) |
60 |
+ lua-imlib? ( |
61 |
+ >=dev-lua/toluapp-1.0.93 |
62 |
+ media-libs/imlib2[X] ) |
63 |
+ lua-rsvg? ( |
64 |
+ >=dev-lua/toluapp-1.0.93 |
65 |
+ gnome-base/librsvg ) |
66 |
+ nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) |
67 |
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) |
68 |
+ x11-libs/libX11 |
69 |
+ x11-libs/libXdamage |
70 |
+ x11-libs/libXinerama |
71 |
+ x11-libs/libXfixes |
72 |
+ x11-libs/libXext |
73 |
+ audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) |
74 |
+ xmms2? ( media-sound/xmms2 ) |
75 |
+ ) |
76 |
+ cmus? ( media-sound/cmus ) |
77 |
+ curl? ( net-misc/curl ) |
78 |
+ eve? ( net-misc/curl dev-libs/libxml2 ) |
79 |
+ ical? ( dev-libs/libical ) |
80 |
+ iconv? ( virtual/libiconv ) |
81 |
+ irc? ( net-libs/libircclient ) |
82 |
+ mysql? ( >=virtual/mysql-5.0 ) |
83 |
+ ncurses? ( sys-libs/ncurses:= ) |
84 |
+ pulseaudio? ( media-sound/pulseaudio ) |
85 |
+ rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) |
86 |
+ systemd? ( sys-apps/systemd ) |
87 |
+ wifi? ( net-wireless/wireless-tools ) |
88 |
+ weather-metar? ( net-misc/curl ) |
89 |
+ weather-xoap? ( dev-libs/libxml2 net-misc/curl ) |
90 |
+ webserver? ( net-libs/libmicrohttpd ) |
91 |
+ >=dev-lang/lua-5.1.4-r8:0 |
92 |
+ " |
93 |
+RDEPEND=" |
94 |
+ ${DEPEND_COMMON} |
95 |
+ apcupsd? ( sys-power/apcupsd ) |
96 |
+ hddtemp? ( app-admin/hddtemp ) |
97 |
+ moc? ( media-sound/moc ) |
98 |
+ nano-syntax? ( app-editors/nano ) |
99 |
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) |
100 |
+ " |
101 |
+DEPEND=" |
102 |
+ ${DEPEND_COMMON} |
103 |
+ app-text/docbook2X |
104 |
+ " |
105 |
+ |
106 |
+CONFIG_CHECK=~IPV6 |
107 |
+ |
108 |
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS ) |
109 |
+ |
110 |
+DISABLE_AUTOFORMATTING="yes" |
111 |
+DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}. |
112 |
+To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf |
113 |
+and edit it to your liking. |
114 |
+ |
115 |
+There are pretty html docs available at the conky homepage |
116 |
+or in ${ROOT%/}/usr/share/doc/${PF}/html. |
117 |
+ |
118 |
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO" |
119 |
+ |
120 |
+pkg_setup() { |
121 |
+ use ipv6 && linux-info_pkg_setup |
122 |
+} |
123 |
+ |
124 |
+src_prepare() { |
125 |
+ cmake-utils_src_prepare |
126 |
+ |
127 |
+ sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \ |
128 |
+ cmake/ConkyPlatformChecks.cmake || die |
129 |
+} |
130 |
+ |
131 |
+src_configure() { |
132 |
+ local mycmakeargs |
133 |
+ |
134 |
+ if use X; then |
135 |
+ mycmakeargs=( |
136 |
+ -DBUILD_X11=ON |
137 |
+ -DOWN_WINDOW=ON |
138 |
+ -DBUILD_XDAMAGE=ON |
139 |
+ -DBUILD_XINERAMA=ON |
140 |
+ -DBUILD_XDBE=ON |
141 |
+ -DBUILD_XFT=$(usex truetype) |
142 |
+ -DBUILD_IMLIB2=$(usex imlib) |
143 |
+ -DBUILD_XSHAPE=ON |
144 |
+ -DBUILD_ARGB=ON |
145 |
+ -DBUILD_LUA_CAIRO=$(usex lua-cairo) |
146 |
+ -DBUILD_LUA_IMLIB2=$(usex lua-imlib) |
147 |
+ -DBUILD_LUA_RSVG=$(usex lua-rsvg) |
148 |
+ -DBUILD_NVIDIA=$(usex nvidia) |
149 |
+ -DBUILD_AUDACIOUS=$(usex audacious) |
150 |
+ -DBUILD_XMMS2=$(usex xmms2) |
151 |
+ ) |
152 |
+ else |
153 |
+ mycmakeargs=( |
154 |
+ -DBUILD_X11=OFF |
155 |
+ -DBUILD_NVIDIA=OFF |
156 |
+ -DBUILD_LUA_CAIRO=OFF |
157 |
+ -DBUILD_LUA_IMLIB2=OFF |
158 |
+ -DBUILD_LUA_RSVG=OFF |
159 |
+ -DBUILD_AUDACIOUS=OFF |
160 |
+ -DBUILD_XMMS2=OFF |
161 |
+ ) |
162 |
+ fi |
163 |
+ |
164 |
+ mycmakeargs+=( |
165 |
+ -DBUILD_APCUPSD=$(usex apcupsd) |
166 |
+ -DBUILD_CMUS=$(usex cmus) |
167 |
+ -DBUILD_CURL=$(usex curl) |
168 |
+ -DBUILD_EVE=$(usex eve) |
169 |
+ -DBUILD_HDDTEMP=$(usex hddtemp) |
170 |
+ -DBUILD_IOSTATS=$(usex iostats) |
171 |
+ -DBUILD_ICAL=$(usex ical) |
172 |
+ -DBUILD_ICONV=$(usex iconv) |
173 |
+ -DBUILD_IPV6=$(usex ipv6) |
174 |
+ -DBUILD_IRC=$(usex irc) |
175 |
+ -DBUILD_MATH=$(usex math) |
176 |
+ -DBUILD_MOC=$(usex moc) |
177 |
+ -DBUILD_MPD=$(usex mpd) |
178 |
+ -DBUILD_MYSQL=$(usex mysql) |
179 |
+ -DBUILD_NCURSES=$(usex ncurses) |
180 |
+ -DBUILD_PORT_MONITORS=$(usex portmon) |
181 |
+ -DBUILD_PULSEAUDIO=$(usex pulseaudio) |
182 |
+ -DBUILD_RSS=$(usex rss) |
183 |
+ -DBUILD_JOURNAL=$(usex systemd) |
184 |
+ -DBUILD_IBM=$(usex thinkpad) |
185 |
+ -DBUILD_WEATHER_METAR=$(usex weather-metar) |
186 |
+ -DBUILD_WEATHER_XOAP=$(usex weather-xoap) |
187 |
+ -DBUILD_HTTP=$(usex webserver) |
188 |
+ -DBUILD_WLAN=$(usex wifi) |
189 |
+ -DBUILD_BUILTIN_CONFIG=ON |
190 |
+ -DBUILD_OLD_CONFIG=OFF |
191 |
+ -DBUILD_I18N=ON |
192 |
+ -DMAINTAINER_MODE=ON |
193 |
+ -DRELEASE=ON |
194 |
+ -DBUILD_BMPX=OFF |
195 |
+ -DDOC_PATH=/usr/share/doc/${PF} |
196 |
+ ) |
197 |
+ |
198 |
+ cmake-utils_src_configure |
199 |
+} |
200 |
+ |
201 |
+src_install() { |
202 |
+ cmake-utils_src_install |
203 |
+ |
204 |
+ if use vim-syntax; then |
205 |
+ insinto /usr/share/vim/vimfiles/ftdetect |
206 |
+ doins "${S}"/extras/vim/ftdetect/conkyrc.vim |
207 |
+ |
208 |
+ insinto /usr/share/vim/vimfiles/syntax |
209 |
+ doins "${S}"/extras/vim/syntax/conkyrc.vim |
210 |
+ fi |
211 |
+ |
212 |
+ if use nano-syntax; then |
213 |
+ insinto /usr/share/nano/ |
214 |
+ doins "${S}"/extras/nano/conky.nanorc |
215 |
+ fi |
216 |
+ |
217 |
+ readme.gentoo_create_doc |
218 |
+} |
219 |
+ |
220 |
+pkg_postinst() { |
221 |
+ readme.gentoo_print_elog |
222 |
+} |