diff options
| author |   Carsten Lohrke <carlo@gentoo.org> | 2006-06-11 10:42:29 +0000 |
|---|---|---|
| committer | Carsten Lohrke <carlo@gentoo.org> | 2006-06-11 10:42:29 +0000 |
| commit | c2315fa81996f92035e5778196e368f902dbc259 (patch) | |
| tree | 28a964f2b605967e4f97bec62f92d6bb5a6f2f13 /eclass/kde.eclass | |
| parent | Improved KDE patch handling. (diff) | |
| download | gentoo-2-c2315fa81996f92035e5778196e368f902dbc259.tar.gz gentoo-2-c2315fa81996f92035e5778196e368f902dbc259.tar.bz2 gentoo-2-c2315fa81996f92035e5778196e368f902dbc259.zip | |
Revert for now, as repoman bails out because of new rdepend policy checks.
Diffstat (limited to 'eclass/kde.eclass')
| -rw-r--r-- | eclass/kde.eclass | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/eclass/kde.eclass b/eclass/kde.eclass index 13f3bcc5b8a3..647388810616 100644 --- a/eclass/kde.eclass +++ b/eclass/kde.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.165 2006/06/11 10:28:58 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.166 2006/06/11 10:42:29 carlo Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -87,32 +87,32 @@ kde_pkg_setup() { kde_src_unpack() { debug-print-function $FUNCNAME $* - local PATCHDIR="${WORKDIR}/patches/" - if [[ -z $* ]] ; then - # Unpack first and deal with KDE patches after examing possible patch sets. - # To be picked up, patches need to be named $PN-$PV-*{diff,patch} and be - # placed in $PATCHDIR. Monolithic ebuilds will use the split ebuild patches. - base_src_unpack unpack - if [[ -d "${PATCHDIR}" ]] ; then - if is-parent-package ${CATEGORY}/${PN} ; then - packages="$(get-child-packages ${CATEGORY}/${PN})" - packages="${packages//${CATEGORY}\//} ${PN}" - else - packages="${PN}" - fi - for _p in ${packages} ; do - PATCHES="${PATCHES} $(ls ${PATCHDIR}/${_p}-${PV}-*{diff,patch} 2>/dev/null)" - if [[ -n "${KDEBASE}" ]] ; then - PATCHES="${PATCHES} $(ls ${PATCHDIR}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null)" - fi - done - fi - [[ -n ${PATCHES} ]] && base_src_unpack autopatch - else +# local PATCHDIR="${WORKDIR}/patches/" +# if [[ -z $* ]] ; then +# # Unpack first and deal with KDE patches after examing possible patch sets. +# # To be picked up, patches need to be named $PN-$PV-*{diff,patch} and be +# # placed in $PATCHDIR. Monolithic ebuilds will use the split ebuild patches. +# base_src_unpack unpack +# if [[ -d "${PATCHDIR}" ]] ; then +# if is-parent-package ${CATEGORY}/${PN} ; then +# packages="$(get-child-packages ${CATEGORY}/${PN})" +# packages="${packages//${CATEGORY}\//} ${PN}" +# else +# packages="${PN}" +# fi +# for _p in ${packages} ; do +# PATCHES="${PATCHES} $(ls ${PATCHDIR}/${_p}-${PV}-*{diff,patch} 2>/dev/null)" +# if [[ -n "${KDEBASE}" ]] ; then +# PATCHES="${PATCHES} $(ls ${PATCHDIR}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null)" +# fi +# done +# fi +# [[ -n ${PATCHES} ]] && base_src_unpack autopatch +# else # Call base_src_unpack, which has sections, to do unpacking and patching # step by step transparently as defined in the ebuild. base_src_unpack $* - fi +# fi [[ -z ${KDE_S} ]] && KDE_S="${S}" |