diff options
author | Jonathan Callen <abcd@gentoo.org> | 2009-11-20 18:47:59 +0000 |
---|---|---|
committer | Jonathan Callen <abcd@gentoo.org> | 2009-11-20 18:47:59 +0000 |
commit | 7536ba70b85e1ebe6d8ab4b0d47784b595194d88 (patch) | |
tree | fc1036471f103a8ccc5a6cff61f733e4ebed2f8e /kde-base | |
parent | Version bump. (diff) | |
download | gentoo-2-7536ba70b85e1ebe6d8ab4b0d47784b595194d88.tar.gz gentoo-2-7536ba70b85e1ebe6d8ab4b0d47784b595194d88.tar.bz2 gentoo-2-7536ba70b85e1ebe6d8ab4b0d47784b595194d88.zip |
Switch to EAPI=2 to add a USE 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-3.5.10-r6.ebuild | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index b8acc078f370..3d1ca9e591a6 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.642 2009/11/11 14:37:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.643 2009/11/20 18:47:59 abcd Exp $ + + 20 Nov 2009; Jonathan Callen <abcd@gentoo.org> kdelibs-3.5.10-r6.ebuild: + Switch to EAPI=2 to add a USE dep 11 Nov 2009; Samuli Suominen <ssuominen@gentoo.org> kdelibs-3.5.10-r6.ebuild: diff --git a/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild b/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild index 61f5a3d4c799..23f240615a0f 100644 --- a/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild +++ b/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild,v 1.9 2009/11/11 14:37:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild,v 1.10 2009/11/20 18:47:59 abcd Exp $ -EAPI="1" +EAPI="2" ARTS_REQUIRED=never inherit kde flag-o-matic eutils multilib set-kdedir 3.5 @@ -54,7 +54,7 @@ RDEPEND=" >=sys-apps/portage-2.1.2.11 virtual/ghostscript x11-libs/libXext - >=x11-libs/qt-3.3.3:3 + >=x11-libs/qt-3.3.3:3[doc?] acl? ( virtual/acl ) @@ -115,9 +115,7 @@ pkg_setup() { fi } -src_unpack() { - kde_src_unpack - +src_prepare() { # remove this symlink, bug 264767 rm -f "${WORKDIR}/${P}"/kdeprint/kdeprint @@ -156,7 +154,7 @@ src_unpack() { epatch "${FILESDIR}/${P}-khtml.patch" } -src_compile() { +src_configure() { rm -f "${S}/configure" myconf="--with-distribution=Gentoo --disable-fast-malloc @@ -191,6 +189,10 @@ src_compile() { replace-flags "-O3" "-O2" # see bug #148180 + kde_src_configure +} + +src_compile() { kde_src_compile if use doc; then |