diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2014-01-06 16:01:46 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2014-01-06 16:01:46 +0000 |
| commit | dc1e82d67b75be5af752f2990168ae93cba89ea5 (patch) | |
| tree | 4b8f51dcf996401b2e192f88ba9310ea780f05d2 /app-admin/conky | |
| parent | Fix build error with gcc-4.8 and libbsd, bug #474686. (diff) | |
| download | gentoo-2-dc1e82d67b75be5af752f2990168ae93cba89ea5.tar.gz gentoo-2-dc1e82d67b75be5af752f2990168ae93cba89ea5.tar.bz2 gentoo-2-dc1e82d67b75be5af752f2990168ae93cba89ea5.zip | |
Fix bug #494956. Thanks to Michael Mair-Keimberger (iamnr3) for the report.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 215AD14D)
Diffstat (limited to 'app-admin/conky')
| -rw-r--r-- | app-admin/conky/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.9.0-r3.ebuild | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index 9bbced446194..029382877541 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/conky -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.214 2013/11/29 15:27:13 billie Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.215 2014/01/06 16:01:46 billie Exp $ + + 06 Jan 2014; Daniel Pielmeier <billie@gentoo.org> conky-1.9.0-r3.ebuild: + Fix bug #494956. Thanks to Michael Mair-Keimberger (iamnr3) for the report. 29 Nov 2013; Daniel Pielmeier <billie@gentoo.org> conky-1.9.0-r3.ebuild, +files/conky-1.9.0-diskio-dmmajor.patch: diff --git a/app-admin/conky/conky-1.9.0-r3.ebuild b/app-admin/conky/conky-1.9.0-r3.ebuild index 06ecc9bbfa3c..7488c46748b3 100644 --- a/app-admin/conky/conky-1.9.0-r3.ebuild +++ b/app-admin/conky/conky-1.9.0-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r3.ebuild,v 1.3 2013/11/29 15:27:13 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r3.ebuild,v 1.4 2014/01/06 16:01:46 billie Exp $ EAPI=5 @@ -17,7 +17,7 @@ IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-i DEPEND_COMMON=" X? ( - imlib? ( media-libs/imlib2 ) + imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 >=dev-lang/lua-5.1.4-r8 @@ -25,7 +25,7 @@ DEPEND_COMMON=" lua-imlib? ( >=dev-lua/toluapp-1.0.93 >=dev-lang/lua-5.1.4-r8 - media-libs/imlib2 ) + media-libs/imlib2[X] ) nvidia? ( media-video/nvidia-settings ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 |