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