eclasses v3.3, mosfet's liquid widgets, misc fixes

6 files changed, 36 insertions, 108 deletions

diff --git a/eclass/doc/eclass-howto.lyx b/eclass/doc/eclass-howto.lyx
index 5fb233dc8a64..f1d6938d28c1 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.2
+Updated for eclasses v3.3
 \layout Section
 
 Introduction
@@ -487,6 +487,12 @@ Note: some kde apps, like widget styles and i18n packages, do not need to
  which also inherits from here).
  All other packages, which need to compile c code and link against qt, should
  inherit from kde-base.eclass.
+\layout Standard
+
+As of v3.3, kde-objprelink was merged with kde, which now provides the objprelink
+ deps (>=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.
 \layout Subsection
 
 kde-base.eclass
@@ -673,37 +679,7 @@ Note that all debugging output is off by default.
 kde-objprelink.eclass
 \layout Standard
 
-Provides objprelink deps (>=objprelink-0-r1).
- Also provides a function kde-objprelink-patch() that applies the kde-admin-acin
-clude patch.
- Call it and the end of your src_unpack if you need it.
-\layout Standard
-
-Known issue: the actual --enable-objprelink option is passed to configure
- from kde.eclass, regardless of the inheritance of objprelink.
- Therefore if:
-\layout Enumerate
-
-A package has builtin objprelink capability which can be activated from
- configure with --enable-objprelink
-\layout Enumerate
-
-The package does not inherit from kde-objprelink (or kde-dist etc.)
-\layout Enumerate
-
-USE objprelink is set
-\layout Enumerate
-
->=objprelink-0-r1 is, incidentally, not installed
-\layout Standard
-
-Then, the make process will try to use objprelink, but won't find it and
- will (may?) fail and abort.
-\layout Standard
-
-However, because the package will depend on kdelibs, which inherits kde-objpreli
-nk through kde-dist, the chances of this happening are practically nil.
- In any case, I'll try to think of a better solution.
+This eclass has been removed in v3.3 Its contents were merged into kde.eclass.
 \layout Section
 
 The inheriting ebuilds
diff --git a/eclass/doc/eclass-howto.sgml b/eclass/doc/eclass-howto.sgml
index 0c287cd11afa..2693f6d5f757 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.2
+   Updated for eclasses v3.3
   </date>
   <sect1>
    <title>
@@ -251,6 +251,9 @@
    <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.
    </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.
+   </para>
    </sect2>
    <sect2>
     <title>
@@ -356,38 +359,7 @@
     kde-objprelink.eclass
    </title>
    <para>
-    Provides objprelink deps (&gt;=objprelink-0-r1). Also provides a function kde-objprelink-patch() that applies the kde-admin-acinclude patch. Call it and the end of your src_unpack if you need it.
-   </para>
-   <para>
-    Known issue: the actual --enable-objprelink option is passed to configure from kde.eclass, regardless of the inheritance of objprelink. Therefore if:
-   </para>
-   <orderedlist>
-    <listitem>
-    <para>
-    A package has builtin objprelink capability which can be activated from configure with --enable-objprelink
-    </para>
-   </listitem>
-    <listitem>
-    <para>
-    The package does not inherit from kde-objprelink (or kde-dist etc.)
-    </para>
-   </listitem>
-    <listitem>
-    <para>
-    USE objprelink is set
-    </para>
-   </listitem>
-    <listitem>
-    <para>
-    &gt;=objprelink-0-r1 is, incidentally, not installed
-    </para>
-   </listitem>
-   </orderedlist>
-   <para>
-    Then, the make process will try to use objprelink, but won't find it and will (may?) fail and abort.
-   </para>
-   <para>
-    However, because the package will depend on kdelibs, which inherits kde-objprelink through kde-dist, the chances of this happening are practically nil. In any case, I'll try to think of a better solution.
+    This eclass has been removed in v3.3 Its contents were merged into kde.eclass.
    </para>
    </sect2>
   </sect1>
diff --git a/eclass/doc/eclass-howto.txt b/eclass/doc/eclass-howto.txt
index 3f7384e9f0d2..50351ab23f79 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.2
+Updated for eclasses v3.3
 
 1 Introduction
 
@@ -296,6 +296,12 @@ which also inherits from here). All other packages, which
 need to compile c code and link against qt, 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
