inherit kde instead of deprecated kde-base

5 files changed, 21 insertions, 14 deletions

diff --git a/net-im/kmerlin/ChangeLog b/net-im/kmerlin/ChangeLog
index 7c04adc15848..f56770d3e05a 100644
--- a/net-im/kmerlin/ChangeLog
+++ b/net-im/kmerlin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/kmerlin
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/ChangeLog,v 1.13 2003/10/23 14:12:28 aliz Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/ChangeLog,v 1.14 2004/03/14 17:25:38 mr_bones_ Exp $
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> kmerlin-1.0-r1.ebuild,
+  kmerlin-1.2.ebuild, kmerlin-1.3_beta2.ebuild, kmerlin-1.3_beta3.ebuild:
+  inherit kde instead of deprecated kde-base
 
   29 May 2003; Jason Wever <weeve@gentoo.org> kmerlin-1.3_beta3.ebuild:
   Added ~sparc to keywords.
diff --git a/net-im/kmerlin/kmerlin-1.0-r1.ebuild b/net-im/kmerlin/kmerlin-1.0-r1.ebuild
index 7f009b74b810..df12362a6876 100644
--- a/net-im/kmerlin/kmerlin-1.0-r1.ebuild
+++ b/net-im/kmerlin/kmerlin-1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/kmerlin-1.0-r1.ebuild,v 1.8 2003/07/22 20:13:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/kmerlin-1.0-r1.ebuild,v 1.9 2004/03/14 17:25:38 mr_bones_ Exp $
 
-inherit kde-base
+inherit kde
 
 need-kde 3
 # despite being a kde3 app, its configure script was generated by autoconf 2.13 so:
diff --git a/net-im/kmerlin/kmerlin-1.2.ebuild b/net-im/kmerlin/kmerlin-1.2.ebuild
index 25a580193bec..960766040c53 100644
--- a/net-im/kmerlin/kmerlin-1.2.ebuild
+++ b/net-im/kmerlin/kmerlin-1.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/kmerlin-1.2.ebuild,v 1.6 2003/02/13 14:10:26 vapier Exp $
-inherit kde-base
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/kmerlin-1.2.ebuild,v 1.7 2004/03/14 17:25:38 mr_bones_ Exp $
+
+inherit kde
 
 need-kde 3
 
diff --git a/net-im/kmerlin/kmerlin-1.3_beta2.ebuild b/net-im/kmerlin/kmerlin-1.3_beta2.ebuild
index bcb9e7d8bf2b..0ff6b490b380 100644
--- a/net-im/kmerlin/kmerlin-1.3_beta2.ebuild
+++ b/net-im/kmerlin/kmerlin-1.3_beta2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/kmerlin-1.3_beta2.ebuild,v 1.3 2003/07/13 12:44:50 aliz Exp $
-inherit kde-base
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/kmerlin-1.3_beta2.ebuild,v 1.4 2004/03/14 17:25:38 mr_bones_ Exp $
+
+inherit kde
 
 need-kde 3
 
diff --git a/net-im/kmerlin/kmerlin-1.3_beta3.ebuild b/net-im/kmerlin/kmerlin-1.3_beta3.ebuild
index 3518b91e123c..d51b27271081 100644
--- a/net-im/kmerlin/kmerlin-1.3_beta3.ebuild
+++ b/net-im/kmerlin/kmerlin-1.3_beta3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/kmerlin-1.3_beta3.ebuild,v 1.4 2003/09/06 00:00:56 msterret Exp $
-inherit kde-base
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmerlin/kmerlin-1.3_beta3.ebuild,v 1.5 2004/03/14 17:25:38 mr_bones_ Exp $
+
+inherit kde
 
 need-kde 3.1 # uses kpassivepopup.h