From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6E1461381F3 for ; Mon, 15 Apr 2013 10:41:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F04ADE085D; Mon, 15 Apr 2013 10:41:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6FA0BE085D for ; Mon, 15 Apr 2013 10:41:26 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 877C233DC68 for ; Mon, 15 Apr 2013 10:41:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 26E83E4360 for ; Mon, 15 Apr 2013 10:41:24 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1366022371.b1ec91d013769b78b122c3467269fa026e5dffee.kensington@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.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: b1ec91d013769b78b122c3467269fa026e5dffee X-VCS-Branch: master Date: Mon, 15 Apr 2013 10:41:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fb682cb8-7400-4bf2-a851-99bd4ea3eb01 X-Archives-Hash: b5b6da03e19f120f36bfc168f41fa5ad commit: b1ec91d013769b78b122c3467269fa026e5dffee Author: Michael Palimaka gentoo org> AuthorDate: Mon Apr 15 10:37:44 2013 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Mon Apr 15 10:39:31 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b1ec91d0 [eclass] Remove support for kde-baseapps since it no longer exists. --- eclass/kde4-base.eclass | 8 +------- eclass/kde4-functions.eclass | 3 --- eclass/kde4-meta.eclass | 15 +++------------ 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index ebcba74..7ca6d96 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -420,13 +420,7 @@ _calculate_src_uri() { # calculate tarball module name if [[ -n ${KMNAME} ]]; then - # fixup kdebase-apps name - case ${KMNAME} in - kdebase-apps) - _kmname="kdebase" ;; - *) - _kmname="${KMNAME}" ;; - esac + _kmname="${KMNAME}" else _kmname=${PN} fi diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 56baa76..f8e5182 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -62,9 +62,6 @@ if [[ ${KDE_BUILD_TYPE} == live ]]; then kdebase-runtime) EGIT_REPONAME=${EGIT_REPONAME:=kde-runtime} ;; - kdebase-apps) - EGIT_REPONAME=${EGIT_REPONAME:=kde-baseapps} - ;; esac fi diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 9027fae..1438ab2 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -24,7 +24,7 @@ EXPORT_FUNCTIONS ${KDEMETA_EXPF} # Add dependencies that all packages in a certain module share. case ${KMNAME} in - kdebase|kdebase-apps|kde-baseapps|kdebase-runtime|kde-runtime|kdegraphics) + kdebase|kde-baseapps|kdebase-runtime|kde-runtime|kdegraphics) COMMONDEPEND+=" >=media-libs/qimageblitz-0.0.4" ;; kdepim|kdepim-runtime) @@ -199,16 +199,7 @@ kde4-meta_src_extract() { KMTARPARAMS+=" --xz" fi - case ${KMNAME} in - kdebase-apps) - # kdebase/apps -> kdebase-apps - tarball="kdebase-${PV}.tar.${postfix}" - ;; - *) - # Create tarball name from module name (this is the default) - tarball="${KMNAME}-${PV}.tar.${postfix}" - ;; - esac + tarball="${KMNAME}-${PV}.tar.${postfix}" # Full path to source tarball tarfile="${DISTDIR}/${tarball}" @@ -286,7 +277,7 @@ kde4-meta_create_extractlists() { # Note that this actually doesn't include KMEXTRA handling. # In those cases you should care to add the relevant files to KMEXTRACTONLY case ${KMNAME} in - kdebase | kdebase-apps | kde-baseapps) + kdebase | kde-baseapps) KMEXTRACTONLY+=" CTestConfig.cmake config-apps.h.cmake