+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
 
 Meant for standard kde apps, of both 2.1 and 2.2 architectures.
@@ -405,32 +411,8 @@ the appropriate lines.
 
 2.11 kde-objprelink.eclass
 
-Provides objprelink deps (>=objprelink-0-r1). Also provides
-a function kde-objprelink-patch() that applies the kde-admin-acinclude
-patch. Call it and the end of your src_unpack if you need
-it.
-
-Known issue: the actual --enable-objprelink option is passed
-to configure from kde.eclass, regardless of the inheritance
-of objprelink. Therefore if:
-
-1. A package has builtin objprelink capability which can be
-  activated from configure with --enable-objprelink
-
-2. The package does not inherit from kde-objprelink (or kde-dist
-  etc.)
-
-3. USE objprelink is set
-
-4. >=objprelink-0-r1 is, incidentally, not installed
-
-Then, the make process will try to use objprelink, but won't
-find it and will (may?) fail and abort.
-
-However, because the package will depend on kdelibs, which
-inherits kde-objprelink through kde-dist, the chances of
-this happening are practically nil. In any case, I'll try
-to think of a better solution.
+This eclass has been removed in v3.3 Its contents were merged
+into kde.eclass.
 
 3 The inheriting ebuilds
 
diff --git a/eclass/doc/news.txt b/eclass/doc/news.txt
index bd06c53c9b4d..e39e4b0c10d0 100644
--- a/eclass/doc/news.txt
+++ b/eclass/doc/news.txt
@@ -1,3 +1,9 @@
+5/10
+v3.3
+Removal of kde-objprelink. You now inherit from it no longer :-)
+It has been merged into kde. You will get the dependency and the configure parameter
+automatically, and can call kde-objprelink-patch() (which is now in kde.eclass) if needed.
+
 3/10
 v3.2
 Addition of kde-objprelink, further minor changes and fixes.
diff --git a/eclass/kde-objprelink.eclass b/eclass/kde-objprelink.eclass
deleted file mode 100644
index 1067674beb97..000000000000
--- a/eclass/kde-objprelink.eclass
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-objprelink.eclass,v 1.2 2001/10/04 22:16:05 danarmak Exp $
-# Provides deps and functions for objprelink. Supports objprelink-admin.ptch.
-ECLASS=kde-objprelink
-
-use objprelink && DEPEND="$DEPEND >=dev-util/objprelink-0-r1"
-
-kde-objprelink-patch() {
-	debug-print-function kde-objprelink-patch $*
-	use objprelink && cd ${S} && patch -p0 < /usr/share/objprelink/kde-admin-acinclude.patch
-}
-
diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index b4a922c1aa5e..397dca704ec0 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -4,7 +4,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>Xx
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.10 2001/10/03 17:10:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.11 2001/10/05 11:46:29 danarmak Exp $
 # The kde eclass is inherited by all kde-* eclasses. Few ebuilds inherit straight from here.
 inherit autoconf base || die
 ECLASS=kde
@@ -13,9 +13,15 @@ DESCRIPTION="Based on the $ECLASS eclass"
 
 HOMEPAGE="http://www.kde.org/"
 
-DEPEND="$DEPEND kde-base/kdelibs"
+DEPEND="$DEPEND kde-base/kdelibs
+				objprelink? ( >=dev-util/objprelink-0-r1 )"
 RDEPEND="$RDEPEND kde-base/kdelibs"
 
+kde-objprelink-patch() {
+	debug-print-function kde-objprelink-patch $*
+	use objprelink && cd ${S} && patch -p0 < /usr/share/objprelink/kde-admin-acinclude.patch || die
+}
+
 kde_src_compile() {
 
     debug-print-function kde_src_compile $*