diff options
| author |   Dan Armak <danarmak@gentoo.org> | 2002-07-18 17:37:32 +0000 |
|---|---|---|
| committer | Dan Armak <danarmak@gentoo.org> | 2002-07-18 17:37:32 +0000 |
| commit | c98d68da23126af867dcb15b3f269a481de6777f (patch) | |
| tree | d06452e0c779c88bc4bdd2046b3adfca7aef6777 /eclass | |
| parent | fixed imporper KEYWORDS (diff) | |
| download | gentoo-2-c98d68da23126af867dcb15b3f269a481de6777f.tar.gz gentoo-2-c98d68da23126af867dcb15b3f269a481de6777f.tar.bz2 gentoo-2-c98d68da23126af867dcb15b3f269a481de6777f.zip | |
fix handling of modules that don't have an admin/ subdir and have to use the one from kde-common, like kdenetwork
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/cvs.eclass | 11 | ||||
| -rw-r--r-- | eclass/kde-source.eclass | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass index 64cf38dbcdf2..ebc83f1a3b10 100644 --- a/eclass/cvs.eclass +++ b/eclass/cvs.eclass @@ -1,7 +1,7 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Dan Armak <danarmak@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.3 2002/07/18 14:07:15 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.4 2002/07/18 17:37:32 danarmak Exp $ # This eclass provides the generic cvs fetching functions. ECLASS=cvs @@ -142,15 +142,6 @@ cvs_src_unpack() { # delete them, so this has to be self-contained cp -Rf ${ECVS_TOP_DIR}/${ECVS_MODULE} $WORKDIR - # typically for kde cvs, the admin subdir lives in the kde-common module - # which is also needed - if [ ! -d "${WORKDIR}/${ECVS_MODULE}/admin" ]; then - ECVS_MODULE="kde-common" cvs_fetch - einfo "Copying admin/ subdir from module kde-common, $ECVS_TOP_DIR..." - debug-print "Copying admin/ subdir from module kde-common, $ECVS_TOP_DIR..." - cp -Rf ${ECVS_TOP_DIR}/${ECVS_MODULE} $WORKDIR - fi - } EXPORT_FUNCTIONS src_unpack diff --git a/eclass/kde-source.eclass b/eclass/kde-source.eclass index 0d1b09305d27..55e365b0216a 100644 --- a/eclass/kde-source.eclass +++ b/eclass/kde-source.eclass @@ -1,7 +1,7 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Dan Armak <danarmak@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-source.eclass,v 1.1 2002/07/17 20:25:16 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-source.eclass,v 1.2 2002/07/18 17:37:32 danarmak Exp $ # This is for kde-base cvs ebuilds. Read comments about settings. # It uses $S and sets $SRC_URI, so inherit it as late as possible (certainly after any other eclasses). @@ -61,6 +61,15 @@ kde-source_src_unpack() { # this fetches cvs sources and copies them to $WORKDIR cvs_src_unpack + # typically for kde cvs, the admin subdir lives in the kde-common module + # which is also needed + if [ ! -d "${WORKDIR}/${ECVS_MODULE}/admin" ]; then + ECVS_MODULE="kde-common" cvs_src_unpack + einfo "Copying admin/ subdir from module kde-common..." + debug-print "Copying admin/ subdir from module kde-common..." + mv ${WORKDIR}/kde-common/admin ${WORKDIR}/${ECVS_MODULE}/ + fi + # make sure checked-out module is accessible at $S, in case # the ebuild overrode our S=$WORKDIR/$PN setting if [ "$S" != "$WORKDIR/$PN" ]; then |