oops - didn't mean to commit this; reverting to rev1.6

diff --git a/eclass/kde-meta.eclass b/eclass/kde-meta.eclass
index 66c1b975c67d548285f59d91a0ff33c6aeac054a..b083c6c95e59c0602b5ac6b0663e2cfbc1daddfd 100644 (file)
--- 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.7 2004/12/25 14:47:44 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.8 2004/12/25 14:50:33 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 # Simone Gotti <simone.gotti@email.it>
@@ -18,13 +18,8 @@ if [ -z "$KMNAME" ]; then
 fi
 
 myPN="$KMNAME"
-case "$PV" in
-       3.4.0_alpha1)   myPV="${PV/3.4.0_alpha1/3.3.90}" ;;
-       3.4.0_alpha2)   myPV="${PV/3.4.0_alpha1/3.3.91}" ;;
-       *)              myPV="$PV" ;;
-esac
-myP="$myPN-$myPV"
-
+myP="$myPN-$PV"
+myPV="$PV"
 # is this a kde-base ebuild, vs eg koffice
 case "$myPN" in kde-i18n|arts|kdeaccessibility|kdeaddons|kdeadmin|kdeartwork|kdebase|kdebindings|kdeedu|kdegames|kdegraphics|kdelibs|kdemultimedia|kdenetwork|kdepim|kdesdk|kdetoys|kdeutils|kdewebdev|kdelibs-apidocs)
        debug-print "$ECLASS: KDEBASE ebuild recognized"
@@ -36,16 +31,15 @@ esac
 if [ "$KDEBASE" = "true" ]; then
        unset SRC_URI
        
-       need-kde $PV
+       need-kde $myPV
        
-       DESCRIPTION="KDE ${PV} - "
+       DESCRIPTION="KDE ${myPV} - "
        HOMEPAGE="http://www.kde.org/"
        LICENSE="GPL-2"
        SLOT="$KDEMAJORVER.$KDEMINORVER"
        
        # Main tarball for normal downloading style
        case "$myPV" in
-               3.3.9?)         SRC_PATH="unstable/${myPV}/src/${myPN}-${myPV}.tar.bz2" ;;
                3.3.0)          SRC_PATH="stable/3.3/src/${myP}.tar.bz2" ;;
                3*)                     SRC_PATH="stable/${myPV}/src/${myP}.tar.bz2" ;;
                5)                      SRC_URI="" # cvs ebuilds, no SRC_URI needed
@@ -63,10 +57,8 @@ if [ "$KDEBASE" = "true" ]; then
                3.3.1)          XDELTA_BASE="stable/3.3/src/${myPN}-3.3.0.tar.bz2"
                                        XDELTA_DELTA="stable/3.3.1/src/${myPN}-3.3.0-3.3.1.tar.xdelta"
                                        ;;
-               3.3.2)          XDELTA_BASE="stable/3.3/src/${myPN}-3.3.0.tar.bz2"
-                                       XDELTA_DELTA="stable/3.3.1/src/${myPN}-3.3.0-3.3.1.tar.xdelta stable/3.3.2/src/${myPN}-3.3.1-3.3.2.tar.xdelta"
+               *)                      die "$ECLASS: Error: unrecognized version ${myPV}, could not set SRC_URI"
                                        ;;
-               *)                      ;;
        esac    
 
 elif [ "$KMNAME" == "koffice" ]; then
@@ -91,8 +83,6 @@ if [ -n "$XDELTA_BASE" ]; then # depends on $PV only, so is safe to modify SRC_U
                SRC_URI="$SRC_URI mirror://kde/$x"
        done
        SRC_URI="$SRC_URI ) !kdexdeltas? ( mirror://kde/$SRC_PATH )"
-else # xdelta don't available, for example with kde 3.4 alpha/beta/rc ebuilds.
-       SRC_URI="$SRC_URI mirror://kde/$SRC_PATH"
 fi
        
 debug-print "$ECLASS: finished, SRC_URI=$SRC_URI"
@@ -103,17 +93,10 @@ DEPEND="$DEPEND kdexdeltas? ( dev-util/xdelta )"
 
 # END adapted from kde-dist.eclass
 
