From 310f26a3464791cca2a27fc9d80dcddfb4eecfb3 Mon Sep 17 00:00:00 2001
From: Carsten Lohrke <carlo@gentoo.org>
Date: Wed, 14 Jun 2006 18:32:39 +0000
Subject: [PATCH] A few KDE 3.5 branch fixes. Package-Manager: portage-2.1

---
 kde-base/kicker/ChangeLog                     |  7 +++-
 kde-base/kicker/files/digest-kicker-3.5.3-r1  |  6 +++
 kde-base/kicker/kicker-3.5.3-r1.ebuild        | 39 +++++++++++++++++++
 kde-base/konsole/ChangeLog                    |  7 +++-
 .../konsole/files/digest-konsole-3.5.3-r1     |  6 +++
 kde-base/konsole/konsole-3.5.3-r1.ebuild      | 27 +++++++++++++
 6 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 kde-base/kicker/files/digest-kicker-3.5.3-r1
 create mode 100644 kde-base/kicker/kicker-3.5.3-r1.ebuild
 create mode 100644 kde-base/konsole/files/digest-konsole-3.5.3-r1
 create mode 100644 kde-base/konsole/konsole-3.5.3-r1.ebuild

diff --git a/kde-base/kicker/ChangeLog b/kde-base/kicker/ChangeLog
index db8d5cce7eac..881224b0857c 100644
--- a/kde-base/kicker/ChangeLog
+++ b/kde-base/kicker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kicker
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.54 2006/06/01 18:37:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.55 2006/06/14 18:32:39 carlo Exp $
+
+*kicker-3.5.3-r1 (14 Jun 2006)
+
+  14 Jun 2006; Carsten Lohrke <carlo@gentoo.org> +kicker-3.5.3-r1.ebuild:
+  A few KDE 3.5 branch fixes.
 
 *kicker-3.5.3 (01 Jun 2006)
 
diff --git a/kde-base/kicker/files/digest-kicker-3.5.3-r1 b/kde-base/kicker/files/digest-kicker-3.5.3-r1
new file mode 100644
index 000000000000..cfd18542a977
--- /dev/null
+++ b/kde-base/kicker/files/digest-kicker-3.5.3-r1
@@ -0,0 +1,6 @@
+MD5 71b9ee636bc39514d3d445b7034b7aa7 kdebase-3.5-patchset-02.tar.bz2 7118
+RMD160 ea3c7215e68754e8acac03e9fafea8aa9c6d1202 kdebase-3.5-patchset-02.tar.bz2 7118
+SHA256 459e2ce09a7151fd5f52bf77570dccd2447f00a604dab65adf7dfb5da431ac1b kdebase-3.5-patchset-02.tar.bz2 7118
+MD5 9cb6b8291c4f3f986e16f72129e8fcd0 kdebase-3.5.3.tar.bz2 23634194
+RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 kdebase-3.5.3.tar.bz2 23634194
+SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 kdebase-3.5.3.tar.bz2 23634194
diff --git a/kde-base/kicker/kicker-3.5.3-r1.ebuild b/kde-base/kicker/kicker-3.5.3-r1.ebuild
new file mode 100644
index 000000000000..7f83a6582358
--- /dev/null
+++ b/kde-base/kicker/kicker-3.5.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.3-r1.ebuild,v 1.1 2006/06/14 18:32:39 carlo Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-02.tar.bz2"
+
+DESCRIPTION="KDE panel housing varous applets"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="xcomposite"
+
+RDEPEND="
+$(deprange $PV $MAXKDEVER kde-base/libkonq)
+$(deprange $PV $MAXKDEVER kde-base/kdebase-data)
+	|| ( (
+			x11-libs/libXau
+			x11-libs/libXfixes
+			x11-libs/libXrender
+			x11-libs/libXtst
+		) virtual/x11 )
+	xcomposite? ( || ( x11-libs/libXcomposite <x11-base/xorg-x11-7 ) )"
+
+DEPEND="${RDEPEND}
+	xcomposite? ( || ( x11-proto/compositeproto <x11-base/xorg-x11-7 ) )"
+
+KMCOPYLIB="libkonq libkonq"
+KMEXTRACTONLY="libkonq
+	kdm/kfrontend/themer/"
+KMCOMPILEONLY="kdmlib/"
+
+src_compile() {
+	myconf="$myconf $(use_with xcomposite composite)"
+	kde-meta_src_compile
+}
diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog
index 729c11643512..58cd5ee2713e 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-base/konsole/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/konsole
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.51 2006/06/01 23:37:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.52 2006/06/14 18:31:02 carlo Exp $
+
+*konsole-3.5.3-r1 (14 Jun 2006)
+
+  14 Jun 2006; Carsten Lohrke <carlo@gentoo.org> +konsole-3.5.3-r1.ebuild:
+  A few KDE 3.5 branch fixes.
 
   01 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> konsole-3.5.3.ebuild:
   Remove obsolete patches.
diff --git a/kde-base/konsole/files/digest-konsole-3.5.3-r1 b/kde-base/konsole/files/digest-konsole-3.5.3-r1
new file mode 100644
index 000000000000..cfd18542a977
--- /dev/null
+++ b/kde-base/konsole/files/digest-konsole-3.5.3-r1
@@ -0,0 +1,6 @@
+MD5 71b9ee636bc39514d3d445b7034b7aa7 kdebase-3.5-patchset-02.tar.bz2 7118
+RMD160 ea3c7215e68754e8acac03e9fafea8aa9c6d1202 kdebase-3.5-patchset-02.tar.bz2 7118
+SHA256 459e2ce09a7151fd5f52bf77570dccd2447f00a604dab65adf7dfb5da431ac1b kdebase-3.5-patchset-02.tar.bz2 7118
+MD5 9cb6b8291c4f3f986e16f72129e8fcd0 kdebase-3.5.3.tar.bz2 23634194
+RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 kdebase-3.5.3.tar.bz2 23634194
+SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 kdebase-3.5.3.tar.bz2 23634194
diff --git a/kde-base/konsole/konsole-3.5.3-r1.ebuild b/kde-base/konsole/konsole-3.5.3-r1.ebuild
new file mode 100644
index 000000000000..e1ad3e6d78a6
--- /dev/null
+++ b/kde-base/konsole/konsole-3.5.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-3.5.3-r1.ebuild,v 1.1 2006/06/14 18:31:02 carlo Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-02.tar.bz2"
+
+DESCRIPTION="X terminal for use with KDE."
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	|| ( (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrender
+			x11-libs/libXtst
+		) virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	|| ( x11-apps/bdftopcf virtual/x11 )"
+
-- 
2.26.2