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