summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-08 14:00:57 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-08 14:00:57 +0000
commit398d32ff2c76e6f8930f512b31058025d80172be (patch)
tree1a7e488182c1f2eeba931e59e1b890e00cc91c05 /kde-base/ksplash
parentSemi-automatic merge, Update deps. (diff)
downloadgentoo-2-398d32ff2c76e6f8930f512b31058025d80172be.tar.gz
gentoo-2-398d32ff2c76e6f8930f512b31058025d80172be.tar.bz2
gentoo-2-398d32ff2c76e6f8930f512b31058025d80172be.zip
Semi-automatic merge, Update deps.
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'kde-base/ksplash')
-rw-r--r--kde-base/ksplash/ChangeLog5
-rw-r--r--kde-base/ksplash/ksplash-4.2.1.ebuild24
2 files changed, 18 insertions, 11 deletions
diff --git a/kde-base/ksplash/ChangeLog b/kde-base/ksplash/ChangeLog
index ea1cfd768f0b..0f3177d4d7b1 100644
--- a/kde-base/ksplash/ChangeLog
+++ b/kde-base/ksplash/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/ksplash
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.20 2009/03/04 22:18:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.21 2009/03/08 14:00:57 scarabeus Exp $
+
+ 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> ksplash-4.2.1.ebuild:
+ Semi-automatic merge, Update deps.
*ksplash-4.2.1 (04 Mar 2009)
diff --git a/kde-base/ksplash/ksplash-4.2.1.ebuild b/kde-base/ksplash/ksplash-4.2.1.ebuild
index c1f6aea040f8..be002a28877c 100644
--- a/kde-base/ksplash/ksplash-4.2.1.ebuild
+++ b/kde-base/ksplash/ksplash-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/ksplash/ksplash-4.2.1.ebuild,v 1.1 2009/03/04 22:18:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.2.1.ebuild,v 1.2 2009/03/08 14:00:57 scarabeus Exp $
EAPI="2"
@@ -11,18 +11,22 @@ DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="3dnow altivec debug mmx sse sse2 xinerama"
-RDEPEND="media-libs/libpng
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
- xinerama? ( x11-proto/xineramaproto )"
+COMMONDEPEND="
+ media-libs/libpng
+ xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+ xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}"
src_configure() {
mycmakeargs="${mycmakeargs}
- $(cmake-utils_has 3dnow X86_3DNOW)
- $(cmake-utils_has altivec PPC_ALTIVEC)
- $(cmake-utils_has mmx X86_MMX)
- $(cmake-utils_has sse X86_SSE)
- $(cmake-utils_has sse2 X86_SSE2)
+ $(cmake-utils_use_has 3dnow X86_3DNOW)
+ $(cmake-utils_use_has altivec PPC_ALTIVEC)
+ $(cmake-utils_use_has mmx X86_MMX)
+ $(cmake-utils_use_has sse X86_SSE)
+ $(cmake-utils_use_has sse2 X86_SSE2)
$(cmake-utils_use_with xinerama X11_Xinerama)"
kde4-meta_src_configure