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 1Q2hvj-0003UO-Gq for garchives@archives.gentoo.org; Thu, 24 Mar 2011 10:38:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E021DE0484; Thu, 24 Mar 2011 10:38:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AEFC9E0484 for ; Thu, 24 Mar 2011 10:38:06 +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 5426C1B4005 for ; Thu, 24 Mar 2011 10:38:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id AD0DF8006A for ; Thu, 24 Mar 2011 10:38:05 +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: Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde4-base.eclass X-VCS-Directories: eclass/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: e4068d3606c944381de83e24f97d5bdcb3ee0e23 Date: Thu, 24 Mar 2011 10:38:05 +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: 914b0f48848cfcb9935a388b44b73bd0 commit: e4068d3606c944381de83e24f97d5bdcb3ee0e23 Author: Tomas Chvatal gentoo org> AuthorDate: Thu Mar 24 10:37:59 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Thu Mar 24 10:37:59 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3De4068d36 kde4-base calculate slots more gracefully. --- eclass/kde4-base.eclass | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 3d7e02a..f30aff8 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -20,7 +20,7 @@ # for tests you should proceed with setting VIRTUALX_REQUIRED=3Dtest. : ${VIRTUALX_REQUIRED:=3Dmanual} =20 -inherit kde4-functions fdo-mime gnome2-utils base virtualx eutils +inherit kde4-functions fdo-mime gnome2-utils base virtualx versionator e= utils =20 if [[ ${BUILD_TYPE} =3D live ]]; then case ${KDE_SCM} in @@ -64,15 +64,19 @@ KDE_MINIMAL=3D"${KDE_MINIMAL:-4.4}" # Set slot for KDEBASE known packages case ${KDEBASE} in kde-base) + major=3D$(get_major_version) + minor=3D$(get_version_component_range 2) + micro=3D$(get_version_component_range 3) # Determine SLOT from PVs - case ${PV} in - *.9999*) SLOT=3D"${PV/.9999*/}" ;; # stable live - 4.6* | 4.5.[6-9][0-9]*) SLOT=3D"4.6" ;; - 4.5* | 4.4.[6-9][0-9]*) SLOT=3D"4.5" ;; - 4.4* | 4.3.[6-9][0-9]*) SLOT=3D"4.4" ;; - 9999*) SLOT=3D"live" ;; # regular live - *) die "Unsupported ${PV}" ;; - esac + [[ ${PV} =3D=3D 9999* ]] && SLOT=3Dlive # regular live + [[ ${major} -eq 4 && ${micro} =3D=3D 9999 ]] && SLOT=3D${major}.${mino= r} # stable live + if [[ ${major} -eq 4 && ${micro} !=3D 9999 ]]; then + [[ ${micro} -lt 60 ]] && \ + SLOT=3D${major}.${minor} + [[ ${micro} -ge 60 ]] && + SLOT=3D${major}.$(($minor + 1)) + fi + [[ -z ${SLOT} ]] && die "Unsupported ${PV}" KDE_MINIMAL=3D"${SLOT}" ;; koffice) @@ -387,8 +391,8 @@ fi if [[ ${KDEBASE} !=3D "kde-base" ]] && [[ -n ${KDE_LINGUAS} ]] && has "$= {EAPI:-0}" 4; then usedep=3D'' for _lingua in ${KDE_LINGUAS}; do - [[ -n ${usedep} ]] && usedep=3D"${usedep}," - usedep=3D"${usedep}linguas_${_lingua}(+)?" + [[ -n ${usedep} ]] && usedep+=3D"," + usedep+=3D"linguas_${_lingua}(+)?" done # if our package has lignuas pull in kde-l10n with selected lingua kderdepend+=3D" $(add_kdebase_dep kde-l10n ${usedep})"