I'm cleaning up the kde eclasses. It is a gradual process so that i can commit it into portage

piecemeal.
<changeset #1>
Done:
- deprecated kde-base. it is now empty and does nothing except inheriting kde. apps should
now inherit kde directly. the deps on glibc and gcc that kde-base added are not necessary
because they are in all profiles' system packages lists anyway.
- deprecated kde-pre, no ebuild was using it any longer.
- deprecated kde.org. moved kde.org contents into kde-dist, since that's almost the only place
kde.org was being inherited from. ebuilds that need changing: kdelibs, kdelibs-apidocs
- stopped using newdepend /c. gcc and glibc are in the sysytem packages list in every profile anyway,
and our other ebuilds don't really keep track of such deps.

Changes done to ebuilds so far:
- kdelibs: don't inherit kde.org. don't call newdepend /c.
- kdelibs-apidocs: don't inherit kde.org

5 files changed, 39 insertions, 56 deletions

diff --git a/eclass/kde-base.eclass b/eclass/kde-base.eclass
index 0c8c3c85c526..6c6ee7308d1f 100644
--- a/eclass/kde-base.eclass
+++ b/eclass/kde-base.eclass
@@ -1,17 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-base.eclass,v 1.22 2003/02/28 09:15:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-base.eclass,v 1.23 2003/04/27 13:49:00 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
-# This is the kde ebuild for std. kde-dependant apps which follow configure/make/make install
+# This was the kde ebuild for std. kde-dependant apps which follow configure/make/make install
 # procedures and have std. configure options.
+# it is now deprecated; apps should inherit kde directly.
 
 inherit kde
-ECLASS=kde-base
-INHERITED="$INHERITED $ECLASS"
-
-newdepend /c
-
-DESCRIPTION="Based on the $ECLASS eclass"
-HOMEPAGE="http://apps.kde.com/"
diff --git a/eclass/kde-dist.eclass b/eclass/kde-dist.eclass
index e15af918becb..4837ed72220d 100644
--- a/eclass/kde-dist.eclass
+++ b/eclass/kde-dist.eclass
@@ -1,16 +1,40 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.39 2003/04/11 16:08:54 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.40 2003/04/27 13:49:00 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
 # This is the kde-dist eclass for >=2.2.1 kde base packages. Don't use for kdelibs though :-)
 # Don't use it for e.g. kdevelop, koffice because of their separate versionnig schemes.
 
-inherit kde-base kde.org
+inherit kde
 ECLASS=kde-dist
 INHERITED="$INHERITED $ECLASS"
 
+# kde 3.1 prereleases have tarball versions of 3.0.6 ff
+unset SRC_URI
+case "$PV" in
+	1*)				SRC_PATH="stable/3.0.2/src/${P}.tar.bz2";; # backward compatibility for unmerging ebuilds
+	2.2.2a)			SRC_PATH="2.2.2/src/${PN}-${PV/a/}.tar.bz2" ;;
+	2.2.2*)			SRC_PATH="2.2.2/src/${P}.tar.bz2" ;;
+	3.1_alpha1)		SRC_PATH="unstable/kde-3.1-alpha1/src/${P//3.1_alpha1/3.0.6}.tar.bz2" ;;
+	3.1_beta1)		SRC_PATH="unstable/kde-3.1-beta1/src/${P//3.1_beta1/3.0.7}.tar.bz2" ;;
+	3.1_beta2)		SRC_PATH="unstable/kde-3.1-beta2/src/${P//3.1_beta2/3.0.8}.tar.bz2" ;;
+	3.1_rc1)		SRC_PATH="unstable/kde-3.1-rc1/src/${P//3.1_rc1/3.0.9}.tar.bz2" ;;
+	3.1_rc2)		SRC_PATH="unstable/kde-3.1-rc2/src/${P//3.1_rc2/3.0.98}.tar.bz2" ;;
+	3.1_rc3)		SRC_PATH="unstable/kde-3.1-rc3/src/${P//3.1_rc3/3.0.99}.tar.bz2" ;;
+	3.1_rc5)		SRC_PATH="unstable/kde-3.1-rc5/src/${P//_}.tar.bz2" ;;
+	3.1_rc6)		SRC_PATH="unstable/kde-3.1-rc6/src/${P//_}.tar.bz2" ;;
+	3.1.1a)			SRC_PATH="stable/$PV/src/${PN}-3.1.1.tar.bz2"
+				SRC_URI="$SRC_URI mirror://gentoo/${PN}-${PVR}.diff.bz2" ;;
+	3*)			SRC_PATH="stable/$PV/src/${P}.tar.bz2" ;;
+	5)					SRC_URI="" # cvs ebuilds, no SRC_URI needed
+		debug-print "$ECLASS: cvs detected" ;;
+	*)		debug-print "$ECLASS: Error: unrecognized version $PV, could not set SRC_URI" ;;
+esac
+[ -n "$SRC_PATH" ] && SRC_URI="$SRC_URI mirror://kde/$SRC_PATH"
+debug-print "$ECLASS: finished, SRC_URI=$SRC_URI"
+
 need-kde $PV
 
 # 3.1 prereleases
@@ -36,4 +60,4 @@ LICENSE="GPL-2"
 
 SLOT="$KDEMAJORVER.$KDEMINORVER"
 
