diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-08 14:03:22 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-08 14:03:22 +0000 |
| commit | 046a8e188ed598aaa675639960d559a50d29e886 (patch) | |
| tree | 4e84d2ff17055d486b7e60a8693af15f9a452b35 /kde-base/ksysguard | |
| parent | amd64 stable - 261585 (diff) | |
| download | gentoo-2-046a8e188ed598aaa675639960d559a50d29e886.tar.gz gentoo-2-046a8e188ed598aaa675639960d559a50d29e886.tar.bz2 gentoo-2-046a8e188ed598aaa675639960d559a50d29e886.zip | |
Semi-automatic merge, Update deps.
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'kde-base/ksysguard')
| -rw-r--r-- | kde-base/ksysguard/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/ksysguard/ksysguard-4.2.1.ebuild | 18 |
2 files changed, 16 insertions, 7 deletions
diff --git a/kde-base/ksysguard/ChangeLog b/kde-base/ksysguard/ChangeLog index 82ec6685e966..42830693cfb1 100644 --- a/kde-base/ksysguard/ChangeLog +++ b/kde-base/ksysguard/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/ksysguard # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.125 2009/03/06 01:12:38 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.126 2009/03/08 14:03:22 scarabeus Exp $ + + 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> ksysguard-4.2.1.ebuild: + Semi-automatic merge, Update deps. 06 Mar 2009; Jeroen Roovers <jer@gentoo.org> ksysguard-3.5.9-r1.ebuild: Stable for HPPA (bug #258257). diff --git a/kde-base/ksysguard/ksysguard-4.2.1.ebuild b/kde-base/ksysguard/ksysguard-4.2.1.ebuild index f0b73e7b1fec..790333777fb9 100644 --- a/kde-base/ksysguard/ksysguard-4.2.1.ebuild +++ b/kde-base/ksysguard/ksysguard-4.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.2.1.ebuild,v 1.1 2009/03/04 22:22:59 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.2.1.ebuild,v 1.2 2009/03/08 14:03:22 scarabeus Exp $ EAPI="2" @@ -12,13 +12,19 @@ DESCRIPTION="KSysguard is a network enabled task manager and system monitor appl KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="debug lm_sensors" -COMMONDEPEND="x11-libs/libXrender +COMMONDEPEND=" + x11-libs/libXrender x11-libs/libXres - lm_sensors? ( sys-apps/lm_sensors )" + lm_sensors? ( sys-apps/lm_sensors ) +" DEPEND="${COMMONDEPEND} - x11-proto/renderproto" + x11-proto/renderproto +" +RDEPEND="${COMMONDEPEND}" -KMEXTRA="libs/ksysguard/" +KMEXTRA=" + libs/ksysguard/ +" src_configure() { mycmakeargs="${mycmakeargs} @@ -28,7 +34,7 @@ src_configure() { } src_test() { -# one out of two tests are broken. we just disable it. last tested on 4.1.0. + # one out of two tests are broken. we just disable it. last tested on 4.1.0. sed -e '/guitest/s/^/#DONOTTEST/' \ -i "${S}"/libs/ksysguard/tests/CMakeLists.txt |