diff options
author | Jonathan Callen <abcd@gentoo.org> | 2010-01-30 03:37:06 +0000 |
---|---|---|
committer | Jonathan Callen <abcd@gentoo.org> | 2010-01-30 03:37:06 +0000 |
commit | 503a6a07b8fe704f6473b3ada3597afb0de25943 (patch) | |
tree | a7c27a8a2fe3d8681c7bcf2a6d4fb45bc5ea086d /kde-base | |
parent | Don't add prefix to CONFIG_PROTECT (added by portage automatically); add pref... (diff) | |
download | gentoo-2-503a6a07b8fe704f6473b3ada3597afb0de25943.tar.gz gentoo-2-503a6a07b8fe704f6473b3ada3597afb0de25943.tar.bz2 gentoo-2-503a6a07b8fe704f6473b3ada3597afb0de25943.zip |
Move kde-env dep to RDEPEND (no longer a circular dep)
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kdelibs/ChangeLog | 5 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-4.3.5.ebuild | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 840e51c7940b..37b5a03f9bcb 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.668 2010/01/25 15:17:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.669 2010/01/30 03:37:06 abcd Exp $ + + 30 Jan 2010; Jonathan Callen <abcd@gentoo.org> kdelibs-4.3.5.ebuild: + Move kde-env dep to RDEPEND (no longer a circular dep) *kdelibs-4.3.5 (25 Jan 2010) diff --git a/kde-base/kdelibs/kdelibs-4.3.5.ebuild b/kde-base/kdelibs/kdelibs-4.3.5.ebuild index c1af9803a576..0e8bd1cc9fb6 100644 --- a/kde-base/kdelibs/kdelibs-4.3.5.ebuild +++ b/kde-base/kdelibs/kdelibs-4.3.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.5.ebuild,v 1.1 2010/01/25 15:17:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.5.ebuild,v 1.2 2010/01/30 03:37:06 abcd Exp $ EAPI="2" @@ -87,15 +87,13 @@ RDEPEND="${COMMONDEPEND} !<=kde-misc/kdnssd-avahi-0.1.2:0 !x11-libs/qt-phonon >=app-crypt/gnupg-2.0.11 + $(add_kdebase_dep kde-env) !aqua? ( x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 ) " -PDEPEND=" - $(add_kdebase_dep kde-env) -" # Blockers added due to packages from old versions, removed in the meanwhile # as well as for file collisions @@ -294,7 +292,7 @@ pkg_postinst() { pkg_prerm() { # Remove ksycoca4 global database - rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 + rm -f "${EROOT}${KDEDIR}"/share/kde4/services/ksycoca4 } pkg_postrm() { |