| 1 |
billie 11/11/16 19:50:34 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: conky-1.8.1-r5.ebuild |
| 5 |
Log: |
| 6 |
Fix scroll variable for utf8. This fixes bug #390215. Thanks to Amadeusz Żołnowski for the report and the patch. |
| 7 |
|
| 8 |
(Portage version: 2.1.10.34/cvs/Linux i686) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.169 app-admin/conky/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/ChangeLog?rev=1.169&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/ChangeLog?rev=1.169&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/ChangeLog?r1=1.168&r2=1.169 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v |
| 20 |
retrieving revision 1.168 |
| 21 |
retrieving revision 1.169 |
| 22 |
diff -u -r1.168 -r1.169 |
| 23 |
--- ChangeLog 28 Oct 2011 17:25:21 -0000 1.168 |
| 24 |
+++ ChangeLog 16 Nov 2011 19:50:34 -0000 1.169 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for app-admin/conky |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.168 2011/10/28 17:25:21 billie Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.169 2011/11/16 19:50:34 billie Exp $ |
| 30 |
+ |
| 31 |
+*conky-1.8.1-r5 (16 Nov 2011) |
| 32 |
+ |
| 33 |
+ 16 Nov 2011; Daniel Pielmeier <billie@g.o> +conky-1.8.1-r5.ebuild, |
| 34 |
+ +files/conky-1.8.1-utf8-scroll.patch: |
| 35 |
+ Fix scroll variable for utf8. This fixes bug #390215. Thanks to Amadeusz |
| 36 |
+ Żołnowski for the report and the patch. |
| 37 |
|
| 38 |
*conky-1.8.1-r4 (28 Oct 2011) |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 app-admin/conky/conky-1.8.1-r5.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/conky-1.8.1-r5.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/conky-1.8.1-r5.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: conky-1.8.1-r5.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2011 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r5.ebuild,v 1.1 2011/11/16 19:50:34 billie Exp $ |
| 53 |
|
| 54 |
EAPI=2 |
| 55 |
|
| 56 |
inherit autotools eutils |
| 57 |
|
| 58 |
DESCRIPTION="An advanced, highly configurable system monitor for X" |
| 59 |
HOMEPAGE="http://conky.sourceforge.net/" |
| 60 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
| 61 |
|
| 62 |
LICENSE="GPL-3 BSD LGPL-2.1 MIT" |
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" |
| 65 |
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" |
| 66 |
|
| 67 |
DEPEND_COMMON=" |
| 68 |
X? ( |
| 69 |
imlib? ( media-libs/imlib2 ) |
| 70 |
lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) |
| 71 |
lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2 ) |
| 72 |
nvidia? ( media-video/nvidia-settings ) |
| 73 |
truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) |
| 74 |
x11-libs/libX11 |
| 75 |
x11-libs/libXdamage |
| 76 |
x11-libs/libXext |
| 77 |
audacious? ( >=media-sound/audacious-1.5 dev-libs/glib ) |
| 78 |
xmms2? ( media-sound/xmms2 ) |
| 79 |
) |
| 80 |
curl? ( net-misc/curl ) |
| 81 |
eve? ( net-misc/curl dev-libs/libxml2 ) |
| 82 |
portmon? ( dev-libs/glib ) |
| 83 |
lua? ( >=dev-lang/lua-5.1 ) |
| 84 |
ncurses? ( sys-libs/ncurses ) |
| 85 |
rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib ) |
| 86 |
wifi? ( net-wireless/wireless-tools ) |
| 87 |
weather-metar? ( net-misc/curl ) |
| 88 |
weather-xoap? ( dev-libs/libxml2 net-misc/curl ) |
| 89 |
virtual/libiconv |
| 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 |
dev-util/pkgconfig |
| 102 |
" |
| 103 |
|
| 104 |
src_prepare() { |
| 105 |
epatch "${FILESDIR}/${P}-nvidia-x.patch" \ |
| 106 |
"${FILESDIR}/${P}-xmms2.patch" \ |
| 107 |
"${FILESDIR}/${P}-secunia-SA43225.patch" \ |
| 108 |
"${FILESDIR}/${P}-acpitemp.patch" \ |
| 109 |
"${FILESDIR}/${P}-curl-headers.patch" \ |
| 110 |
"${FILESDIR}/${P}-maxinterfaces.patch" \ |
| 111 |
"${FILESDIR}/${P}-utf8-scroll.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 |
} |
Archives