fixed bug #86065

(Portage version: 2.0.51.19)

6 files changed, 89 insertions, 5 deletions

diff --git a/x11-themes/baghira/ChangeLog b/x11-themes/baghira/ChangeLog
index 7e98bc958cd3..948bccc2f4b9 100644
--- a/x11-themes/baghira/ChangeLog
+++ b/x11-themes/baghira/ChangeLog
@@ -1,6 +1,13 @@
 # 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.31 2005/03/21 08:25:29 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/ChangeLog,v 1.32 2005/03/22 10:34:51 voxus Exp $
+
+*baghira-0.6e-r1 (22 Mar 2005)
+
+  22 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> baghira-0.6e.ebuild,
+  +baghira-0.6e-r1.ebuild, +files/baghira-0.6e-drop_resize_handle.patch:
+  Closing bug #86065. Based on original patch by Enrico Horn
+  <EnricoHorn@web.de>. Also ppc keyword is restored.
 
   21 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> baghira-0.6e.ebuid,
   +baghira-0.6d.ebuild, +files/baghira-0.6d-compile-fix.patch:
diff --git a/x11-themes/baghira/Manifest b/x11-themes/baghira/Manifest
index 0dce476d0be3..7b81aa9fbac5 100644
--- a/x11-themes/baghira/Manifest
+++ b/x11-themes/baghira/Manifest
@@ -1,14 +1,17 @@
 MD5 e2f9f854708b4e2367d6221e8af7106e baghira-0.5h.ebuild 589
 MD5 8ee5f4d4f2326716772b99d6b89b1509 baghira-0.6d.ebuild 608
+MD5 2653dce3fb81770ab9f41248534e2670 baghira-0.6e-r1.ebuild 748
 MD5 7722992d5e288343b92c091c4856c893 baghira-0.5h-r1.ebuild 692
-MD5 268b572c2f53848f5231fc6ac8915ff4 ChangeLog 6010
+MD5 a3ad2981e6cc50026c88cc0ba21486dd ChangeLog 6305
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 5875aefe781b11a587f525542a3b91ef baghira-0.6e.ebuild 518
+MD5 015fab9d307d0c2809e3c891e6fdd300 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 c96920407fffcc205cfd48375eafde0e files/baghira-0.6e-drop_resize_handle.patch 1175
 MD5 bad2c2f4c3defc985dedabff0284ec8a files/baghira-0.6d-compile-fix.patch 866
 MD5 691364364acad0a765bf32167748acb0 files/digest-baghira-0.5h-r1 65
+MD5 0676bc4d0ab8344a3fdbcd7168f26b25 files/digest-baghira-0.6e-r1 65
 MD5 eb9cfc658932affe09a33b70035d99fa files/baghira-ximian_fix.patch 1041
diff --git a/x11-themes/baghira/baghira-0.6e-r1.ebuild b/x11-themes/baghira/baghira-0.6e-r1.ebuild
new file mode 100644
index 000000000000..ba8014b0045d
--- /dev/null
+++ b/x11-themes/baghira/baghira-0.6e-r1.ebuild
@@ -0,0 +1,28 @@
+# 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-r1.ebuild,v 1.1 2005/03/22 10:34:51 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
+	if [	`kde-config --version | 		\
+			grep KDE | awk '{print $2}' | 	\
+			awk -F. '{ print $1$2 }'` 		\
+		-lt 34 ]; then
+		cd ${S}/deco && epatch ${FILESDIR}/${P}-drop_resize_handle.patch
+	fi
+}
diff --git a/x11-themes/baghira/baghira-0.6e.ebuild b/x11-themes/baghira/baghira-0.6e.ebuild
index 054ed4ee2f6c..8c911e2622a2 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.2 2005/03/21 08:25:29 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/baghira-0.6e.ebuild,v 1.3 2005/03/22 10:34:51 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 ~alpha"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha"
 IUSE=""
 
 DEPEND="|| ( kde-base/kwin >=kde-base/kdebase-3.3 )"
diff --git a/x11-themes/baghira/files/baghira-0.6e-drop_resize_handle.patch b/x11-themes/baghira/files/baghira-0.6e-drop_resize_handle.patch
new file mode 100644
index 000000000000..e989ad7c97ca
--- /dev/null
+++ b/x11-themes/baghira/files/baghira-0.6e-drop_resize_handle.patch
@@ -0,0 +1,45 @@
+--- baghiraclient.h.orig	2005-03-22 13:11:10.174799822 +0300
++++ baghiraclient.h	2005-03-22 13:11:24.254841399 +0300
+@@ -105,26 +105,6 @@
+ 
+ class BaghiraClient;
+ 
+-#if KDE_IS_VERSION(3,3,91)
+-class ResizeHandle : public QWidget
+-{
+-friend class BaghiraClient;
+-    Q_OBJECT
+-public:
+-    ResizeHandle(BaghiraClient *parent);
+-protected:
+-    virtual void mousePressEvent ( QMouseEvent * );
+-    virtual void mouseReleaseEvent ( QMouseEvent * );
+-    virtual void paintEvent ( QPaintEvent * );
+-    void updateLook(bool rp = FALSE);
+-private:
+-    bool eventFilter(QObject *obj, QEvent *e);
+-    void shape();
+-    BaghiraClient *client;
+-    QPixmap pix;
+-};
+-#endif
+-
+ class DeMaximizer : public QWidget
+ {
+ friend class BaghiraClient;
+@@ -384,7 +364,6 @@
+ class BaghiraClient : public KDecoration
+ {
+ friend class BaghiraButton;
+-friend class ResizeHandle;
+     Q_OBJECT
+ public:
+     BaghiraClient(KDecorationBridge *b, KDecorationFactory *f);
+@@ -457,7 +436,6 @@
+ //    QWidget *inactiveOverlay;
+     QHBoxLayout *windowlayout;
+     int ICONX, ICONY;
+-    ResizeHandle *grip;
+ //    QSizeGrip *grip;
+ //    KDecorationBridge *myBridge_;
+ //    QImage* ActiveDecoImage_;
diff --git a/x11-themes/baghira/files/digest-baghira-0.6e-r1 b/x11-themes/baghira/files/digest-baghira-0.6e-r1
new file mode 100644
index 000000000000..b78604a174ad
--- /dev/null
+++ b/x11-themes/baghira/files/digest-baghira-0.6e-r1
@@ -0,0 +1 @@
+MD5 987b598c00ba09dad8ff62ea405f9873 baghira-0.6e.tar.bz2 807928