summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2013-08-15 15:10:05 +0000
committerMichael Palimaka <kensington@gentoo.org>2013-08-15 15:10:05 +0000
commit20a1e8b917441c1c164b9afeeb85e78950f0c007 (patch)
treeba0442a4f4eb8cbe9841cc938fc0618f530f8593 /eclass
parentStable for HPPA (bug #480650). (diff)
downloadgentoo-2-20a1e8b917441c1c164b9afeeb85e78950f0c007.tar.gz
gentoo-2-20a1e8b917441c1c164b9afeeb85e78950f0c007.tar.bz2
gentoo-2-20a1e8b917441c1c164b9afeeb85e78950f0c007.zip
Remove old, unused code.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/kde4-base.eclass11
-rw-r--r--eclass/kde4-functions.eclass59
-rw-r--r--eclass/kde4-meta.eclass38
4 files changed, 14 insertions, 100 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index ed784504c07e..da9bb76dd857 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.927 2013/08/15 14:52:58 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.928 2013/08/15 15:10:05 kensington Exp $
+
+ 15 Aug 2013; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass,
+ kde4-functions.eclass, kde4-meta.eclass:
+ Remove old, unused code.
15 Aug 2013; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass,
kde4-functions.eclass:
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index b9c421b38123..fe4c81c88819 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.128 2013/08/15 14:52:58 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.129 2013/08/15 15:10:05 kensington Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -444,13 +444,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
@@ -647,7 +641,6 @@ kde4-base_src_unpack() {
if [[ ${KDE_BUILD_TYPE} = live ]]; then
case ${KDE_SCM} in
svn)
- migrate_store_dir
subversion_src_unpack
;;
git)
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 02a5d77fee9d..c986bad71bd5 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.66 2013/08/15 14:52:58 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.67 2013/08/15 15:10:05 kensington Exp $
inherit versionator
@@ -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
@@ -221,60 +218,6 @@ enable_selected_doc_linguas() {
[[ -n "${linguas}" ]] && einfo "Enabling handbook translations:${linguas}"
}
-# @FUNCTION: migrate_store_dir
-# @DESCRIPTION:
-# Universal store dir migration
-# * performs split of kdebase to kdebase-apps when needed
-# * moves playground/extragear kde4-base-style to toplevel dir
-migrate_store_dir() {
- if [[ ${KDE_SCM} != svn ]]; then
- die "migrate_store_dir() only makes sense for subversion"
- fi
-
- local cleandir="${ESVN_STORE_DIR}/KDE"
-
- if [[ -d ${cleandir} ]]; then
- ewarn "'${cleandir}' has been found. Moving contents to new location."
- addwrite "${ESVN_STORE_DIR}"
- # Split kdebase
- local module
- if pushd "${cleandir}"/kdebase/kdebase > /dev/null; then
- for module in `find . -maxdepth 1 -type d -name [a-z0-9]\*`; do
- module="${module#./}"
- mkdir -p "${ESVN_STORE_DIR}/kdebase-${module}" && mv -f "${module}" "${ESVN_STORE_DIR}/kdebase-${module}" || \
- die "Failed to move to '${ESVN_STORE_DIR}/kdebase-${module}'."
- done
- popd > /dev/null
- rm -fr "${cleandir}/kdebase" || \
- die "Failed to remove ${cleandir}/kdebase. You need to remove it manually."
- fi
- # Move the rest
- local pkg
- for pkg in "${cleandir}"/*; do
- mv -f "${pkg}" "${ESVN_STORE_DIR}"/ || eerror "Failed to move '${pkg}'"
- done
- rmdir "${cleandir}" || die "Could not move obsolete KDE store dir. Please move '${cleandir}' contents to appropriate location (possibly ${ESVN_STORE_DIR}) and manually remove '${cleandir}' in order to continue."
- fi
-
- if ! has kde4-meta ${INHERITED}; then
- case ${KMNAME} in
- extragear*|playground*)
- local scmlocalpath="${ESVN_STORE_DIR}"/"${KMNAME}"/"${PN}"
- if [[ -d "${scmlocalpath}" ]]; then
- local destdir="${ESVN_STORE_DIR}"/"${ESVN_PROJECT}"/"`basename "${ESVN_REPO_URI}"`"
- ewarn "'${scmlocalpath}' has been found."
- ewarn "Moving contents to new location: ${destdir}"
- addwrite "${ESVN_STORE_DIR}"
- mkdir -p "${ESVN_STORE_DIR}"/"${ESVN_PROJECT}" && mv -f "${scmlocalpath}" "${destdir}" \
- || die "Failed to move to '${scmlocalpath}'"
- # Try cleaning empty directories
- rmdir "`dirname "${scmlocalpath}"`" 2> /dev/null
- fi
- ;;
- esac
- fi
-}
-
# Functions handling KMLOADLIBS and KMSAVELIBS
# @FUNCTION: save_library_dependencies
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 3cd949f4ce88..6ab62dcea74c 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.70 2013/04/07 17:46:23 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.71 2013/08/15 15:10:05 kensington Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -35,11 +35,6 @@ case ${KMNAME} in
;;
esac
;;
- kdegames)
- if [[ ${PN} != libkdegames ]]; then
- COMMONDEPEND+=" $(add_kdebase_dep libkdegames)"
- fi
- ;;
esac
DEPEND+=" ${COMMONDEPEND}"
@@ -131,7 +126,6 @@ kde4-meta_src_unpack() {
if [[ ${KDE_BUILD_TYPE} = live ]]; then
case "${KDE_SCM}" in
svn)
- migrate_store_dir
S="${WORKDIR}/${P}"
mkdir -p "${S}"
ESVN_RESTRICT="export" subversion_src_unpack
@@ -199,16 +193,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,18 +271,18 @@ 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)
+ kde-baseapps)
KMEXTRACTONLY+="
CTestConfig.cmake
config-apps.h.cmake
ConfigureChecks.cmake"
;;
- kdebase-runtime | kde-runtime)
+ kde-runtime)
KMEXTRACTONLY+="
CTestConfig.cmake
config-runtime.h.cmake"
;;
- kdebase-workspace | kde-workspace)
+ kde-workspace)
KMEXTRACTONLY+="
config-unix.h.cmake
ConfigureChecks.cmake
@@ -306,13 +291,6 @@ kde4-meta_create_extractlists() {
startkde.cmake
KDE4WorkspaceConfig.cmake.in"
;;
- kdegames)
- if [[ ${PN} != libkdegames ]]; then
- KMEXTRACTONLY+="
- libkdegames/"
- KMLOADLIBS="${KMLOADLIBS} libkdegames"
- fi
- ;;
kdepim)
if [[ ${PN} != libkdepim ]]; then
KMEXTRACTONLY+="
@@ -329,10 +307,6 @@ kde4-meta_create_extractlists() {
kontact/plugins/${PLUGINNAME:-${PN}}/"
fi
;;
- kdeutils)
- KMEXTRACTONLY+="
- kdeutils-version.h"
- ;;
esac
# Don't install cmake modules for split ebuilds, to avoid collisions.
# note: kdegraphics >= 4.6.2 does not even have code to do that, so we
@@ -511,7 +485,7 @@ kde4-meta_change_cmakelists() {
done
case ${KMNAME} in
- kdebase-workspace | kde-workspace)
+ kde-workspace)
# COLLISION PROTECT section
# Install the startkde script just once, as a part of kde-base/kdebase-startkde,
# not as a part of every package.