From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q7Tro-0000tP-Nl for garchives@archives.gentoo.org; Wed, 06 Apr 2011 14:37:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3B3E1C174; Wed, 6 Apr 2011 14:30:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 26A0A1C176 for ; Wed, 6 Apr 2011 14:24:41 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8EDB11B40F3 for ; Wed, 6 Apr 2011 14:24:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F3C9480065 for ; Wed, 6 Apr 2011 14:24:39 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: <78ce695673a97a18442e7d89295018c93c45ac2e.scarabeus@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde4-base.eclass eclass/kde4-functions.eclass eclass/kde4-meta-pkg.eclass eclass/kde4-meta.eclass X-VCS-Directories: eclass/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: 78ce695673a97a18442e7d89295018c93c45ac2e Date: Wed, 6 Apr 2011 14:24:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 11c69f70c1c54238b804bd6211a30a82 commit: 78ce695673a97a18442e7d89295018c93c45ac2e Author: Tomas Chvatal gentoo org> AuthorDate: Wed Apr 6 14:24:20 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Wed Apr 6 14:24:20 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D78ce6956 [eclasses] sync back from main tree. --- eclass/kde4-base.eclass | 2 +- eclass/kde4-functions.eclass | 6 +++--- eclass/kde4-meta-pkg.eclass | 3 ++- eclass/kde4-meta.eclass | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 998f2b2..c56404c 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.87 2011/0= 4/06 14:22:14 scarabeus Exp $ =20 # @ECLASS: kde4-base.eclass # @MAINTAINER: diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 1765a2a..f229775 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.41 2= 010/12/29 17:56:34 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.45 2= 011/04/06 14:22:14 scarabeus Exp $ =20 inherit versionator =20 @@ -401,7 +401,7 @@ add_kdebase_dep() { elif [[ ${KDEBASE} !=3D kde-base ]]; then ver=3D${KDE_MINIMAL} # FIXME remove hack when kdepim-4.4.* is gone - elif [[ ( ${KMNAME} =3D=3D kdepim || ${PN} =3D=3D kdepim-runtime ) && $= {PV} =3D=3D 4.4.[6-8] && ${1} =3D~ ^kde(pim)?libs$ ]]; then + elif [[ ( ${KMNAME} =3D=3D kdepim || ${PN} =3D=3D kdepim-runtime ) && $= {SLOT} =3D=3D 4.4 && ${1} =3D~ ^(kde(pim)?libs|oxygen-icons)$ ]]; then ver=3D4.4.5 # FIXME remove hack when kdepim-4.6beta is gone elif [[ ( ${KMNAME} =3D=3D kdepim || ${PN} =3D=3D kdepim-runtime ) && $= {PV} =3D=3D 4.5.98 && ${1} =3D~ ^(kde(pim)?libs|oxygen-icons)$ ]]; then diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass index 70b4805..529de17 100644 --- a/eclass/kde4-meta-pkg.eclass +++ b/eclass/kde4-meta-pkg.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.1 201= 1/04/06 14:22:14 scarabeus Exp $ =20 # @ECLASS: kde4-meta-pkg.eclass # @MAINTAINER: @@ -19,4 +19,5 @@ RDEPEND=3D"$(block_other_slots)" =20 SLOT=3D$(_calculate_kde_slot) [[ -z ${SLOT} ]] && die "Unsupported ${PV}" +# portage dies out if last statement is like above so we need to pass tr= ue : diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 24c8921..76b6bbe 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.47 2010/1= 2/29 17:56:34 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.51 2011/0= 4/06 14:22:14 scarabeus Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: