diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-06-27 10:52:04 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-06-27 10:52:04 +0000 |
| commit | c3c0d6d9acfcbb3d0cd3dbd469fa25f43db02c51 (patch) | |
| tree | b8c8d96c02a7ec4ac66fd41ccfa025197fee272e /eclass | |
| parent | Add a patch to fix security bug #138125. Also use autotools.eclass to reconfi... (diff) | |
| download | historical-c3c0d6d9acfcbb3d0cd3dbd469fa25f43db02c51.tar.gz historical-c3c0d6d9acfcbb3d0cd3dbd469fa25f43db02c51.tar.bz2 historical-c3c0d6d9acfcbb3d0cd3dbd469fa25f43db02c51.zip | |
Don't extract the whole tarball when using meta, run unpack only if the source directory is missing. Tweak a bit the message to be similar to the one used by portage.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde-meta.eclass | 6 | ||||
| -rw-r--r-- | eclass/kde.eclass | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/eclass/kde-meta.eclass b/eclass/kde-meta.eclass index f8686f6a5acd..925ef26f9169 100644 --- a/eclass/kde-meta.eclass +++ b/eclass/kde-meta.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-meta.eclass,v 1.76 2006/06/11 12:57:07 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.77 2006/06/27 10:52:04 flameeyes Exp $ # # Author Dan Armak <danarmak@gentoo.org> # Simone Gotti <motaboy@gentoo.org> @@ -330,10 +330,12 @@ function kde-meta_src_unpack() { fi cd $WORKDIR - echo ">>> Extracting from tarball..." + echo ">>> Unpacking parts of ${TARBALL} to ${WORKDIR}" # Note that KMTARPARAMS is also used by an ebuild tar -xpf $TARFILE $KMTARPARAMS $extractlist 2> /dev/null + unpack ${A/${TARBALL}/} + # Avoid syncing if possible # No idea what the above comment means... if [[ -n "$RAWTARBALL" ]]; then diff --git a/eclass/kde.eclass b/eclass/kde.eclass index 52517a4c6599..d808b00ec069 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.168 2006/06/15 16:33:39 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.169 2006/06/27 10:52:04 flameeyes Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -87,12 +87,14 @@ kde_pkg_setup() { kde_src_unpack() { debug-print-function $FUNCNAME $* + [[ -z ${KDE_S} ]] && KDE_S="${S}" + 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 + # 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 + [[ -d ${KDE_S} ]] || base_src_unpack unpack if [[ -d "${PATCHDIR}" ]] ; then if is-parent-package ${CATEGORY}/${PN} ; then packages="$(get-child-packages ${CATEGORY}/${PN})" @@ -114,8 +116,6 @@ kde_src_unpack() { base_src_unpack $* fi - [[ -z ${KDE_S} ]] && KDE_S="${S}" - # if extragear-like packaging is enabled, set the translations and the # documentation depending on LINGUAS settings if [[ -n ${USE_KEG_PACKAGING} ]]; then |