Remove dep on the dejavu fonts.

(Portage version: 2.2_rc38/cvs/Linux i686, RepoMan options: --force)

5 files changed, 9 insertions, 39 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index e900f41aa5ec..da29bb564737 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.622 2009/09/07 02:34:08 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.623 2009/09/19 22:04:09 scarabeus Exp $
+
+  19 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/dist/20_use_dejavu_as_default_font.patch, kdelibs-4.2.4-r4.ebuild,
+  kdelibs-4.3.0.ebuild, kdelibs-4.3.1.ebuild:
+  Remove dep on the dejavu fonts.
 
   07 Sep 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   kdelibs-4.3.1.ebuild:
diff --git a/kde-base/kdelibs/files/dist/20_use_dejavu_as_default_font.patch b/kde-base/kdelibs/files/dist/20_use_dejavu_as_default_font.patch
deleted file mode 100644
index 577e8789173e..000000000000
--- a/kde-base/kdelibs/files/dist/20_use_dejavu_as_default_font.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-Use DejaVu Sans as default font and adjusts sizes accordingly.
---- a/kdeui/kernel/kglobalsettings.cpp
-+++ b/kdeui/kernel/kglobalsettings.cpp
-@@ -374,7 +374,7 @@
- 
- // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
- static const char GeneralId[] =      "General";
--static const char DefaultFont[] =    "Sans Serif";
-+static const char DefaultFont[] =    "DejaVu Sans";
- #ifdef Q_WS_MAC
- static const char DefaultMacFont[] = "Lucida Grande";
- #endif
-@@ -387,13 +387,13 @@
-     { GeneralId, "toolBarFont", DefaultMacFont, 11, -1, QFont::SansSerif },
-     { GeneralId, "menuFont",    DefaultMacFont, 13, -1, QFont::SansSerif },
- #else
--    { GeneralId, "font",        DefaultFont, 10, -1, QFont::SansSerif },
--    { GeneralId, "fixed",       "Monospace", 10, -1, QFont::TypeWriter },
-+    { GeneralId, "font",        DefaultFont,  9, -1, QFont::SansSerif },
-+    { GeneralId, "fixed", "DejaVu Sans Mon",  9, -1, QFont::TypeWriter },
-     { GeneralId, "toolBarFont", DefaultFont,  8, -1, QFont::SansSerif },
--    { GeneralId, "menuFont",    DefaultFont, 10, -1, QFont::SansSerif },
-+    { GeneralId, "menuFont",    DefaultFont,  9, -1, QFont::SansSerif },
- #endif
-     { "WM",      "activeFont",           DefaultFont,  9, QFont::Bold, QFont::SansSerif },// inconsistency
--    { GeneralId, "taskbarFont",          DefaultFont, 10, -1, QFont::SansSerif },
-+    { GeneralId, "taskbarFont",          DefaultFont,  9, -1, QFont::SansSerif },
-     { GeneralId, "smallestReadableFont", DefaultFont,  8, -1, QFont::SansSerif }
- };
- 
-
diff --git a/kde-base/kdelibs/kdelibs-4.2.4-r4.ebuild b/kde-base/kdelibs/kdelibs-4.2.4-r4.ebuild
index 81503ae0be02..186ceb79486f 100644
--- a/kde-base/kdelibs/kdelibs-4.2.4-r4.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.4-r4.ebuild,v 1.4 2009/08/13 12:11:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.4-r4.ebuild,v 1.5 2009/09/19 22:04:09 scarabeus Exp $
 
 EAPI="2"
 
@@ -112,7 +112,6 @@ PDEPEND="
 # upstream patches / dist patches
 PATCHES=(
 	"${FILESDIR}/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch"
-	"${FILESDIR}/dist/20_use_dejavu_as_default_font.patch"
 	"${FILESDIR}/dist/23_solid_no_double_build.patch"
 	"${FILESDIR}/${PN}-${SLOT}-fixx11h.h.patch"
 	"${FILESDIR}/${PV}-fixPopupForPlasmaboard.patch"
diff --git a/kde-base/kdelibs/kdelibs-4.3.0.ebuild b/kde-base/kdelibs/kdelibs-4.3.0.ebuild
index 26384dfe0d1a..e39f40a724a5 100644
--- a/kde-base/kdelibs/kdelibs-4.3.0.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.0.ebuild,v 1.2 2009/08/13 12:11:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.0.ebuild,v 1.3 2009/09/19 22:04:09 scarabeus Exp $
 
 EAPI="2"
 
@@ -111,7 +111,6 @@ PDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/dist/20_use_dejavu_as_default_font.patch"
 	"${FILESDIR}/dist/23_solid_no_double_build.patch"
 )
 
diff --git a/kde-base/kdelibs/kdelibs-4.3.1.ebuild b/kde-base/kdelibs/kdelibs-4.3.1.ebuild
index 7a2cea5aed66..cf06ed5026a6 100644
--- a/kde-base/kdelibs/kdelibs-4.3.1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.1.ebuild,v 1.2 2009/09/07 02:34:08 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.1.ebuild,v 1.3 2009/09/19 22:04:09 scarabeus Exp $
 
 EAPI="2"
 
@@ -110,7 +110,6 @@ PDEPEND="
 PATCHES=(
 	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch"
 	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs.patch"
-	"${FILESDIR}/dist/20_use_dejavu_as_default_font.patch"
 	"${FILESDIR}/dist/23_solid_no_double_build.patch"
 )