-
+debug-print "----------- $ECLASS finished -----------------"
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 37a51ce22c37..3348668159fb 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.54 2003/04/08 17:48:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.55 2003/04/27 13:49:00 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -59,7 +59,7 @@ need-kde() {
 
 	# ask for autotools
 	case "$KDEVER" in
-		2*)	
+		2*)
 			need-autoconf 2.1
 			need-automake 1.4
 			;;
@@ -83,7 +83,7 @@ need-kde() {
 		# do nothing
 		debug-print "$FUNCNAME: NEED_KDE_DONT_ADD_KDELIBS_DEP set, complying with request"
 	elif [ "${INHERITED//kde-dist}" != "$INHERITED" ]; then
-    		# if we're a kde-base package, we need an exact version of kdelibs
+		# if we're a kde-base package, we need an exact version of kdelibs
 		# to compile correctly.
 		# all kinds of special cases live here.
 		# goes to show this code is awfully inflexible, i guess.
@@ -98,7 +98,7 @@ need-kde() {
 			newdepend "~kde-base/kdelibs-${KDEVER}"
 		fi
 	else
-		# everything else only needs a minimum version	
+		# everything else only needs a minimum version
 		if [ "$KDEMAJORVER" == "2" ]; then
 			newdepend "=kde-base/kdelibs-2.2*"
 		else
diff --git a/eclass/kde-pre.eclass b/eclass/kde-pre.eclass
index 5d2ccf3ab6f4..0c85648bdf77 100644
--- a/eclass/kde-pre.eclass
+++ b/eclass/kde-pre.eclass
@@ -1,20 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-pre.eclass,v 1.6 2003/02/28 09:15:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-pre.eclass,v 1.7 2003/04/27 13:49:00 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
 # This is for kde prereleases (alpha, beta etc.) which have a _ (underscore) in their portage ebuild
 # names but not in their source archives and source dirs. To be inherited after setting SRC_URI and WORKDIR.
 
-ECLASS=kde-pre
-INHERITED="$INHERITED $ECLASS"
-
-DESCRIPTION="Based on the $ECLASS eclass"
-
-S="${WORKDIR}/${PN}-${PV//_}"
-
-SRC_PATH="kde/unstable/kde-${PV//_}/src/${P//_}.tar.bz2"
-SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
-	 ftp://ftp.fh-heilbronn.de/pub/mirrors/$SRC_PATH
-	 ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH"
+# DEPRECATED beacuse no ebuild uses it any longer. to be removed from portage.
\ No newline at end of file
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 728348e5fa9f..a4bdbc42b3bb 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -1,36 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.org.eclass,v 1.28 2003/04/11 16:08:54 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.org.eclass,v 1.29 2003/04/27 13:49:00 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
-# Contains the locations of ftp.kde.org packages and their mirrors
+# Contained the locations of ftp.kde.org packages and their mirrors
 
 ECLASS=kde.org
-INHERITED="$INHERITED $ECLASS"
 
-# kde 3.1 prereleases have tarball versions of 3.0.6 ff
-case "$PV" in
-	1*)				SRC_PATH="stable/3.0.2/src/${P}.tar.bz2";; # backward compatibility for unmerging ebuilds
-	2.2.2a)			SRC_PATH="2.2.2/src/${PN}-${PV/a/}.tar.bz2" ;;
-	2.2.2*)			SRC_PATH="2.2.2/src/${P}.tar.bz2" ;;
-	3.1_alpha1)		SRC_PATH="unstable/kde-3.1-alpha1/src/${P//3.1_alpha1/3.0.6}.tar.bz2" ;;
-	3.1_beta1)		SRC_PATH="unstable/kde-3.1-beta1/src/${P//3.1_beta1/3.0.7}.tar.bz2" ;;
-	3.1_beta2)		SRC_PATH="unstable/kde-3.1-beta2/src/${P//3.1_beta2/3.0.8}.tar.bz2" ;;
-	3.1_rc1)		SRC_PATH="unstable/kde-3.1-rc1/src/${P//3.1_rc1/3.0.9}.tar.bz2" ;;
-	3.1_rc2)		SRC_PATH="unstable/kde-3.1-rc2/src/${P//3.1_rc2/3.0.98}.tar.bz2" ;;
-	3.1_rc3)		SRC_PATH="unstable/kde-3.1-rc3/src/${P//3.1_rc3/3.0.99}.tar.bz2" ;;
-	3.1_rc5)		SRC_PATH="unstable/kde-3.1-rc5/src/${P//_}.tar.bz2" ;;
-	3.1_rc6)		SRC_PATH="unstable/kde-3.1-rc6/src/${P//_}.tar.bz2" ;;
-	3.1.1a)			SRC_PATH="stable/$PV/src/${PN}-3.1.1.tar.bz2"
-				SRC_URI="$SRC_URI mirror://gentoo/${PN}-${PVR}.diff.bz2" ;;
-	3*)			SRC_PATH="stable/$PV/src/${P}.tar.bz2" ;;
-	5)					SRC_URI="" # cvs ebuilds, no SRC_URI needed
-		debug-print "$ECLASS: finished, cvs detected, SRC_URI=$SRC_URI"
-		return 0 ;; 
-	*)		debug-print "$ECLASS: Error: unrecognized version $PV, could not set SRC_URI" ;;
-esac
-
-SRC_URI="$SRC_URI mirror://kde/$SRC_PATH"
-
-debug-print "$ECLASS: finished, SRC_URI=$SRC_URI"
+# DEPRECATED - this code is now in kde-dist.eclass
\ No newline at end of file