Gentoo Archives: gentoo-commits

From: "Daniel Pielmeier (billie)" <billie@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/conky: ChangeLog conky-1.8.1-r4.ebuild conky-1.8.1-r3.ebuild
Date: Fri, 28 Oct 2011 17:25:31
Message-Id: 20111028172522.14C822004B@flycatcher.gentoo.org
1 billie 11/10/28 17:25:22
2
3 Modified: ChangeLog
4 Added: conky-1.8.1-r4.ebuild
5 Removed: conky-1.8.1-r3.ebuild
6 Log:
7 Apply Interfaces patch against configure.ac instead of configure.ac.in. Thanks to Markos Chandras for the note.
8
9 (Portage version: 2.1.10.31/cvs/Linux i686, RepoMan options: --force)
10
11 Revision Changes Path
12 1.168 app-admin/conky/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/ChangeLog?rev=1.168&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/ChangeLog?rev=1.168&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/ChangeLog?r1=1.167&r2=1.168
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v
21 retrieving revision 1.167
22 retrieving revision 1.168
23 diff -u -r1.167 -r1.168
24 --- ChangeLog 25 Oct 2011 17:28:41 -0000 1.167
25 +++ ChangeLog 28 Oct 2011 17:25:21 -0000 1.168
26 @@ -1,6 +1,13 @@
27 # ChangeLog for app-admin/conky
28 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.167 2011/10/25 17:28:41 billie Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.168 2011/10/28 17:25:21 billie Exp $
31 +
32 +*conky-1.8.1-r4 (28 Oct 2011)
33 +
34 + 28 Oct 2011; Daniel Pielmeier <billie@g.o> -conky-1.8.1-r3.ebuild,
35 + +conky-1.8.1-r4.ebuild, files/conky-1.8.1-maxinterfaces.patch:
36 + Apply Interfaces patch against configure.ac instead of configure.ac.in.
37 + Thanks to Markos Chandras for the note.
38
39 *conky-1.8.1-r3 (25 Oct 2011)
40
41
42
43
44 1.1 app-admin/conky/conky-1.8.1-r4.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/conky-1.8.1-r4.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/conky-1.8.1-r4.ebuild?rev=1.1&content-type=text/plain
48
49 Index: conky-1.8.1-r4.ebuild
50 ===================================================================
51 # Copyright 1999-2011 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r4.ebuild,v 1.1 2011/10/28 17:25:21 billie Exp $
54
55 EAPI=2
56
57 inherit autotools eutils
58
59 DESCRIPTION="An advanced, highly configurable system monitor for X"
60 HOMEPAGE="http://conky.sourceforge.net/"
61 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
62
63 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
64 SLOT="0"
65 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
66 IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X xmms2"
67
68 DEPEND_COMMON="
69 X? (
70 imlib? ( media-libs/imlib2 )
71 lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
72 lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2 )
73 nvidia? ( media-video/nvidia-settings )
74 truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
75 x11-libs/libX11
76 x11-libs/libXdamage
77 x11-libs/libXext
78 audacious? ( >=media-sound/audacious-1.5 dev-libs/glib )
79 xmms2? ( media-sound/xmms2 )
80 )
81 curl? ( net-misc/curl )
82 eve? ( net-misc/curl dev-libs/libxml2 )
83 portmon? ( dev-libs/glib )
84 lua? ( >=dev-lang/lua-5.1 )
85 ncurses? ( sys-libs/ncurses )
86 rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
87 wifi? ( net-wireless/wireless-tools )
88 weather-metar? ( net-misc/curl )
89 weather-xoap? ( dev-libs/libxml2 net-misc/curl )
90 virtual/libiconv
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 dev-util/pkgconfig
103 "
104
105 src_prepare() {
106 epatch "${FILESDIR}/${P}-nvidia-x.patch" \
107 "${FILESDIR}/${P}-xmms2.patch" \
108 "${FILESDIR}/${P}-secunia-SA43225.patch" \
109 "${FILESDIR}/${P}-acpitemp.patch" \
110 "${FILESDIR}/${P}-curl-headers.patch" \
111 "${FILESDIR}/${P}-maxinterfaces.patch"
112 eautoreconf
113 }
114
115 src_configure() {
116 local myconf
117
118 if use X; then
119 myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
120 myconf="${myconf} --enable-argb --enable-own-window"
121 myconf="${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)"
122 myconf="${myconf} $(use_enable lua-imlib lua-imlib2)"
123 myconf="${myconf} $(use_enable nvidia) $(use_enable truetype xft)"
124 myconf="${myconf} $(use_enable audacious) $(use_enable xmms2)"
125 else
126 myconf="--disable-x11 --disable-own-window --disable-argb"
127 myconf="${myconf} --disable-lua-cairo --disable-nvidia --disable-xft"
128 myconf="${myconf} --disable-audacious --disable-xmms2"
129 fi
130
131 econf \
132 ${myconf} \
133 $(use_enable apcupsd) \
134 $(use_enable curl) \
135 $(use_enable debug) \
136 $(use_enable eve) \
137 $(use_enable hddtemp) \
138 $(use_enable iostats) \
139 $(use_enable lua) \
140 $(use_enable thinkpad ibm) \
141 $(use_enable math) \
142 $(use_enable moc) \
143 $(use_enable mpd) \
144 $(use_enable ncurses) \
145 $(use_enable portmon) \
146 $(use_enable rss) \
147 $(use_enable weather-metar) \
148 $(use_enable weather-xoap) \
149 $(use_enable wifi wlan)
150 }
151
152 src_install() {
153 emake DESTDIR="${D}" install || die
154 dodoc ChangeLog AUTHORS TODO || die
155 dohtml doc/docs.html doc/config_settings.html doc/variables.html || die
156
157 if use vim-syntax; then
158 insinto /usr/share/vim/vimfiles/ftdetect
159 doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die
160
161 insinto /usr/share/vim/vimfiles/syntax
162 doins "${S}"/extras/vim/syntax/conkyrc.vim || die
163 fi
164
165 if use nano-syntax; then
166 insinto /usr/share/nano/
167 doins "${S}"/extras/nano/conky.nanorc || die
168 fi
169 }
170
171 pkg_postinst() {
172 elog "You can find a sample configuration file at ${ROOT%/}/etc/conky/conky.conf."
173 elog "To customize, copy it to ~/.conkyrc and edit it to your liking."
174 elog
175 elog "For more info on Conky's features please look at the Changelog in"
176 elog "${ROOT%/}/usr/share/doc/${PF}. There are also pretty html docs available"
177 elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html."
178 elog
179 elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
180 elog
181 }