diff options
| author |   Dan Armak <danarmak@gentoo.org> | 2002-08-26 10:57:21 +0000 |
|---|---|---|
| committer | Dan Armak <danarmak@gentoo.org> | 2002-08-26 10:57:21 +0000 |
| commit | c2b55eb2e088d8c5bd667a03b93378500112a5c2 (patch) | |
| tree | ffd48ce775a369b037304b81bbb4716a77bc1dc7 /eclass | |
| parent | More small fixes and cleanups (diff) | |
| download | historical-c2b55eb2e088d8c5bd667a03b93378500112a5c2.tar.gz historical-c2b55eb2e088d8c5bd667a03b93378500112a5c2.tar.bz2 historical-c2b55eb2e088d8c5bd667a03b93378500112a5c2.zip | |
replace the old fix with a very very simple 1-line one
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde-functions.eclass | 10 | ||||
| -rw-r--r-- | eclass/kde.eclass | 18 |
2 files changed, 3 insertions, 25 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index c88ec5582d57..5e9cd588571f 100644 --- a/eclass/kde-functions.eclass +++ b/eclass/kde-functions.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-functions.eclass,v 1.26 2002/08/26 09:49:54 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.27 2002/08/26 10:57:21 danarmak Exp $ # This contains everything except things that modify ebuild variables and functions (e.g. $P, src_compile() etc.) ECLASS=kde-functions INHERITED="$INHERITED $ECLASS" @@ -331,11 +331,3 @@ kde_remove_flag() { cd $OLDPWD } - - -# get new admin/ files -kde-new-admin() { - - SRC_URI="$SRC_URI mirror://gentoo/admin-new-20020826.tar.gz" - -} diff --git a/eclass/kde.eclass b/eclass/kde.eclass index 5bae3bb0ea89..8e2951bce7c6 100644 --- a/eclass/kde.eclass +++ b/eclass/kde.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.eclass,v 1.55 2002/08/26 10:07:10 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.56 2002/08/26 10:57:21 danarmak Exp $ # The kde eclass is inherited by all kde-* eclasses. Few ebuilds inherit straight from here. inherit base kde-functions ECLASS=kde @@ -39,6 +39,7 @@ kde_src_compile() { [ -z "$1" ] && kde_src_compile all cd ${S} + export kde_widgetdir="$KDEDIR/lib/kde3/plugins/designer" while [ "$1" ]; do @@ -56,21 +57,6 @@ kde_src_compile() { debug-print-section configure debug-print "$FUNCNAME::configure: myconf=$myconf" - # fix the infamous kde-widget problem group and other stuff - # by getting a new admin/ dir - if [ -d "$WORKDIR/admin-new" ]; then - - cd $S/admin - patch -p0 < $WORKDIR/admin-new/* - # stop make from regenerating stuff - touch -t 199001010000 acinclude.m4.in - cd $S - - # regenerate configure - rm -f configure configure.in config.h.in *.m4 - - fi - # This can happen with e.g. a cvs snapshot if [ ! -f "./configure" ]; then for x in Makefile.cvs admin/Makefile.common; do |