commit: 07106dea029be1b8d211eff8ab98c92afb6db6bc
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 16 13:45:16 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep 16 13:45:16 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=07106dea
[eclass] Avoid code duplication as per review from pesa.
---
eclass/kde4-functions.eclass | 4 ++--
eclass/kde5-functions.eclass | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 3b3f251..b86d7dd 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -37,13 +37,13 @@ esac
# This gets set to a non-zero value when a package is considered a kde or
# kdevelop ebuild.
if [[ ${CATEGORY} = kde-base ]]; then
- debug-print "${ECLASS}: KDEBASE ebuild recognized"
KDEBASE=kde-base
elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
- debug-print "${ECLASS}: KDEVELOP ebuild recognized"
KDEBASE=kdevelop
fi
+debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"
+
# determine the build type
if [[ ${PV} = *9999* ]]; then
KDE_BUILD_TYPE="live"
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 5247950..18b0b1a 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -28,16 +28,15 @@ esac
# This gets set to a non-zero value when a package is considered a kde or
# kdevelop ebuild.
if [[ ${CATEGORY} = kde-base ]]; then
- debug-print "${ECLASS}: KDEBASE ebuild recognized"
KDEBASE=kde-base
elif [[ ${CATEGORY} = kde-frameworks ]]; then
- debug-print "${ECLASS}: KDEFRAMEWORKS ebuild recognized"
KDEBASE=kde-frameworks
elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
- debug-print "${ECLASS}: KDEVELOP ebuild recognized"
KDEBASE=kdevelop
fi
+debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"
+
# @ECLASS-VARIABLE: KDE_SCM
# @DESCRIPTION:
# SCM to use if this is a live ebuild.
