workaround for bug #86065

(Portage version: 2.0.51.19)

6 files changed, 55 insertions, 3 deletions

diff --git a/x11-themes/baghira/ChangeLog b/x11-themes/baghira/ChangeLog
index 0325fd860db7..7e98bc958cd3 100644
--- a/x11-themes/baghira/ChangeLog
+++ b/x11-themes/baghira/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/baghira
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/ChangeLog,v 1.30 2005/03/20 17:30:59 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/ChangeLog,v 1.31 2005/03/21 08:25:29 voxus Exp $
+
+  21 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> baghira-0.6e.ebuid,
+  +baghira-0.6d.ebuild, +files/baghira-0.6d-compile-fix.patch:
+  Restored 0.6d ebuild and removed ppc keyword from 0.6e due to bug #86065.
 
 *baghira-0.6e (20 Mar 2005)
 
diff --git a/x11-themes/baghira/Manifest b/x11-themes/baghira/Manifest
index f1e2c17100e1..4f59ae36a733 100644
--- a/x11-themes/baghira/Manifest
+++ b/x11-themes/baghira/Manifest
@@ -1,4 +1,5 @@
 MD5 e2f9f854708b4e2367d6221e8af7106e baghira-0.5h.ebuild 589
+MD5 e75b201d3ff057721164e1a02064eb2a baghira-0.6d.ebuild 615
 MD5 7722992d5e288343b92c091c4856c893 baghira-0.5h-r1.ebuild 692
 MD5 b16551fa5caa26683aace463a05f3d89 ChangeLog 5796
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
@@ -6,6 +7,8 @@ MD5 c2747571caacfe8bd21a5f0e2b94ee73 baghira-0.6e.ebuild 523
 MD5 acd9d8e7589cbadd9b47c30938650ec0 baghira-0.5a.ebuild 588
 MD5 8cb20294cb456e1d964dea305c62d001 files/digest-baghira-0.5a 65
 MD5 691364364acad0a765bf32167748acb0 files/digest-baghira-0.5h 65
+MD5 bf966f59cfc7ad89db6df643a548f263 files/digest-baghira-0.6d 65
 MD5 0676bc4d0ab8344a3fdbcd7168f26b25 files/digest-baghira-0.6e 65
+MD5 bad2c2f4c3defc985dedabff0284ec8a files/baghira-0.6d-compile-fix.patch 866
 MD5 691364364acad0a765bf32167748acb0 files/digest-baghira-0.5h-r1 65
 MD5 eb9cfc658932affe09a33b70035d99fa files/baghira-ximian_fix.patch 1041
diff --git a/x11-themes/baghira/baghira-0.6d.ebuild b/x11-themes/baghira/baghira-0.6d.ebuild
new file mode 100644
index 000000000000..3f731aab864e
--- /dev/null
+++ b/x11-themes/baghira/baghira-0.6d.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/baghira-0.6d.ebuild,v 1.4 2005/03/21 08:25:29 voxus Exp $
+
+inherit kde
+
+DESCRIPTION="Baghira - an OS-X like style for KDE"
+HOMEPAGE="http://baghira.sourceforge.net/"
+SRC_URI="mirror://sourceforge/baghira/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha"
+IUSE=""
+
+DEPEND="|| ( kde-base/kwin >=kde-base/kdebase-3.3 )"
+
+need-kde 3.3
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch ${FILESDIR}/${P}-compile-fix.patch || die
+}
diff --git a/x11-themes/baghira/baghira-0.6e.ebuild b/x11-themes/baghira/baghira-0.6e.ebuild
index 6eb5e03a91fb..054ed4ee2f6c 100644
--- a/x11-themes/baghira/baghira-0.6e.ebuild
+++ b/x11-themes/baghira/baghira-0.6e.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/baghira-0.6e.ebuild,v 1.1 2005/03/20 17:30:59 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/baghira-0.6e.ebuild,v 1.2 2005/03/21 08:25:29 voxus Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/baghira/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha"
+KEYWORDS="~x86 ~sparc ~amd64 ~alpha"
 IUSE=""
 
 DEPEND="|| ( kde-base/kwin >=kde-base/kdebase-3.3 )"
diff --git a/x11-themes/baghira/files/baghira-0.6d-compile-fix.patch b/x11-themes/baghira/files/baghira-0.6d-compile-fix.patch
new file mode 100644
index 000000000000..a83d878a4901
--- /dev/null
+++ b/x11-themes/baghira/files/baghira-0.6d-compile-fix.patch
@@ -0,0 +1,20 @@
+--- deco/baghiraclient.cc.old	2005-03-08 09:00:46.000000000 -0600
++++ deco/baghiraclient.cc	2005-03-08 19:32:44.976448088 -0600
+@@ -25,6 +25,8 @@
+ #include <qpainter.h>
+ #include <qtooltip.h>
+ #include <qsettings.h>
++#include <qimage.h>
++#include <qobject.h>
+ //#include <qsizegrip.h>
+ // #include <qtimer.h>
+ #include <stdio.h>
+@@ -213,7 +215,7 @@
+     WId root, daddy = 0;
+     WId *kids = 0L;
+     uint numKids = 0;
+-    XQueryTree(qt_xdisplay(), parent->windowId(), &root, &daddy, &kids, &numKids);
++    XQueryTree(qt_xdisplay(), parent->widget()->winId(), &root, &daddy, &kids, &numKids);
+     XReparentWindow( qt_xdisplay(), winId(), daddy, 0, 0 );
+     move(client->width()-2*BaghiraFactory::borderSize()-16,client->height()-client->titleheight_-16);
+     /*if (BaghiraFactory::effect(client->currentStyle, client->isActive()) == Baghira::Brushed) */shape();
diff --git a/x11-themes/baghira/files/digest-baghira-0.6d b/x11-themes/baghira/files/digest-baghira-0.6d
new file mode 100644
index 000000000000..087fb6789f51
--- /dev/null
+++ b/x11-themes/baghira/files/digest-baghira-0.6d
@@ -0,0 +1 @@
+MD5 129fd70bfb04c97704167204d13f2f3a baghira-0.6d.tar.bz2 790530