Small patch from bug #33243

5 files changed, 74 insertions, 9 deletions

diff --git a/x11-misc/superkaramba/ChangeLog b/x11-misc/superkaramba/ChangeLog
index 2279e102ad44..0c038cc2404b 100644
--- a/x11-misc/superkaramba/ChangeLog
+++ b/x11-misc/superkaramba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/superkaramba
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/superkaramba/ChangeLog,v 1.11 2003/10/29 18:31:08 dholm Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/superkaramba/ChangeLog,v 1.12 2004/02/25 13:15:25 caleb Exp $
+
+*superkaramba-0.33-r1 (25 Feb 2004)
+
+  25 Feb 2004; Caleb Tennis <caleb@gentoo.org> superkaramba-0.33-r1.ebuild,
+  files/dock-fix.patch:
+  Add a small patch from bug #33243 (40839 as the patch)
 
   29 Oct 2003; David Holm <dholm@gentoo.org> superkaramba-0.33.ebuild:
   Added to ~ppc.
diff --git a/x11-misc/superkaramba/Manifest b/x11-misc/superkaramba/Manifest
index cce952a2b1b1..7b49615152dd 100644
--- a/x11-misc/superkaramba/Manifest
+++ b/x11-misc/superkaramba/Manifest
@@ -1,16 +1,19 @@
-MD5 4788d768ebb6c6a790f641d6312694c5 ChangeLog 1673
+MD5 594f3bec737cee6159daed30a26fd8a3 superkaramba-0.30.ebuild 840
 MD5 10f335821850fc4e299a253891f0db49 superkaramba-0.32.ebuild 840
 MD5 f85e4e43a43fee99d0535e934f1aee24 superkaramba-0.28.ebuild 840
-MD5 d55bd05b40145ec6baa955100d595b03 superkaramba-0.29.ebuild 840
-MD5 594f3bec737cee6159daed30a26fd8a3 superkaramba-0.30.ebuild 840
+MD5 1936ff6b482bc972111a65331d48e043 superkaramba-0.33-r1.ebuild 1057
 MD5 b1f6cd9bbbf6e12b6adc34e1dd144049 superkaramba-0.31.ebuild 840
-MD5 de2f1910f4d13c9297dec62b3a4aa58c superkaramba-0.32b.ebuild 988
 MD5 c1cc4f88df5739d52b8db99a4ba20daf superkaramba-0.33.ebuild 988
-MD5 7a5f26b69826d878304c95b60e393a5a files/digest-superkaramba-0.32 70
-MD5 e22128955d4c0c335105f1f4afc16c22 files/digest-superkaramba-0.33 70
+MD5 d55bd05b40145ec6baa955100d595b03 superkaramba-0.29.ebuild 840
+MD5 4788d768ebb6c6a790f641d6312694c5 ChangeLog 1673
+MD5 de2f1910f4d13c9297dec62b3a4aa58c superkaramba-0.32b.ebuild 988
 MD5 54967ddeac8a69609735d600e60cc656 files/digest-superkaramba-0.28 70
 MD5 38c837e315db0370c25a062c7cbbe639 files/digest-superkaramba-0.29 70
 MD5 629a3eaf7c612149c169c63125bfc29a files/digest-superkaramba-0.30 70
 MD5 9797b197be7572405432477528e54e08 files/digest-superkaramba-0.31 70
-MD5 dfffd46934fc1bbec91ae05eb8ec535b files/karamba-env 60
+MD5 7a5f26b69826d878304c95b60e393a5a files/digest-superkaramba-0.32 70
+MD5 e22128955d4c0c335105f1f4afc16c22 files/digest-superkaramba-0.33 70
 MD5 7190a38d7012766ab608b51f66b5fef6 files/digest-superkaramba-0.32b 71
+MD5 cdb19bc9b7b5471511929e67dd1ccff5 files/dock-fix.patch 630
+MD5 e22128955d4c0c335105f1f4afc16c22 files/digest-superkaramba-0.33-r1 70
+MD5 dfffd46934fc1bbec91ae05eb8ec535b files/karamba-env 60
diff --git a/x11-misc/superkaramba/files/digest-superkaramba-0.33-r1 b/x11-misc/superkaramba/files/digest-superkaramba-0.33-r1
new file mode 100644
index 000000000000..41c3c769c135
--- /dev/null
+++ b/x11-misc/superkaramba/files/digest-superkaramba-0.33-r1
@@ -0,0 +1 @@
+MD5 132d094a8e35383c757aaf5739fcb856 superkaramba-0.33.tar.gz 1343029
diff --git a/x11-misc/superkaramba/files/dock-fix.patch b/x11-misc/superkaramba/files/dock-fix.patch
new file mode 100644
index 000000000000..ffcb01747ccf
--- /dev/null
+++ b/x11-misc/superkaramba/files/dock-fix.patch
@@ -0,0 +1,15 @@
+--- src/karamba.cpp	2004-02-22 23:13:52.991588320 +0000
++++ src/karamba.cpp	2004-02-22 23:17:29.663649160 +0000
+@@ -2241,11 +2241,11 @@ karamba::karamba(QString fn, bool reload
+     PyEval_ReleaseLock();
+     //This thread's python refence is now gone.  A new reference must be created for each thread.
+ 
+ 
+     //Matthew Kay: set window type to "dock" (plays better with taskbar themes this way)
+-    KWin::setType(winId(), NET::Dock);
++    //KWin::setType(winId(), NET::Dock);
+ 
+     widgetMask = 0;
+     info = new NETWinInfo( qt_xdisplay(), winId(), qt_xrootwin(), NET::WMState );
+ 
+     // could be replaced with TaskManager
diff --git a/x11-misc/superkaramba/superkaramba-0.33-r1.ebuild b/x11-misc/superkaramba/superkaramba-0.33-r1.ebuild
new file mode 100644
index 000000000000..4acf53270d34
--- /dev/null
+++ b/x11-misc/superkaramba/superkaramba-0.33-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/superkaramba/superkaramba-0.33-r1.ebuild,v 1.1 2004/02/25 13:15:25 caleb Exp $
+
+IUSE="doc"
+
+inherit kde
+
+need-kde 3
+
+DESCRIPTION="A version of Karamba with extra extensions in-built"
+HOMEPAGE="http://netdragon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/netdragon/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+RESTRICT="nomirror"
+
+newdepend ">=kde-base/kdelibs-3.1
+	>=sys-apps/portage-2.0.49-r3"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/dock-fix.patch
+}
+
+src_install () {
+	einstall
+	dodir /usr/share/karamba/themes /usr/share/karamba/bin
+	keepdir /usr/share/karamba/themes /usr/share/karamba/bin
+	dodir /etc/env.d
+	cp ${FILESDIR}/karamba-env ${D}/etc/env.d/99karamba
+	if [ `use doc` ]; then
+		dodir /usr/share/doc/${P}/examples
+		mv ${D}/usr/share/doc/* ${D}/usr/share/doc/${P}
+		cp ${S}/examples/* ${D}/usr/share/doc/${P}/examples
+	else
+		rm -Rf ${D}/usr/share/doc
+	fi
+}