Cleanup of old KDE 3.5.0 and 3.5.1 ebuild.s

(Portage version: 2.1_pre7-r4)

10 files changed, 72 insertions, 38 deletions

diff --git a/kde-base/umbrello/ChangeLog b/kde-base/umbrello/ChangeLog
index 160288c5100a..189d83c5461e 100644
--- a/kde-base/umbrello/ChangeLog
+++ b/kde-base/umbrello/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/umbrello
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.32 2006/03/22 20:15:47 danarmak Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.33 2006/04/06 03:26:07 flameeyes Exp $
+
+*umbrello-3.5.1-r1 (05 Apr 2006)
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/umbrello-qt-3.3.5.patch, +files/umbrello-3.5.1-fork.patch,
+  +files/umbrello-3.5.1-fork-rectangle.patch, -umbrello-3.5.0.ebuild,
+  -umbrello-3.5.1.ebuild, +umbrello-3.5.1-r1.ebuild:
+  Removed old 3.5.0/3.5.1 packages. Add umbrello 3.5.1 with working fork
+  widget for who needs to use this.
 
 *umbrello-3.5.2 (22 Mar 2006)
 
diff --git a/kde-base/umbrello/Manifest b/kde-base/umbrello/Manifest
index 7d8f35eeceda..e114bfc030b6 100644
--- a/kde-base/umbrello/Manifest
+++ b/kde-base/umbrello/Manifest
@@ -16,9 +16,15 @@ SHA256 68c3f0a231df037d9f160ef681108bd3667c570c618c70c218c18be641c7e3de files/di
 MD5 37b63842d3bb2d884b13ebf46628a792 files/digest-umbrello-3.5.1 66
 RMD160 4a4f776257134dc5753f59936f47f0a5c89ead63 files/digest-umbrello-3.5.1 66
 SHA256 c55dc0a628300f22699d6bed9ebcd180dec8d93221eadc66b964184b1e09ca50 files/digest-umbrello-3.5.1 66
+MD5 3c2988dddde0b22990ae183163bd5e0b files/digest-umbrello-3.5.1-r1 244
+RMD160 faf5c8df6c8e8f93371d48641caca1ea762d60dc files/digest-umbrello-3.5.1-r1 244
+SHA256 a462032c397ef5f6f9bb0856d2c9467dac35821ee6a4a3db603ea3ec7225c12e files/digest-umbrello-3.5.1-r1 244
 MD5 735367f045761a378c59b0aedd04892c files/digest-umbrello-3.5.2 244
 RMD160 6b0561e97b2c584c31c601eabe995ca3348f8a85 files/digest-umbrello-3.5.2 244
 SHA256 85ed46a0b0c32506130eea2adbd51b3c866bbe3002ac4dcf21bbdb652ef26707 files/digest-umbrello-3.5.2 244
+MD5 a08614a7bb417292aecfb2a71b5f43e1 files/umbrello-3.5.1-fork-rectangle.patch 573
+RMD160 96b215a323662af8c2a606f21a88c65da0558d97 files/umbrello-3.5.1-fork-rectangle.patch 573
+SHA256 f7d24cd0de5f48218ca2dfcdad32ec096bb6ef53553050798df45987e2d929c5 files/umbrello-3.5.1-fork-rectangle.patch 573
 MD5 0f4007b5db8e59debdab22a1e984546f files/umbrello-qt-3.3.5.patch 788
 RMD160 b1e8de76694a94dda057432980e96e9dea28f0bc files/umbrello-qt-3.3.5.patch 788
 SHA256 98fb7801c742f4ba8f2c54eb1d83394dd07e6f40117ec0aae731eaa312b31ddf files/umbrello-qt-3.3.5.patch 788