-# Don't support prepackaged Makefiles with alpha/beta/rc version.
-case $myPV in
-       3.3.0 | 3.3.1 | 3.3.2)
-               # prepackaged makefiles for broken-up ebuilds. Ebuild can define KM_MAKEFILESREV to be >=1 to
-               # use a newer tarball without increasing the ebuild revision.
-               MAKEFILESTARBALL="$PN-$PVR-${KM_MAKEFILESREV:-0}-makefiles.tar.bz2"
-               SRC_URI="$SRC_URI usepackagedmakefiles? ( mirror://gentoo/$MAKEFILESTARBALL )"
-               ;;
-               
-       *) ;;
-esac
+# prepackaged makefiles for broken-up ebuilds. Ebuild can define KM_MAKEFILESREV to be >=1 to
+# use a newer tarball without increasing the ebuild revision.
+MAKEFILESTARBALL="$PN-$PVR-${KM_MAKEFILESREV:-0}-makefiles.tar.bz2"
+SRC_URI="$SRC_URI usepackagedmakefiles? ( mirror://gentoo/$MAKEFILESTARBALL )"
 
 
 # TODO FIX: Temporary place for code common to all ebuilds derived from any one metapackage.
@@ -247,33 +230,27 @@ function change_makefiles() {
        fi
 }
 
-function set_common_variables() {
-       # Overridable module (subdirectory) name, with default value
-       if [ "$KMNOMODULE" != "true" ] && [ -z "$KMMODULE" ]; then
-               KMMODULE=$PN
-       fi
-
-       # Unless disabled, docs are also extracted, compiled and installed
-       DOCS=""
-       if [ "$KMNOMODULE" != "true" ] && [ "$KMNODOCS" != "true" ]; then
-               DOCS="doc/$KMMODULE"
-       fi
-}
-
 # This has function sections now. Call unpack, apply any patches not in $PATCHES,
 # then call makefiles.
 function kde-meta_src_unpack() {
        debug-print-function $FUNCNAME $*
 
-       set_common_variables
-       
        sections="$@"
        [ -z "$sections" ] && sections="unpack makefiles"
        for section in $sections; do
        case $section in
        unpack)
 
-               
+               # Overridable module (subdirectory) name, with default value
+               if [ "$KMNOMODULE" != "true" ] && [ -z "$KMMODULE" ]; then
+                       KMMODULE=$PN
+               fi
+       
+               # Unless disabled, docs are also extracted, compiled and installed
+               DOCS=""
+               if [ "$KMNOMODULE" != "true" ] && [ "$KMNODOCS" != "true" ]; then
+                       DOCS="doc/$KMMODULE"
+               fi
                
                # Create final list of stuff to extract
                extractlist=""
@@ -302,7 +279,6 @@ function kde-meta_src_unpack() {
                        KMTARPARAMS="$KMTARPARAMS -j"
                fi
                cd $WORKDIR
-               
                echo ">>> Extracting from tarball..."
                # Note that KMTARPARAMS is also used by an ebuild
                tar -xpf $TARFILE $KMTARPARAMS $extractlist     
@@ -317,30 +293,20 @@ function kde-meta_src_unpack() {
                libname=""
                for x in $KMCOPYLIB; do
                        if [ "$libname" == "" ]; then
-                               libname=$x
+                       libname=$x
                        else
-                               dirname=$x
-                               cd $S
-                               mkdir -p ${dirname}
-                               cd ${dirname}
-                               if [ ! "$(find ${PREFIX}/lib/ -name "${libname}*")" == "" ]; then
-                                       echo "Symlinking library ${libname} under ${PREFIX}/lib/ in source dir"
-                                       ln -s ${PREFIX}/lib/${libname}* .
-                               else
-                                       die "Can't find library ${libname} under ${PREFIX}/lib/"
-                               fi
-                               libname=""
+                       dirname=$x
+                       cd $S
+                       mkdir -p ${dirname}
+                       cd ${dirname}
+                       ln -s ${PREFIX}/lib/${libname}* .
+                       libname=""
                        fi
                done
        
                # apply any patches
                kde_src_unpack autopatch
        
-               # kdebase: Remove the installation of the "startkde" script.
-               if [ "$KMNAME" == "kdebase" ]; then
-                       sed -i -e s:"bin_SCRIPTS = startkde"::g ${S}/Makefile.am.in
-               fi
-               
                # for ebuilds with extended src_unpack
                cd $S
        
@@ -383,8 +349,6 @@ function kde-meta_src_unpack() {
 
 function kde-meta_src_compile() {
        debug-print-function $FUNCNAME $*
-       
-       set_common_variables    
 
        # kdebase: all configure.in's talk about java. Need to investigate which ones 
        # actually need it.
@@ -424,8 +388,6 @@ function kde-meta_src_compile() {
 function kde-meta_src_install() {
        debug-print-function $FUNCNAME $*
        
-       set_common_variables
-       
        if [ "$1" == "" ]; then
                kde-meta_src_install make dodoc
        fi