From 32a1563ab607e0b3ac1eb6961f84bd68193d8d6c Mon Sep 17 00:00:00 2001 From: Maciej Mrozowski Date: Sat, 15 May 2010 22:35:26 +0000 Subject: [PATCH] Use improved ebuild from kde overlay Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-util/kdevelop/ChangeLog | 5 ++++- dev-util/kdevelop/kdevelop-4.0.0.ebuild | 14 +++----------- dev-util/kdevplatform/ChangeLog | 6 +++++- dev-util/kdevplatform/kdevplatform-1.0.0.ebuild | 15 ++++----------- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog index bfacce034062..7a589a2f757e 100644 --- a/dev-util/kdevelop/ChangeLog +++ b/dev-util/kdevelop/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/kdevelop # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.194 2010/04/29 05:07:50 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.195 2010/05/15 22:35:26 reavertm Exp $ + + 15 May 2010; Maciej Mrozowski kdevelop-4.0.0.ebuild: + Use improved ebuild from kde overlay *kdevelop-4.0.0 (29 Apr 2010) diff --git a/dev-util/kdevelop/kdevelop-4.0.0.ebuild b/dev-util/kdevelop/kdevelop-4.0.0.ebuild index e1c1b9000aca..5fb1dd3ccb99 100644 --- a/dev-util/kdevelop/kdevelop-4.0.0.ebuild +++ b/dev-util/kdevelop/kdevelop-4.0.0.ebuild @@ -1,31 +1,23 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.0.0.ebuild,v 1.1 2010/04/29 05:07:50 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.0.0.ebuild,v 1.2 2010/05/15 22:35:26 reavertm Exp $ EAPI="2" -if [[ ${PV} == *9999* ]]; then - KDEVPLATFORM_PV="9999" -else +if [[ ${PV} != *9999* ]]; then KDE_LINGUAS="ca ca@valencia da de en_GB es et fr gl it nds pt pt_BR sv tr uk zh_CN zh_TW" - inherit versionator - KDEVPLATFORM_PV="$(($(get_major_version)-3)).$(get_after_major_version)" fi -KMNAME="extragear/sdk" +KMNAME="kdevelop" inherit kde4-base DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages." -HOMEPAGE="http://www.kdevelop.org/" -[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" KEYWORDS="~amd64 ~hppa ~x86" -SLOT="4" IUSE="+cmake +cxx debug +qmake qthelp" DEPEND=" - >=dev-util/kdevplatform-${KDEVPLATFORM_PV} >=kde-base/ksysguard-${KDE_MINIMAL} >=kde-base/libkworkspace-${KDE_MINIMAL} qthelp? ( >=x11-libs/qt-assistant-4.4:4 ) diff --git a/dev-util/kdevplatform/ChangeLog b/dev-util/kdevplatform/ChangeLog index 926bce61b5eb..c60ffe3ee346 100644 --- a/dev-util/kdevplatform/ChangeLog +++ b/dev-util/kdevplatform/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/kdevplatform # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.26 2010/05/12 16:24:48 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.27 2010/05/15 22:33:55 reavertm Exp $ + + 15 May 2010; Maciej Mrozowski + kdevplatform-1.0.0.ebuild: + Use improved ebuild from kde overlay 12 May 2010; Brent Baude kdevplatform-0.9.97-r1.ebuild: diff --git a/dev-util/kdevplatform/kdevplatform-1.0.0.ebuild b/dev-util/kdevplatform/kdevplatform-1.0.0.ebuild index b2de4a727f9f..45d6df2f1bab 100644 --- a/dev-util/kdevplatform/kdevplatform-1.0.0.ebuild +++ b/dev-util/kdevplatform/kdevplatform-1.0.0.ebuild @@ -1,27 +1,20 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.0.0.ebuild,v 1.1 2010/04/29 05:05:57 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.0.0.ebuild,v 1.2 2010/05/15 22:33:55 reavertm Exp $ EAPI="2" -if [[ ${PV} == *9999* ]]; then - KDEVELOP_PV="9999" -else +if [[ ${PV} != *9999* ]]; then KDE_LINGUAS="ca ca@valencia da de en_GB es et fr gl it nds pt pt_BR sv tr uk zh_CN zh_TW" - inherit versionator - KDEVELOP_PV="$(($(get_major_version)+3)).$(get_after_major_version)" fi -KMNAME="extragear/sdk" +KMNAME="kdevelop" inherit kde4-base DESCRIPTION="KDE development support libraries and apps" -HOMEPAGE="http://www.kdevelop.org/" -[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_PV}/src/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -SLOT="4" # Moved to playground for now # bazaar git kompare mercurial IUSE="cvs debug subversion" @@ -38,7 +31,7 @@ DEPEND=" subversion? ( >=dev-util/subversion-1.3 ) " RDEPEND="${DEPEND} - !