@@ -37,6 +43,9 @@ SHA256 423af9b75af477e2bd41a6ee3efcb492019476362ccd541c345278a6bd0e1e9a umbrello
 MD5 f41eed13455396cb4dba83def6d5a28e umbrello-3.5.0.ebuild 381
 RMD160 fc8254d0d5569cc1257e2b74b90601a637e09ebc umbrello-3.5.0.ebuild 381
 SHA256 883394b8fb83ed4d912532761ad29c68c9572351efe49e0722504d4e59e68098 umbrello-3.5.0.ebuild 381
+MD5 67b16f8106c972a92befe73f7ae77547 umbrello-3.5.1-r1.ebuild 463
+RMD160 990e139e325397f4c71ea881c62bc63c53fd2776 umbrello-3.5.1-r1.ebuild 463
+SHA256 0a4e0f28c4166a003cf57ed642bfb1ef89f8d520d836ef71bb541ab69f47aa56 umbrello-3.5.1-r1.ebuild 463
 MD5 d91c1c01385ef6c73d378f29b9ef288d umbrello-3.5.1.ebuild 383
 RMD160 bf5c01f0f2040c9621198b10505eb9bf178fa2ea umbrello-3.5.1.ebuild 383
 SHA256 dee253f07aa5b0091dc39290b239db501152d8434379a39024d03ddb263f73bd umbrello-3.5.1.ebuild 383
