a partial rewrite. everything works now, and the big kde-i18n package doesn't need...

diff --git a/eclass/kde-i18n.eclass b/eclass/kde-i18n.eclass
index 3db5bbbcc69dc418380574939be4778f95bb578f..baf7d567e57ce7e43140f010ea3a6e5282650d42 100644 (file)
--- a/eclass/kde-i18n.eclass
+++ b/eclass/kde-i18n.eclass
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-i18n.eclass,v 1.31 2002/11/01 12:06:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-i18n.eclass,v 1.32 2002/11/02 09:44:16 danarmak Exp $
 
 inherit kde
 ECLASS=kde-i18n
@@ -18,14 +18,19 @@ set_enable_final
 
 need-kde ${PV}
 
+# RPV and RP for Real P and PV
+case "$PV" in
+       3.1_beta1)      RPV=3.0.7;;
+       3.1_beta2)      RPV=3.0.8;;
+       3.1_rc1)        RPV=3.0.9;;
+       *)              RPV=$PV;;
+esac
+RP="$PN-$RPV"
+
 case "$PV" in
        2.2.2)          SRC_PATH="stable/${PV}/src/${P}.tar.bz2"
                        KEYWORDS="x86 ppc";;
-       3.1_beta1)      SRC_PATH="unstable/kde-3.1-beta1/src/kde-i18n/${P//3.1_beta1/3.0.7}.tar.bz2" 
-                       KEYWORDS="x86 ppc";;
-       3.1_beta2)      SRC_PATH="unstable/kde-3.1-beta2/src/kde-i18n/${P//3.1_beta2/3.0.8}.tar.bz2" 
-                       KEYWORDS="x86 ppc";;
-       3.1_rc1)        SRC_PATH="unstable/kde-3.1-beta2/src/kde-i18n/${P//3.1_rc1/3.0.9}.tar.bz2" 
+       3.1_*)          SRC_PATH="unstable/kde-${PV//_/-}/src/kde-i18n/${RP}.tar.bz2" 
                        KEYWORDS="x86 ppc";;
        3*)             SRC_PATH="stable/${PV}/src/kde-i18n/${P}.tar.bz2" 
                        KEYWORDS="x86 ppc";;
@@ -33,29 +38,29 @@ esac
 
 if [ "$PN" == "kde-i18n" ]; then
        SRC_PATH=${SRC_PATH/kde-i18n//}
+       S=${WORKDIR}/${RP}
 fi
 
 SRC_URI="$SRC_URI mirror://kde/$SRC_PATH"
 
 kde-i18n_src_unpack() {
-       unpack ${A//kde-i18n-gentoo.patch} || die
-       cd ${S}
-       if [ -f "docs/common/Makefile.in" ]; then
-               # this enables destdir!=kdelibsdir
-               cd docs/common
-               cp Makefile.in Makefile.in.orig
-               sed -e 's:(kde_htmldir)/en/common:(kde_libs_htmldir)/en/common:g' Makefile.in.orig > Makefile.in
-       fi
+       base_src_unpack
+
+       for dir in ${S} `cat ${S}/subdirs`; do
+               if [ -f "$dir/docs/common/Makefile.in" ]; then
+                       # this enables destdir!=kdelibsdir
+                       cd $dir/docs/common
+                       cp Makefile.in Makefile.in.orig
+                       sed -e 's:(kde_htmldir)/en/common:(kde_libs_htmldir)/en/common:g' Makefile.in.orig > Makefile.in
+               fi
+       done
 }
 
 kde-i18n_src_compile() {
 
        kde_src_compile myconf
        myconf="$myconf --prefix=$KDEDIR"
-       kde_src_compile configure
-       # don't run make; there's nothing for it to do really, and we'd just waste time
-       # if there's anything it wants to do it'll get done during make install,
-       # but there's no compiling here
+       kde_src_compile configure make
 
 }