This is the big multi-kdelibs & eclasses v4 commit. have fun, send bugreports!

24 files changed, 491 insertions, 143 deletions

diff --git a/eclass/base.eclass b/eclass/base.eclass
index 45d38ba785f8..b76fffc9bed6 100644
--- a/eclass/base.eclass
+++ b/eclass/base.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/base.eclass,v 1.6 2001/10/01 13:54:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.7 2001/11/16 12:50:41 danarmak Exp $
 # The base eclass defines some default functions and variables. Nearly everything
 # else inherits from here.
 inherit virtual || die
@@ -90,3 +90,18 @@ base_src_install() {
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 
+# misc helper functions
+# adds all parameters to DEPEND and RDEPEND
+newdepend() {
+
+	debug-print-function newdepend $*
+	debug-print "newdepend: DEPEND=$DEPEND RDEPEND=$RDEPEND"
+
+	while [ -n "$1" ]; do
+		DEPEND="$DEPEND $1"
+		RDEPEND="$RDEPEND $1"
+		shift
+	done
+
+}
+
diff --git a/eclass/debug.eclass b/eclass/debug.eclass
index 709c60da91c5..1447de55bcfc 100644
--- a/eclass/debug.eclass
+++ b/eclass/debug.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/debug.eclass,v 1.4 2001/10/03 17:10:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/debug.eclass,v 1.5 2001/11/16 12:50:41 danarmak Exp $
 # This provides functions for verbose output for debugging
 
 # Note: we check whether these settings are set by "if [ "$FOO" ]; then".
@@ -9,7 +9,7 @@
 
 # redirect output, unset to disable
 # use e.g. /dev/tty.
-# todo: add support for loging into a file.
+# todo: add support for logging into a file.
 DEBUG_OUTPUT=""
 
 # used internally for output
@@ -21,7 +21,7 @@ debug-print() {
 
 	while [ "$1" ]; do
 		echo "debug: $1" > $DEBUG_OUTPUT
-	shift
+		shift
 	done
 
 }
@@ -32,7 +32,7 @@ debug-print-function() {
 	
 	str="now in function $1" 
 	shift
-	debug-print "$str" "parameters: $*"
+	debug-print "$str, parameters: $*"
 
 }
 
diff --git a/eclass/depend.eclass b/eclass/depend.eclass
new file mode 100644
index 000000000000..deb03e32e224
--- /dev/null
+++ b/eclass/depend.eclass
@@ -0,0 +1,109 @@
+# 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/depend.eclass,v 1.1 2001/11/16 12:50:41 danarmak Exp $
+# This provides the need-kdelibs and need-qt functions, which handle setting KDEDIR
+# and QTDIR for the multi-qt and multi-kdelibs schemes. The functions set-kdedir and
+# set-qtdir are called from kde.eclass; the need-* functions from the ebuild.
+
+set-kdedir() {
+
+	debug-print-function set-kdedir $*
+
+	biglist="`ls -d1 /usr/lib/kdelibs-*`"
+	debug-print "set-kdedir: \$biglist:
+${biglist}"
+
+	# filter $biglist to create $list
+	list=""
+	for x in $biglist; do
+	    # strip path, leave version number
+	    x="`echo $x | sed -e 's:/usr/lib/kdelibs-::'`"
+	    # do comparison
+	    if [[ ( $x > $1 ) || ( $x = $1 ) ]]; then
+		# add path back on
+		list="$list /usr/lib/kdelibs-$x"
+	    fi
+	done
+
+	debug-print "set-kdedir: filtered \$biglist and got this \$list:
+$list"
+
+	# see if we found anything that matches
+	if [ -z "$list" ]; then
+		debug-print "set-kdedir: WARNING kdelibs dependency version $1 requested, but
+no matching installed library has been found. Must be an old system."
+	else
+		# select last item in sorted list
+		for KDEDIR in $list; do true; done
+		debug-print "set-kdedir: request for $1 resolved to $KDEDIR"
+	fi
+
+}
+
+need-kdelibs() {
+
+	debug-print-function need-kdelibs $*
+
+	if [ -z "$1" ]; then
+		kde_version="0"
+	else
+		kde_version="$1"
+	fi
+
+	debug-print "need-kdelibs: version number is $kde_version"
+
+	newdepend ">=kde-base/kdelibs-$kde_version"
+
+}
+
+set-qtdir() {
+
+	debug-print-function set-qtdir $*
+
+	biglist="`ls -d1 /usr/lib/qt-x11-*`"
+	debug-print "set-qtdir: \$biglist:
+${biglist}"
+
+	# filter $biglist to create $list
+	list=""
+	for x in $biglist; do
+	    # strip path, leave version number
+	    x="`echo $x | sed -e 's:/usr/lib/qt-x11-::'`"
+	    # do comparison
+	    if [[ $x > $1 ]]; then
+		list="$list /usr/lib/qt-x11-$x"
+	    fi
+	done
+
+	debug-print "set-qtdir: filtered \$biglist and got this \$list:
+$list"
+
+	# see if we found anything that matches
+	if [ -z "$list" ]; then
+		debug-print "set-qtdir: WARNING qt dependency version $1 requested, but
+no matching installed library has been found. Must be an old system."
+	else
+		# select last item in sorted list
+		for QTDIR in $list; do true; done
+		debug-print "set-qtdir: request for $1 resolved to $QTDIR"
+	fi
+
+}
+
+need-qt() {
+
+	debug-print-function need-qt $*
+
+	if [ -z "$1" ]; then
+		qt_version="0"
+	else
+		qt_version="$1"
+	fi
+
+	debug-print "need-qt: version number is $qt_version"
+
+	newdepend ">=x11-libs/qt-x11-$qt_version"
+
+}
+
diff --git a/eclass/doc/eclass-howto.lyx b/eclass/doc/eclass-howto.lyx
index dbc587c52905..62995647d581 100644
--- a/eclass/doc/eclass-howto.lyx
+++ b/eclass/doc/eclass-howto.lyx
@@ -30,7 +30,7 @@ eclass howto
 Dan Armak
 \layout Date
 
-Updated for eclasses v3.3
+Updated for eclasses v4
 \layout Section
 
 Introduction
@@ -44,11 +44,10 @@ eclasses are parts of ebuilds; that is, they have the same syntax ebuilds
 \layout Standard
 
 The most similar group of ebuilds is the kde apps.
- These have been selected to be the test case for the first incarnation
- of eclasses.
- Inheriting ebuilds are available for all of kde-2.2.1 (as kde*-2.2.1-r1), kdevelop-
-2.0.1 and koffice-1.1.
- Others will follow.
+ were accordingly selected to be the test case for eclasses, and I believe
+ I can now say the test has been successful.
+ Eclasses for non-kde ebuilds may follow, but there are no concrete plans
+ as of this time.
 \layout Standard
 
 Please read news.txt for an abstract of changes between versions of the eclasses.
@@ -143,7 +142,7 @@ inherit <list of eclasses> || die
 \layout Standard
 
 Eclasses do not need this first line, since they are always sourced from
- an ebuild which has it.
+ an ebuild which already has it.
 \layout Subsection
 
 virtual.eclass
@@ -448,11 +447,47 @@ cd ${S}
 patch -p0 < ${FILESDIR}/${P}-gentoo.diff
 \layout Standard
 
-Once, long ago, I remember hearing that emerge would execute this code automatic
-ally between src_unpack() and src_compile() if the file ${FILESDIR}/${P}-gentoo.d
-iff was present.
- Was this a plan, a rumour, or what? Someone please correct me, or at least
- correct this document.
+There is also a helper function provided by base.eclass, called newdepend().
+ It simply adds all parameters to both DEPEND and RDEPEND, saving you the
+ trouble of writing and maintaining two lists of dependencies.
+\layout Subsection
+
+depend.eclass
+\layout Standard
+
+Added in v4.
+ This provides two pairs of functions: need-kdelibs(), need-qt() and set-kdedir(
+), set-qtdir().
+ These functions handle the details of the multi-qt and multi-kdelibs schemes.
+ These schemes set rules for having multiple versions of qt and/or of kdelibs
+ installed side-by-side.
+\layout Standard
+
+The need-* functions are called with a parameter which is the version number
+ required.
+ They then add the corresponding dependencies to DEPEND and RDEPEND, and
+ set the variables kde_version and qt_version which are used by the set-*dir
+ functions.
+ If no parameter is passed, a version number of 0 (zero) is used.
+\layout Standard
+
+It is important to call these functions from the main part of the ebuild,
+ so that any changes to DEPEND and RDEPEND affect emerge.
+\layout Standard
+
+The set-* dir functions are both called from the beginning of the configure
+ section of the kde_src_compile() function.
+ They read the qt_version and kde_version variables set by need-*, check
+ which multi-*-scheme conforming libs are installed, and set KDEDIR and
+ QTDIR to the location of the latest version installed that fulfills the
+ requirements.
+ When the new portage dependency functionality is released, this is where
+ the changes needed for kde/qt-3 support will go.
+\layout Standard
+
+If no multi-*-scheme-compatible3 installation is found, KDEDIR and QTDIR
+ are left untouched, assuming that the machine is an older one which sets
+ hardcoded QTDIR and KDEDIR values from /etc/env.d.
 \layout Subsection
 
 kde.eclass
@@ -463,30 +498,30 @@ Used by all kde apps, whether directly or indirectly.
  defaults but functions which can be used as-is more often then not.
  In fact, none of the high-level kde-* eclasses which inherit from here
  change the functions in any way, and the ebuilds rarely do so.
+ This eclass contains the meat of the kde eclass system, while virtual and
+ base can be said to provide the skeleton.
 \layout Standard
 
-It inherits autoconf and base.
+It inherits autoconf, base and depend.
 \layout Standard
 
 Read it to find out what it defines.
  It is quite self-explanatory.
 \layout Standard
 
-Briefly, it handles all standard kde-2.1* and 2.2* apps that need configure/make/m
+Briefly, it handles all standard kde apps that use GNU standard configure/make/m
 ake install cycles.
  It handles all the std.
  configure options e.g.
  qtmt.
- It also adds kdelibs to DEPEND/RDEPEND.
 \layout Standard
 
 Note: some kde apps, like widget styles and i18n packages, do not need to
  compile anything.
- Therefore kde.eclass does not inherit c and does not depend on qt.
- These packages can then inherit straight from here (or from kde-i18n.eclass,
- which also inherits from here).
- All other packages, which need to compile c code and link against qt, should
- inherit from kde-base.eclass.
+ Therefore kde.eclass does not inherit c.
+ These packages can then inherit straight from here.
+ All other packages, which need to compile c code, should inherit from kde-base.e
+class.
 \layout Standard
 
 As of v3.3, kde-objprelink was merged with kde, which now provides the objprelink
@@ -727,4 +762,17 @@ Derived from $ECLASS
  set.
  This is to remind you to write a description of your own for your ebuilds.
  Otherwise the inherited one will show through as a reminder.
+\layout Itemize
+
+Remember to always call need-kdelibs().
+ need-qt(0 is more optional, since you can depend on kdelibs to make sure
+ qt is installed.
+ There's no harm in explicitly calling need-qt, though.
+\layout Itemize
+
+If you override kde_src_compile, section configure, remember that you 
+\emph on 
+must
+\emph default 
+ call set-kdedir and set-qtdir somewhere before calling configure.
 \the_end
diff --git a/eclass/doc/eclass-howto.sgml b/eclass/doc/eclass-howto.sgml
index 1e62c30f42f6..a4d16809a09f 100644
--- a/eclass/doc/eclass-howto.sgml
+++ b/eclass/doc/eclass-howto.sgml
@@ -10,7 +10,7 @@
    Dan Armak
   </author>
   <date>
-   Updated for eclasses v3.3
+   Updated for eclasses v4
   </date>
   <sect1>
    <title>
@@ -20,7 +20,7 @@
    eclasses are parts of ebuilds; that is, they have the same syntax ebuilds do, but do not define all the required variables and functions. ebuilds can inherit from eclasses, and eclasses can inherit from other eclasses. As in OOP, this is used to ensure maximum code reuse among similar ebuilds.
   </para>
   <para>
-   The most similar group of ebuilds is the kde apps. These have been selected to be the test case for the first incarnation of eclasses. Inheriting ebuilds are available for all of kde-2.2.1 (as kde*-2.2.1-r1), kdevelop-2.0.1 and koffice-1.1. Others will follow.
+   The most similar group of ebuilds is the kde apps. were accordingly selected to be the test case for eclasses, and I believe I can now say the test has been successful. Eclasses for non-kde ebuilds may follow, but there are no concrete plans as of this time.
   </para>
   <para>
    Please read news.txt for an abstract of changes between versions of the eclasses.
@@ -83,7 +83,7 @@
 ]]><![ CDATA [inherit <list of eclasses> || die
 ]]>   </programlisting>
    <para>
