summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorDan Armak <danarmak@gentoo.org>2002-09-07 20:09:57 +0000
committerDan Armak <danarmak@gentoo.org>2002-09-07 20:09:57 +0000
commit7ec86a2867c71f71dbde6361bf32784ef9168006 (patch)
treef9f3af5f82121edf9f525e552c12897311220227 /eclass
parentremoved ld.so from packages.cdimage (diff)
downloadhistorical-7ec86a2867c71f71dbde6361bf32784ef9168006.tar.gz
historical-7ec86a2867c71f71dbde6361bf32784ef9168006.tar.bz2
historical-7ec86a2867c71f71dbde6361bf32784ef9168006.zip
use autoconf 2.13 for kde-base 3.0.x ebuilds. add KDE_REMOVE_DIR function that removes a subdir of a module and prevents its being compiled.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/kde-functions.eclass70
-rw-r--r--eclass/kde.eclass7
2 files changed, 60 insertions, 17 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index fabcb53c7b78..226aa7e430e5 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.28 2002/08/29 15:03:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.29 2002/09/07 20:09:57 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"
@@ -87,21 +87,32 @@ need-kde() {
set-kdedir() {
- # NOTE: version 5 (no minor version or revision)
- # are the new cvs ebuilds; these go into /usr/kde/cvs
-
debug-print-function $FUNCNAME $*
+ # is this a kde-base ebuid?
+ if [ "${INHERITED//kde-dist}" != "$INHERITED" ] || [ "$PN" == kdelibs ] || [ "$PN" == arts ]; then
+ export KDEBASE="true"
+ fi
+
case "$1" in
2*)
- need-autoconf 2.1
- need-automake 1.4
- ;;
+ need-autoconf 2.1
+ need-automake 1.4
+ ;;
+ 3.0*)
+ if [ -n "$KDEBASE" ]; then
+ # used by 3.0.x kdebase stuff, not by 3rd party apps
+ need-autoconf 2.1
+ else
+ need-autoconf 2.5
+ fi
+ need-automake 1.4
+ ;;
3*)
- need-autoconf 2.5
- need-automake 1.4
- ;;
- 5*)
+ need-autoconf 2.5
+ need-automake 1.4
+ ;;
+ 5*)
need-autoconf 2.5
need-automake 1.4
;;
@@ -140,10 +151,6 @@ set-kdedir() {
IFS="$IFSBACKUP"
debug-print "$FUNCNAME: version breakup: KDEMAJORVER=$KDEMAJORVER KDEMINORVER=$KDEMINORVER KDEREVISION=$KDEREVISION"
- # is this a kde-base ebuid?
- if [ "${INHERITED//kde-dist}" != "$INHERITED" ] || [ "$PN" == kdelibs ] || [ "$PN" == arts ]; then
- export KDEBASE="true"
- fi
# install prefix
@@ -332,3 +339,36 @@ kde_remove_flag() {
cd $OLDPWD
}
+
+# disable a subdir of a module from building.
+# used by kdemultimedia et al
+# autorun from kde_src_compile:configure if $KDE_REMOVE_DIR is set;
+# $KDE_REMOVE_DIR is then passed as parameter
+kde_remove_dir(){
+
+ debug-print-function $FUNCNAME $*
+
+ cd ${S}
+
+ while [ -n "$1" ]; do
+ for dir in $1; do
+
+ debug-print "$FUNCNAME: removing subdirectory $dir"
+
+ rm -rf $dir
+
+ if [ -f subdirs ]; then
+ mv subdirs subdirs.orig
+ grep -v $dir subdirs.orig > subdirs
+ fi
+
+ rm -f configure configure.in
+
+ export DO_NOT_COMPILE="$DO_NOT_COMPILE $dir"
+
+ done
+ shift
+ done
+
+}
+
diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index 8e2951bce7c6..fdb6418e3c1b 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.56 2002/08/26 10:57:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.57 2002/09/07 20:09:57 danarmak Exp $
# The kde eclass is inherited by all kde-* eclasses. Few ebuilds inherit straight from here.
inherit base kde-functions
ECLASS=kde
@@ -56,7 +56,10 @@ kde_src_compile() {
configure)
debug-print-section configure
debug-print "$FUNCNAME::configure: myconf=$myconf"
-
+
+ [ -n "$KDE_REMOVE_DIR" ] && kde_remove_dir $KDE_REMOVE_DIR
+
+ # rebuild configure script, etc
# This can happen with e.g. a cvs snapshot
if [ ! -f "./configure" ]; then
for x in Makefile.cvs admin/Makefile.common; do