diff --git a/kde-base/umbrello/files/digest-umbrello-3.5.0 b/kde-base/umbrello/files/digest-umbrello-3.5.0
deleted file mode 100644
index a452be27a394..000000000000
--- a/kde-base/umbrello/files/digest-umbrello-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc91ffcfa8114cf4f9d40bc9ffe47d97 kdesdk-3.5.0.tar.bz2 4832117
diff --git a/kde-base/umbrello/files/digest-umbrello-3.5.1 b/kde-base/umbrello/files/digest-umbrello-3.5.1
deleted file mode 100644
index 7079e5ca456d..000000000000
--- a/kde-base/umbrello/files/digest-umbrello-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93199b8bf5793681fdb2e5cbcfcfbd93 kdesdk-3.5.1.tar.bz2 4972114
diff --git a/kde-base/umbrello/files/digest-umbrello-3.5.1-r1 b/kde-base/umbrello/files/digest-umbrello-3.5.1-r1
new file mode 100644
index 000000000000..27a393c46155
--- /dev/null
+++ b/kde-base/umbrello/files/digest-umbrello-3.5.1-r1
@@ -0,0 +1,3 @@
+MD5 93199b8bf5793681fdb2e5cbcfcfbd93 kdesdk-3.5.1.tar.bz2 4972114
+RMD160 1f37f4bdc73ac2e5c8c75009ee24377ac981a2c0 kdesdk-3.5.1.tar.bz2 4972114
+SHA256 198e09e1dbf6a7e34e74192eaed2b48f74a67be82781464a0b0c7a51f967d47c kdesdk-3.5.1.tar.bz2 4972114
diff --git a/kde-base/umbrello/files/umbrello-3.5.1-fork-rectangle.patch b/kde-base/umbrello/files/umbrello-3.5.1-fork-rectangle.patch
new file mode 100644
index 000000000000..5ce4c8e1672a
--- /dev/null
+++ b/kde-base/umbrello/files/umbrello-3.5.1-fork-rectangle.patch
@@ -0,0 +1,13 @@
+Index: umbrello/umbrello/umlwidget.cpp
+===================================================================
+--- umbrello/umbrello/umlwidget.cpp	(revision 516637)
++++ umbrello/umbrello/umlwidget.cpp	(revision 516638)
+@@ -1063,7 +1063,7 @@
+     const QSize minSize = calculateSize();
+     const int w = minSize.width();
+     const int h = minSize.height();
+-    if (getWidth() >= w && getHeight() >= h)
++    if (m_Type != Uml::wt_ForkJoin && getWidth() >= w && getHeight() >= h)
+         return;
+     setSize(w, h);
+     adjustAssocs( getX(), getY() );  // adjust assoc lines
diff --git a/kde-base/umbrello/files/umbrello-3.5.1-fork.patch b/kde-base/umbrello/files/umbrello-3.5.1-fork.patch
new file mode 100644
index 000000000000..87888e5ee392
--- /dev/null
+++ b/kde-base/umbrello/files/umbrello-3.5.1-fork.patch
@@ -0,0 +1,30 @@
+Index: kdesdk-3.5.1/umbrello/umbrello/assocrules.cpp
+===================================================================
+--- kdesdk-3.5.1.orig/umbrello/umbrello/assocrules.cpp
++++ kdesdk-3.5.1/umbrello/umbrello/assocrules.cpp
+@@ -21,6 +21,7 @@
+ #include "associationwidget.h"
+ #include "statewidget.h"
+ #include "activitywidget.h"
++#include "forkjoinwidget.h"
+ 
+ using namespace Uml;
+ 
+@@ -197,13 +198,15 @@ bool AssocRules::allowAssociation( Assoc
+                 static_cast<ActivityWidget*>(widgetA)->getActivityType() !=
+                 ActivityWidget::Branch &&
+                 static_cast<ActivityWidget*>(widgetA)->getActivityType() !=
+-                ActivityWidget::Fork_DEPRECATED ) {
++                ActivityWidget::Fork_DEPRECATED &&
++		dynamic_cast<ForkJoinWidget*>(widgetA) == NULL ) {
+             return false;
+         }
+         // only Forks and Branches can have more than one "outgoing" transition
+         if( static_cast<ActivityWidget*>(widgetA)->getActivityType() !=
+                 ActivityWidget::Fork_DEPRECATED &&
+-                static_cast<ActivityWidget*>(widgetA)->getActivityType() !=
++		dynamic_cast<ForkJoinWidget*>(widgetA) == NULL &&
++               static_cast<ActivityWidget*>(widgetA)->getActivityType() !=
+                 ActivityWidget::Branch ) {
+             AssociationWidgetList list = widgetA->getAssocList();
+             for (AssociationWidget* assoc = list.first(); assoc; assoc = list.next()) {
diff --git a/kde-base/umbrello/files/umbrello-qt-3.3.5.patch b/kde-base/umbrello/files/umbrello-qt-3.3.5.patch
deleted file mode 100644
index 28bad3616bbe..000000000000
--- a/kde-base/umbrello/files/umbrello-qt-3.3.5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: kdesdk-3.4.91/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
-===================================================================
---- kdesdk-3.4.91/umbrello/umbrello/dialogs/codevieweroptionsbase.ui.orig
-+++ kdesdk-3.4.91/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
-@@ -363,14 +363,4 @@
-     </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kfontchooser.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
--</includehints>
- </UI>
diff --git a/kde-base/umbrello/umbrello-3.5.0.ebuild b/kde-base/umbrello/umbrello-3.5.0.ebuild
deleted file mode 100644
index abd2dba5acf8..000000000000
--- a/kde-base/umbrello/umbrello-3.5.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.5.0.ebuild,v 1.2 2005/12/12 19:23:12 josejx Exp $
-
-KMNAME=kdesdk
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-DESCRIPTION="KDE: Umbrello UML Modeller"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
diff --git a/kde-base/umbrello/umbrello-3.5.1.ebuild b/kde-base/umbrello/umbrello-3.5.1-r1.ebuild
index e28fbd4a3509..e1edf3badf1d 100644
--- a/kde-base/umbrello/umbrello-3.5.1.ebuild
+++ b/kde-base/umbrello/umbrello-3.5.1-r1.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.5.1.ebuild,v 1.1 2006/01/22 22:53:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.5.1-r1.ebuild,v 1.1 2006/04/06 03:26:07 flameeyes Exp $
 
 KMNAME=kdesdk
-MAXKDEVER=$PV
+MAXKDEVER=3.5.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Umbrello UML Modeller"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
+
+PATCHES="${FILESDIR}/${P}-fork.patch
+	${FILESDIR}/${P}-fork-rectangle.patch"