-    Eclasses do not need this first line, since they are always sourced from an ebuild which has it.
+    Eclasses do not need this first line, since they are always sourced from an ebuild which already has it.
    </para>
    </sect2>
    <sect2>
@@ -229,7 +229,27 @@
 ]]><![ CDATA [patch -p0 < ${FILESDIR}/${P}-gentoo.diff
 ]]>   </programlisting>
    <para>
-    Once, long ago, I remember hearing that emerge would execute this code automatically between src_unpack() and src_compile() if the file &dollar;&lcub;FILESDIR&rcub;/&dollar;&lcub;P&rcub;-gentoo.diff was present. Was this a plan, a rumour, or what? Someone please correct me, or at least correct this document.
+    There is also a helper function provided by base.eclass, called newdepend(). It simply adds all parameters to both DEPEND and RDEPEND, saving you the trouble of writing and maintaining two lists of dependencies.
+   </para>
+   </sect2>
+   <sect2>
+    <title>
+    depend.eclass
+   </title>
+   <para>
+    Added in v4. This provides two pairs of functions: need-kdelibs(), need-qt() and set-kdedir(), set-qtdir(). These functions handle the details of the multi-qt and multi-kdelibs schemes. These schemes set rules for having multiple versions of qt and/or of kdelibs installed side-by-side.
+   </para>
+   <para>
+    The need-* functions are called with a parameter which is the version number required. They then add the corresponding dependencies to DEPEND and RDEPEND, and set the variables kde_version and qt_version which are used by the set-*dir functions. If no parameter is passed, a version number of 0 (zero) is used.
+   </para>
+   <para>
+    It is important to call these functions from the main part of the ebuild, so that any changes to DEPEND and RDEPEND affect emerge.
+   </para>
+   <para>
+    The set-* dir functions are both called from the beginning of the configure section of the kde_src_compile() function. They read the qt_version and kde_version variables set by need-*, check which multi-*-scheme conforming libs are installed, and set KDEDIR and QTDIR to the location of the latest version installed that fulfills the requirements. When the new portage dependency functionality is released, this is where the changes needed for kde/qt-3 support will go.
+   </para>
+   <para>
+    If no multi-*-scheme-compatible3 installation is found, KDEDIR and QTDIR are left untouched, assuming that the machine is an older one which sets hardcoded QTDIR and KDEDIR values from /etc/env.d.
    </para>
    </sect2>
    <sect2>
