From 37172954c0a058aba177da9d330af5111ed221f6 Mon Sep 17 00:00:00 2001 From: Carsten Lohrke Date: Tue, 28 Mar 2006 17:56:18 +0000 Subject: [PATCH] Restore dependency fixes, make cvs optional. Package-Manager: portage-2.0.54 --- dev-util/kdevelop/ChangeLog | 5 ++++- dev-util/kdevelop/Manifest | 4 ++-- dev-util/kdevelop/kdevelop-3.3.2.ebuild | 20 +++++++++----------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog index 0d30b38186e4..460c98ac8d1b 100644 --- a/dev-util/kdevelop/ChangeLog +++ b/dev-util/kdevelop/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/kdevelop # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.112 2006/03/28 17:39:01 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.113 2006/03/28 17:56:18 carlo Exp $ + + 28 Mar 2006; Carsten Lohrke kdevelop-3.3.2.ebuild: + Restore dependency fixes, make cvs optional. *kdevelop-3.3.2 (28 Mar 2006) diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest index 2473b6e6524c..be381a8900c1 100644 --- a/dev-util/kdevelop/Manifest +++ b/dev-util/kdevelop/Manifest @@ -1,4 +1,4 @@ -MD5 c9b618a7a7847514ce42364a129ee41d ChangeLog 17172 +MD5 c39043cc248107db00033d5a64fcfb85 ChangeLog 17292 MD5 529d6ae5875e5eff1f3ec62dd5234e81 files/digest-kdevelop-3.1.2 68 MD5 3e9fd708ae657cffd1d68041f52aabc8 files/digest-kdevelop-3.2.1-r1 68 MD5 a94b1b00d38f496db64b8fcbd85bbb9b files/digest-kdevelop-3.2.2 68 @@ -21,5 +21,5 @@ MD5 dec73ae3a6b2e0c29b673b50e83e7f49 kdevelop-3.2.3-r1.ebuild 2999 MD5 9a9549087cbbd316790c894ca0c96ce3 kdevelop-3.2.3.ebuild 2882 MD5 09f0712642adef858165f66654af4131 kdevelop-3.3.0.ebuild 2968 MD5 9f79d94a4a2ea9d4457ab62fae6d7f56 kdevelop-3.3.1.ebuild 2841 -MD5 3780b51ef94d61e11ba8fba2a9d22a0a kdevelop-3.3.2.ebuild 2886 +MD5 1c6ad01d7d223ff97bed31926e033cbe kdevelop-3.3.2.ebuild 2921 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 diff --git a/dev-util/kdevelop/kdevelop-3.3.2.ebuild b/dev-util/kdevelop/kdevelop-3.3.2.ebuild index d85fb5b64bcb..80c38b6e4fd6 100644 --- a/dev-util/kdevelop/kdevelop-3.3.2.ebuild +++ b/dev-util/kdevelop/kdevelop-3.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.3.2.ebuild,v 1.1 2006/03/28 17:39:01 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.3.2.ebuild,v 1.2 2006/03/28 17:56:18 carlo Exp $ inherit kde eutils @@ -13,18 +13,16 @@ LICENSE="GPL-2" SLOT="3" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="ada clearcase fortran haskell java pascal perforce perl php python ruby sql subversion" - -DEPEND="dev-lang/perl - sys-devel/flex - sys-devel/gdb - >=sys-libs/db-4 - || ( kde-base/cervisia kde-base/kdesdk )" +IUSE="ada clearcase cvs fortran haskell java pascal perforce perl php python ruby sql subversion" +DEPEND="sys-devel/gdb + =sys-libs/db-4.1* + cvs? ( || ( kde-base/cervisia kde-base/kdesdk ) )" RDEPEND="${DEPEND} subversion? ( || ( kde-base/kdesdk-kioslaves kde-base/kdesdk ) )" - -need-kde 3.3 +DEPEND="${DEPEND} + sys-devel/flex" +need-kde 3.5 src_unpack() { kde_src_unpack @@ -49,7 +47,7 @@ src_compile() { myconf="${myconf} $(use_enable java antproject)" # version control systems - myconf="${myconf} $(use_enable clearcase) $(use_enable perforce) + myconf="${myconf} $(use_enable cvs) $(use_enable clearcase) $(use_enable perforce) $(use_enable subversion)" kde_src_compile -- 2.26.2