@@ -237,19 +257,19 @@
     kde.eclass
    </title>
    <para>
-    Used by all kde apps, whether directly or indirectly. This is a med-level eclass, which is intended to provide not only sensible defaults but functions which can be used as-is more often then not. In fact, none of the high-level kde-* eclasses which inherit from here change the functions in any way, and the ebuilds rarely do so.
+    Used by all kde apps, whether directly or indirectly. This is a med-level eclass, which is intended to provide not only sensible defaults but functions which can be used as-is more often then not. In fact, none of the high-level kde-* eclasses which inherit from here change the functions in any way, and the ebuilds rarely do so. This eclass contains the meat of the kde eclass system, while virtual and base can be said to provide the skeleton.
    </para>
    <para>
-    It inherits autoconf and base.
+    It inherits autoconf, base and depend.
    </para>
    <para>
     Read it to find out what it defines. It is quite self-explanatory.
    </para>
    <para>
-    Briefly, it handles all standard kde-2.1* and 2.2* apps that need configure/make/make install cycles. It handles all the std. configure options e.g. qtmt. It also adds kdelibs to DEPEND/RDEPEND.
+    Briefly, it handles all standard kde apps that use GNU standard configure/make/make install cycles. It handles all the std. configure options e.g. qtmt.
    </para>
    <para>
-    Note: some kde apps, like widget styles and i18n packages, do not need to compile anything. Therefore kde.eclass does not inherit c and does not depend on qt. These packages can then inherit straight from here (or from kde-i18n.eclass, which also inherits from here). All other packages, which need to compile c code and link against qt, should inherit from kde-base.eclass.
+    Note: some kde apps, like widget styles and i18n packages, do not need to compile anything. Therefore kde.eclass does not inherit c. These packages can then inherit straight from here. All other packages, which need to compile c code, should inherit from kde-base.eclass.
    </para>
    <para>
     As of v3.3, kde-objprelink was merged with kde, which now provides the objprelink deps (&gt;=objprelink-0-r1), the options passed to configure and a function kde-objprelink-patch() that applies the kde-admin-acinclude patch. Call it at the end of your src_unpack if you need it.
@@ -392,6 +412,16 @@
    The eclasses have DESCRIPTION=&rdquo;Derived from &dollar;ECLASS&rdquo; set. This is to remind you to write a description of your own for your ebuilds. Otherwise the inherited one will show through as a reminder.
    </para>
   </listitem>
+   <listitem>
+   <para>
+   Remember to always call need-kdelibs(). need-qt(0 is more optional, since you can depend on kdelibs to make sure qt is installed. There's no harm in explicitly calling need-qt, though.
+   </para>
+  </listitem>
+   <listitem>
+   <para>
+   If you override kde_src_compile, section configure, remember that you <emphasis>must</emphasis> call set-kdedir and set-qtdir somewhere before calling configure.
+   </para>
+  </listitem>
   </itemizedlist>
   </sect1>
 
diff --git a/eclass/doc/eclass-howto.txt b/eclass/doc/eclass-howto.txt
index 05aa9c67f112..54432bf3efc8 100644
--- a/eclass/doc/eclass-howto.txt
+++ b/eclass/doc/eclass-howto.txt
@@ -4,7 +4,7 @@ eclass howto
 
 Dan Armak
 
-Updated for eclasses v3.3
+Updated for eclasses v4
 
 1 Introduction
 
@@ -14,11 +14,11 @@ and functions. ebuilds can inherit from eclasses, and eclasses
 can inherit from other eclasses. As in OOP, this is used
 to ensure maximum code reuse among similar ebuilds.
 
-The most similar group of ebuilds is the kde apps. These
-have been selected to be the test case for the first incarnation
-of eclasses. Inheriting ebuilds are available for all of
-kde-2.2.1 (as kde*-2.2.1-r1), kdevelop-2.0.1 and koffice-1.1.
-Others will follow.
+The most similar group of ebuilds is the kde apps. were accordingly
+selected to be the test case for eclasses, and I believe
+I can now say the test has been successful. Eclasses for
+non-kde ebuilds may follow, but there are no concrete plans
+as of this time.
 
 Please read news.txt for an abstract of changes between versions
 of the eclasses.
@@ -74,7 +74,7 @@ Every inheriting ebuild begins with these two lines:
 inherit <list of eclasses> || die
 
 Eclasses do not need this first line, since they are always
-sourced from an ebuild which has it.
+sourced from an ebuild which already has it.
 
 2.2 virtual.eclass
 
@@ -264,37 +264,68 @@ cd ${S}
 
 patch -p0 < ${FILESDIR}/${P}-gentoo.diff
 
-Once, long ago, I remember hearing that emerge would execute
-this code automatically between src_unpack() and src_compile()
-if the file ${FILESDIR}/${P}-gentoo.diff was present. Was
-this a plan, a rumour, or what? Someone please correct me,
-or at least correct this document.
-
-2.4 kde.eclass
+There is also a helper function provided by base.eclass,
+called newdepend(). It simply adds all parameters to both
+DEPEND and RDEPEND, saving you the trouble of writing and
+maintaining two lists of dependencies.
+
+2.4 depend.eclass
+
+Added in v4. This provides two pairs of functions: need-kdelibs(),
+need-qt() and set-kdedir(), set-qtdir(). These functions
+handle the details of the multi-qt and multi-kdelibs schemes.
+These schemes set rules for having multiple versions of
+qt and/or of kdelibs installed side-by-side.
+
+The need-* functions are called with a parameter which is
+the version number required. They then add the corresponding
+dependencies to DEPEND and RDEPEND, and set the variables
+kde_version and qt_version which are used by the set-*dir
+functions. If no parameter is passed, a version number of
+0 (zero) is used.
+
+It is important to call these functions from the main part
+of the ebuild, so that any changes to DEPEND and RDEPEND
+affect emerge.
+
+The set-* dir functions are both called from the beginning
+of the configure section of the kde_src_compile() function.
+They read the qt_version and kde_version variables set by
+need-*, check which multi-*-scheme conforming libs are installed,
+and set KDEDIR and QTDIR to the location of the latest version
+installed that fulfills the requirements. When the new portage
+dependency functionality is released, this is where the
+changes needed for kde/qt-3 support will go.
+
+If no multi-*-scheme-compatible3 installation is found, KDEDIR
+and QTDIR are left untouched, assuming that the machine
+is an older one which sets hardcoded QTDIR and KDEDIR values
+from /etc/env.d.
+
+2.5 kde.eclass
 
 Used by all kde apps, whether directly or indirectly. This
 is a med-level eclass, which is intended to provide not
 only sensible defaults but functions which can be used as-is
 more often then not. In fact, none of the high-level kde-*
 eclasses which inherit from here change the functions in
-any way, and the ebuilds rarely do so.
+any way, and the ebuilds rarely do so. This eclass contains
+the meat of the kde eclass system, while virtual and base
+can be said to provide the skeleton.
 
-It inherits autoconf and base.
+It inherits autoconf, base and depend.
 
 Read it to find out what it defines. It is quite self-explanatory.
 
-Briefly, it handles all standard kde-2.1* and 2.2* apps that
-need configure/make/make install cycles. It handles all
-the std. configure options e.g. qtmt. It also adds kdelibs
-to DEPEND/RDEPEND.
+Briefly, it handles all standard kde apps that use GNU standard
+configure/make/make install cycles. It handles all the std.
+configure options e.g. qtmt.
 
 Note: some kde apps, like widget styles and i18n packages,
 do not need to compile anything. Therefore kde.eclass does
-not inherit c and does not depend on qt. These packages
-can then inherit straight from here (or from kde-i18n.eclass,
-which also inherits from here). All other packages, which
-need to compile c code and link against qt, should inherit
-from kde-base.eclass.
+not inherit c. These packages can then inherit straight
+from here. All other packages, which need to compile c code,
+should inherit from kde-base.eclass.
 
 As of v3.3, kde-objprelink was merged with kde, which now
 provides the objprelink deps (>=objprelink-0-r1), the options
@@ -302,12 +333,12 @@ passed to configure and a function kde-objprelink-patch()
 that applies the kde-admin-acinclude patch. Call it at the
 end of your src_unpack if you need it.
 
-2.5 kde-base.eclass
+2.6 kde-base.eclass
 
 Meant for standard kde apps, of both 2.1 and 2.2 architectures.
 Inherits c,kde and adds qt deps. Sets HOMEPAGE=apps.kde.com.
 
-2.6 kde-i18n.eclass
+2.7 kde-i18n.eclass
 
 Meant for the kde-i18n-* packages. Niche use.
 
@@ -317,7 +348,7 @@ so all they have to do is inherit from this eclass.
 Inherits from kde,kde.org. Makes a few differences, such
 as PROVIDE virtual/kde-i18n, correct $S, HOMEPAGE and DESCRIPTION.
 
-2.7 koffice-i18n.eclass
+2.8 koffice-i18n.eclass
 
 Meant for the koffice-i18n-* packages. Niche use. Very similar
 to kde-i18n.eclass.
@@ -325,7 +356,7 @@ to kde-i18n.eclass.
 All kde-i18n ebuilds are completely identical and so all
 they have to do is inherit from this eclass.
 
-2.8 kde-dist.eclass
+2.9 kde-dist.eclass
 
 Meant for the base kde distribution packages in kde-base/*.
 Inherits kde-base, kde.org and kde-objprelink. Adds the
@@ -333,15 +364,15 @@ correct DESCRIPTION and HOMEPAGE and kdelibs-${PV} deps.
 The simpler/smaller kde-base/ packages (e.g. kdetoys) make
 no changes at all; most of those that do only add deps.
 
-2.9 c.eclass
+2.10 c.eclass
 
 Adds gcc and glibc to DEPEND and RDEPEND.
 
-2.10 autoconf.eclass
+2.11 autoconf.eclass
 
 Adds make/automake/autoconf to DEPEND.
 
-2.11 debug.eclass
+2.12 debug.eclass
 
 Adds verbose output debugging functions. Is inherited by
 virtual.eclass.
@@ -416,7 +447,7 @@ output is further disabled in inherit() in inherit.eclass
 to avoid extra-inheriting. You can enable it there by uncommenting
 the appropriate lines.
 
-2.12 kde-objprelink.eclass
+2.13 kde-objprelink.eclass
 
 This eclass has been removed in v3.3 Its contents were merged
 into kde.eclass.
@@ -437,3 +468,12 @@ a collection of tips:
   from $ECLASS" set. This is to remind you
   to write a description of your own for your ebuilds. Otherwise
   the inherited one will show through as a reminder.
+
+* Remember to always call need-kdelibs(). need-qt(0 is more
+  optional, since you can depend on kdelibs to make sure
+  qt is installed. There's no harm in explicitly calling
+  need-qt, though.
+
+* If you override kde_src_compile, section configure, remember
+  that you must call set-kdedir and set-qtdir somewhere
+  before calling configure.
diff --git a/eclass/doc/news.txt b/eclass/doc/news.txt
index 7c4fd66e43cf..b03075648f29 100644
--- a/eclass/doc/news.txt
+++ b/eclass/doc/news.txt
@@ -1,8 +1,29 @@
+16/11
+v4
+Added multi-qt and multi-kdelibs functionality. See detailed explanation in eclass howto.
+There is now a new depend.eclass inherited by kde.eclass. It provides two pairs of
+functions, need-{kdelibs,qt} and set-{kdedir,qtdir}.
+An inheriting ebuild calls "need-kdelibs $ver" from its main section and gets the correct
+things added to DEPEND and RDEPEND. Same for qt. Usually ebuilds don't call need-qt
+directly, because the kdelibs depend already provides them with the necessary qt
+version, but the function does exist and is usable.
+The set-* functions are called at the beginning of kde_src_compile/configure section.
+They export the correct QTDIR and KDEDIR (the latter points to the location of kdelibs)
+based on the vars kde_version and qt_version which are set in need-*. (So don't touch
+these vars; I've added a list of Internal Vars to the eclass howto). If no multi-*-scheme
+compatible directories are found, set-* leaves KDEDIR/QTDIR untouched, this enables
+older systems to work with the new eclass and ebuilds.
+There have been many other misc small changes in the eclasses, because this was a
+big commit after weeks of testing. For example the newdepend() function was added to
+base.eclass; I'll eventually modify ebuilds to use it.
+When the new dep functionality is added to portage, I'll change the need-* functions
+accordingly, but the ebuilds won't need to be changed.
+
 26/10
 Added koffice-i18n.eclass, very similar to kde-i18n.eclass.
 
 15/10
-Added some multi-QTDIR failsafes:
+Added some multi-QTDIR failsafes (shouldn't be needed, but do no harm):
 myconf+=--with-qt-dir=${QTDIR}
 LIBRARY_PATH=${LIBRARY_PATH}:${QTDIR}/lib make
 
diff --git a/eclass/doc/todo.txt b/eclass/doc/todo.txt
index ae6f8ac38167..98b860496593 100644
--- a/eclass/doc/todo.txt
+++ b/eclass/doc/todo.txt
@@ -1,12 +1,7 @@
+- inverse section requests (I like fancy names)
+- sort out docs/sgml, get link from site
+- have ebuilds/eclasses use newdepend()
+- sort debug.eclass msgs into levels, divide output
 
-inverse section requests (I like fancy names)
-
-newdepend() in virtual.eclass, consider functions.eclass or similar
-
-finish multi-qt stuff
-
-sort out docs/sgml, get link from site
-
-cleanup or remove kde.org.eclass - cancelled?
 
 
diff --git a/eclass/kde-base.eclass b/eclass/kde-base.eclass
index 1255727af5ae..0232a883d5d1 100644
--- a/eclass/kde-base.eclass
+++ b/eclass/kde-base.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-base.eclass,v 1.10 2001/10/03 17:10:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-base.eclass,v 1.11 2001/11/16 12:50:41 danarmak Exp $
 # This is the kde ebuild for std. kde-dependant apps which follow configure/make/make install
 # procedures and have std. configure options.
 inherit c kde || die
@@ -10,10 +10,9 @@ ECLASS=kde-base
 DESCRIPTION="Based on the $ECLASS eclass"
 HOMEPAGE="http://apps.kde.com/"
 
-DEPEND="${DEPEND}
-	x11-libs/qt-x11"
-RDEPEND="${RDEPEND}
-	x11-libs/qt-x11"
+# always need *some* qt and kdelibs
+need-qt
+need-kdelibs
 
 
 
diff --git a/eclass/kde-dist.eclass b/eclass/kde-dist.eclass
index 30790bde8d06..2f8c7ce127b9 100644
--- a/eclass/kde-dist.eclass
+++ b/eclass/kde-dist.eclass
@@ -1,14 +1,13 @@
 # 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-dist.eclass,v 1.3 2001/10/05 13:34:41 danarmak Exp $
-# This is the kde ebuild for >=2.2.1 kde base packages. Don't use for kdelibs though :-)
-# It can't be used for e.g. kdevelop, koffice because of their separate versionnig schemes.
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.4 2001/11/16 12:50:41 danarmak Exp $
+# 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 || die
 ECLASS=kde-dist
 
 DESCRIPTION="KDE ${PV} - "
 HOMEPAGE="http://www.kde.org/"
 
-DEPEND="$DEPEND ( kde-base/kdelibs-${PV} )"
-RDEPEND="$RDEPEND ( kde-base/kdelibs-${PV} )"
+need-kdelibs ${PV}
\ No newline at end of file
diff --git a/eclass/kde-i18n.eclass b/eclass/kde-i18n.eclass
index ee13c6001491..3ece5cd27e7f 100644
--- 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 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-i18n.eclass,v 1.4 2001/10/01 13:54:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-i18n.eclass,v 1.5 2001/11/16 12:50:41 danarmak Exp $
 inherit kde kde.org || die
 ECLASS=kde-i18n
 
@@ -9,7 +9,7 @@ S=${WORKDIR}/${PN}
 DESCRIPTION="KDE ${PV} - i18n: ${PN}"
 HOMEPAGE="http://www.kde.org/"
 
-DEPEND=">=kde-base/kdelibs-${PV}"
+need-kdelibs ${PV}
 
 PROVIDE="virtual/kde-i18n-${PV}"
 
diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index 30b9741bc6a1..1d2de1668eb1 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -1,12 +1,9 @@
 # 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>
-# 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>Xx
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.14 2001/10/20 09:04:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.15 2001/11/16 12:50:41 danarmak Exp $
 # The kde eclass is inherited by all kde-* eclasses. Few ebuilds inherit straight from here.
-inherit autoconf base || die
+inherit autoconf base depend || die
 ECLASS=kde
 
 DESCRIPTION="Based on the $ECLASS eclass"
@@ -23,7 +20,7 @@ kde-objprelink-patch() {
 	    cd ${S} && \
 	    patch -p0 < /usr/share/objprelink/kde-admin-acinclude.patch && \
 	    make -f Makefile.cvs || die "died in kde-objprelink-patch"
-	fi    
+	fi
 }
 
 kde_src_compile() {
@@ -36,9 +33,11 @@ kde_src_compile() {
 	case $1 in
 		myconf)
 			debug-print-section myconf
-			myconf="--host=${CHOST} --with-x --enable-mitshm --with-xinerama --prefix=${KDEDIR} --with-qt-dir=${QTDIR}"
+			myconf="--host=${CHOST} --with-x --enable-mitshm --with-xinerama --prefix=/usr --with-qt-dir=${QTDIR}"
 			use qtmt 	&& myconf="$myconf --enable-mt"
 			use objprelink	&& myconf="$myconf --enable-objprelink" || myconf="$myconf --disable-objprelink"
+			set-kdedir $kde_version
+			set-qtdir $qt_version
 			;;
 		configure)
 			debug-print-section configure
@@ -88,3 +87,16 @@ kde_src_install() {
 
 EXPORT_FUNCTIONS src_compile src_install
 
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/kde-base/kdelibs/files/80kdelibs-2.2.1 b/kde-base/kdelibs/files/80kdelibs-2.2.1
new file mode 100644
index 000000000000..5ee5a87ee5d4
--- /dev/null
+++ b/kde-base/kdelibs/files/80kdelibs-2.2.1
@@ -0,0 +1,8 @@
+PATH=/usr/lib/kdelibs-2.2.1/bin
+ROOTPATH=/usr/lib/kdelibs-2.2.1/bin
+LDPATH=/usr/lib/kdelibs-2.2.1/lib
+LIBRARY_PATH=/usr/lib/kdelibs-2.2.1/lib
+C_INCLUDE_PATH=/usr/lib/kdelibs-2.2.1/include
+CPLUS_INCLUDE_PATH=/usr/lib/kdelibs-2.2.1/include
+OBJC_INCLUDE_PATH=/usr/lib/kdelibs-2.2.1/include
+
diff --git a/kde-base/kdelibs/files/digest-kdelibs-2.2.1-r2 b/kde-base/kdelibs/files/digest-kdelibs-2.2.1-r2
new file mode 100644
index 000000000000..26ccd019e2d4
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-2.2.1-r2
@@ -0,0 +1 @@
+MD5 3aa73b3fe7095b3bab3081bece73f56f kdelibs-2.2.1.tar.bz2 6000640
diff --git a/kde-base/kdelibs/kdelibs-2.2.1-r2.ebuild b/kde-base/kdelibs/kdelibs-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..d51042c65b84
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-2.2.1-r2.ebuild
@@ -0,0 +1,67 @@
+# 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/kde-base/kdelibs/kdelibs-2.2.1-r2.ebuild,v 1.1 2001/11/16 12:50:42 danarmak Exp $
+. /usr/portage/eclass/inherit.eclass || die
+inherit kde-dist || die
+
+DESCRIPTION="${DESCRIPTION}Libraries"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here. so we recreate the entire
+# DEPEND from scratch.
+COMMONDEPEND=">=sys-devel/gcc-2.95.2
+		virtual/glibc
+		sys-devel/ld.so
+		sys-devel/perl
+		>=media-libs/audiofile-0.1.9
+		>=sys-apps/bzip2-1.0.1
+		>=dev-libs/libpcre-3.4
+		>=dev-libs/libxml2-2.4.1
+		ssl? ( >=dev-libs/openssl-0.9.6 )
+		alsa? ( >=media-libs/alsa-lib-0.5.9 )
+		cups? ( net-print/cups )
+		>=media-libs/tiff-3.5.5"
+
+DEPEND="$COMMONDEPEND
+	sys-devel/make
+	sys-devel/autoconf
+	sys-devel/automake"
+
+RDEPEND="$COMMONDEPEND
+	~kde-base/kde-env-${PV}
+	app-text/sgml-common
+	cups? ( net-print/cups )
+	dev-lang/python"
+	
+need-qt 2.2.3
+
+BASE=/usr/lib/${P}
+
+src_compile() {
+
+	kde_src_compile myconf
+
+	myconf="$myconf --disable-libafm"
+	use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
+	use ssl		&& myconf="$myconf --with-ssl-dir=/usr"		|| myconf="$myconf --without-ssl"
+	use alsa	&& myconf="$myconf --with-alsa"			|| myconf="$myconf --without-alsa"
+	use cups	&& myconf="$myconf --enable-cups"		|| myconf="$myconf --disable-cups"
+	myconf="$myconf --prefix=${BASE}"
+	
+	kde_src_compile configure make
+
+}
+
+src_install() {
+	
+	kde_src_install
+	
+	docinto html
+	dodoc *.html
+	
+	insinto /etc/env.d
+	doins ${FILESDIR}/80${P}
+
+}
+
+
diff --git a/media-gfx/kuickshow/kuickshow-0.8-r2.ebuild b/media-gfx/kuickshow/kuickshow-0.8-r2.ebuild
index 7692a980cbdc..899e1e7ad49f 100644
--- a/media-gfx/kuickshow/kuickshow-0.8-r2.ebuild
+++ b/media-gfx/kuickshow/kuickshow-0.8-r2.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kuickshow/kuickshow-0.8-r2.ebuild,v 1.1 2001/10/03 22:20:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kuickshow/kuickshow-0.8-r2.ebuild,v 1.2 2001/11/16 12:50:42 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2.1.1
+
 DESCRIPTION="Kuickshow image loader for kde2"
 SRC_URI="http://prdownloads.sourceforge.net/kuickshow/${P}.tgz"
 HOMEPAGE="http://kuickshow.sourceforge.net/"
 
 DEPEND="$DEPEND
-		>=kde-base/kdelibs-2.1.1
 		sys-apps/which
 		>=media-libs/imlib-1.9.10"
 RDEPEND="$RDEPEND
-		>=kde-base/kdelibs-2.1.1
 		>=media-libs/imlib-1.9.10"
 
 src_compile() {
diff --git a/net-misc/kmago/kmago-1.1.2-r1.ebuild b/net-misc/kmago/kmago-1.1.2-r1.ebuild
index 78ee42d9b2ed..b3c748844111 100644
--- a/net-misc/kmago/kmago-1.1.2-r1.ebuild
+++ b/net-misc/kmago/kmago-1.1.2-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kmago/kmago-1.1.2-r1.ebuild,v 1.1 2001/10/03 22:20:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kmago/kmago-1.1.2-r1.ebuild,v 1.2 2001/11/16 12:50:42 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2.1.1
+
 DESCRIPTION="A Download Apllication for KDE2 based on wget"
 SRC_URI="http://download.sourceforge.net/kmago/${P}.tar.gz"
 HOMEPAGE="http://kmago.sourceforge.net"
 
-DEPEND="$DEPEND >=kde-base/kdelibs-2.1.1"
-RDEPEND="$RDEPEND >=kde-base/kdelibs-2.1.1"
 
diff --git a/net-misc/knetload/knetload-1.91-r2.ebuild b/net-misc/knetload/knetload-1.91-r2.ebuild
index 0603c3b67a5e..4b1466cb7773 100644
--- a/net-misc/knetload/knetload-1.91-r2.ebuild
+++ b/net-misc/knetload/knetload-1.91-r2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knetload/knetload-1.91-r2.ebuild,v 1.1 2001/10/03 22:20:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knetload/knetload-1.91-r2.ebuild,v 1.2 2001/11/16 12:50:42 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2.1.1
+
 DESCRIPTION="A Network applet for KDE2"
 SRC_URI="http://kde.quakenet.eu.org/files/${P}.tar.gz"
 HOMEPAGE="http://kde.quakenet.eu.org/knetload.shtml"
 
-DEPEND="$DEPEND >=kde-base/kdelibs-2.1.1"
-RDEPEND="$RDEPEND >=kde-base/kdelibs-2.1.1"
 
diff --git a/net-misc/ktelnet/ktelnet-2.0.43-r1.ebuild b/net-misc/ktelnet/ktelnet-2.0.43-r1.ebuild
index 96cab60245ed..64d3f6175e92 100644
--- a/net-misc/ktelnet/ktelnet-2.0.43-r1.ebuild
+++ b/net-misc/ktelnet/ktelnet-2.0.43-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ktelnet/ktelnet-2.0.43-r1.ebuild,v 1.1 2001/10/03 22:20:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ktelnet/ktelnet-2.0.43-r1.ebuild,v 1.2 2001/11/16 12:50:42 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2.1.1
+
 DESCRIPTION="A Putty like for KDE"
 SRC_URI="http://www.spaghetti-code.de/download/ktelnet/${PN}2-0.43.tgz"
 HOMEPAGE="http://www.spaghetti-code.de/software/linux/ktelnet/"
 
-DEPEND="$DEPEND >=kde-base/kdelibs-2.1.1"
-RDEPEND="$RDEPEND >=kde-base/kdelibs-2.1.1"
+S=${WORKDIR}/ktelnet2-0.43
\ No newline at end of file
diff --git a/net-misc/ktelnet2/ktelnet2-0.43.ebuild b/net-misc/ktelnet2/ktelnet2-0.43.ebuild
index faa97b707a7e..59b261e956d0 100644
--- a/net-misc/ktelnet2/ktelnet2-0.43.ebuild
+++ b/net-misc/ktelnet2/ktelnet2-0.43.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ktelnet2/ktelnet2-0.43.ebuild,v 1.1 2001/10/03 22:20:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ktelnet2/ktelnet2-0.43.ebuild,v 1.2 2001/11/16 12:50:42 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2.1.1
+
 DESCRIPTION="A Putty like for KDE"
 SRC_URI="http://www.spaghetti-code.de/download/ktelnet/${P}.tgz"
 HOMEPAGE="http://www.spaghetti-code.de/software/linux/ktelnet/"
 
-DEPEND="$DEPEND >=kde-base/kdelibs-2.1.1"
-RDEPEND="$RDEPEND >=kde-base/kdelibs-2.1.1"
diff --git a/net-print/kups/kups-1.0-r1.ebuild b/net-print/kups/kups-1.0-r1.ebuild
index 18b36c176f31..ceadba68f5b5 100644
--- a/net-print/kups/kups-1.0-r1.ebuild
+++ b/net-print/kups/kups-1.0-r1.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-print/kups/kups-1.0-r1.ebuild,v 1.1 2001/10/03 22:20:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/kups/kups-1.0-r1.ebuild,v 1.2 2001/11/16 12:50:42 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
+need-kdelibs 2.1.1
+
 DESCRIPTION="A CUPS front-end for KDE"
 SRC_URI="ftp://cups.sourceforge.net/pub/cups/kups/${P}.tar.gz"
 HOMEPAGE="http://cups.sourceforge.net/kups/"
 
 DEPEND="$DEPEND
-		>=kde-base/kdelibs-2.1.1
 		>=net-print/qtcups-2.0"
 RDEPEND="$RDEPEND
-		>=kde-base/kdelibs-2.1.1
 		>=net-print/qtcups-2.0"
 
 src_compile() {
diff --git a/x11-misc/mosfet-liquid-widgets/files/digest-mosfet-liquid-widgets-0.7 b/x11-misc/mosfet-liquid-widgets/files/digest-mosfet-liquid-widgets-0.7-r1
index f480bd62aff6..f480bd62aff6 100644
--- a/x11-misc/mosfet-liquid-widgets/files/digest-mosfet-liquid-widgets-0.7
+++ b/x11-misc/mosfet-liquid-widgets/files/digest-mosfet-liquid-widgets-0.7-r1
diff --git a/x11-misc/mosfet-liquid-widgets/mosfet-liquid-widgets-0.7-r1.ebuild b/x11-misc/mosfet-liquid-widgets/mosfet-liquid-widgets-0.7-r1.ebuild
new file mode 100644
index 000000000000..c6e7cebdaca7
--- /dev/null
+++ b/x11-misc/mosfet-liquid-widgets/mosfet-liquid-widgets-0.7-r1.ebuild
@@ -0,0 +1,33 @@
+# 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/x11-misc/mosfet-liquid-widgets/mosfet-liquid-widgets-0.7-r1.ebuild,v 1.1 2001/11/16 12:50:42 danarmak Exp $
+. /usr/portage/eclass/inherit.eclass || die
+inherit kde-base || die
+
+need-kdelibs 2.2
+
+PN=mosfet-liquid
+S=${WORKDIR}/${PN}${PV}
+DESCRIPTION="Mosfet's High-Permormance Liquid Widgets and Style for KDE2.2+"
+SRC_URI="http://www.mosfet.org/${PN}${PV}.tar.gz"
+
+HOMEPAGE="http://www.mosfet.org/liquid.html"
+
+DEPEND="$DEPEND >=kde-base/kdebase-2.2"
+RDEPEND="$RDEPEND >=kde-base/kdebase-2.2"
+
+src_unpack() {
+    base_src_unpack all
+    cd ${S}/kwin-engine
+    cp Makefile.am 1
+    sed -e 's:-I$(kde_includes)/kwin:-I$(kde_includes)/kwin -I/usr/include/kwin:' \
+	-e 's:$(kde_libraries)/kwin.la:/usr/lib/kwin.la:' 1 > Makefile.am
+    rm 1
+}
+
+src_compile() {
+    make -f Makefile.cvs
+    kde_src_compile
+}
+
diff --git a/x11-misc/mosfet-liquid-widgets/mosfet-liquid-widgets-0.7.ebuild b/x11-misc/mosfet-liquid-widgets/mosfet-liquid-widgets-0.7.ebuild
deleted file mode 100644
index 7077dd8a2c6a..000000000000
--- a/x11-misc/mosfet-liquid-widgets/mosfet-liquid-widgets-0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2001 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/x11-misc/mosfet-liquid-widgets/mosfet-liquid-widgets-0.7.ebuild,v 1.1 2001/11/07 13:29:37 verwilst Exp $
-. /usr/portage/eclass/inherit.eclass || die
-inherit kde-base || die
-
-PN=mosfet-liquid
-S=${WORKDIR}/${PN}${PV}
-DESCRIPTION="Mosfet's High-Permormance Liquid Widgets and Style for KDE2.2+"
-SRC_URI="http://www.mosfet.org/mosfet-liquid0.7.tar.gz"
-
-HOMEPAGE="http://www.mosfet.org/liquid.html"
-
-DEPEND="$DEPEND >=kde-base/kdelibs-2.2"
-RDEPEND="$RDEPEND >=kde-base/kdelibs-2.2"
-
-src_compile() {
-    make -f Makefile.cvs
-    kde_src_compile
-}
-
-pkg_postinst() {
-    echo "NOTE: if you had KDE running with these widgets already enabled,
-you have a spectacular crash. Enjoy!"
-}
-
-
-
-