kolourpaint is part of kdegraphics-3.3, so block it

6 files changed, 18 insertions, 25 deletions

diff --git a/media-gfx/kolourpaint/ChangeLog b/media-gfx/kolourpaint/ChangeLog
index a5c8b6ec52e3..d404e093858f 100644
--- a/media-gfx/kolourpaint/ChangeLog
+++ b/media-gfx/kolourpaint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/kolourpaint
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kolourpaint/ChangeLog,v 1.5 2004/06/24 22:44:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kolourpaint/ChangeLog,v 1.6 2004/08/23 13:32:09 carlo Exp $
+
+  23 Aug 2004; Carsten Lohrke <carlo@gentoo.org> kolourpaint-1.0.1.ebuild,
+  kolourpaint-1.0.2.ebuild, -kolourpaint-1.0.ebuild:
+  kolourpaint is part of kdegraphics-3.3, so block it
 
 *kolourpaint-1.0.2 (16 May 2004)
 
diff --git a/media-gfx/kolourpaint/Manifest b/media-gfx/kolourpaint/Manifest
index 789823e01c5d..5f9a04283d04 100644
--- a/media-gfx/kolourpaint/Manifest
+++ b/media-gfx/kolourpaint/Manifest
@@ -1,8 +1,6 @@
-MD5 8bf6c9e6f25a8adf7ac9a30c9f647d23 kolourpaint-1.0.2.ebuild 462
-MD5 762894de2efd4e963963992501a7f269 kolourpaint-1.0.ebuild 452
-MD5 4b0d9df83f48483d22ef4bb272928a4e kolourpaint-1.0.1.ebuild 459
-MD5 eac321dce141ba858f886111b43a5e45 ChangeLog 797
+MD5 593da8415575df63c1f729782944eb81 kolourpaint-1.0.2.ebuild 533
+MD5 5adfd2906ccf46098e85f5b348e79892 kolourpaint-1.0.1.ebuild 532
+MD5 89fb5df883cf53d23627530019589c23 ChangeLog 977
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 2fdfa148eafe6036640bf451af4c9121 files/digest-kolourpaint-1.0.1 70
 MD5 b1519f053ed012c763448a4e75a86e78 files/digest-kolourpaint-1.0.2 70
-MD5 b2b6b85c61f0d0fae1de53bb0a906f44 files/digest-kolourpaint-1.0 68
diff --git a/media-gfx/kolourpaint/files/digest-kolourpaint-1.0 b/media-gfx/kolourpaint/files/digest-kolourpaint-1.0
deleted file mode 100644
index c5fbf03cea99..000000000000
--- a/media-gfx/kolourpaint/files/digest-kolourpaint-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a8bb074c8ba2a8f9bf4283101653e5b5 kolourpaint-1.0.tar.bz2 578594
diff --git a/media-gfx/kolourpaint/kolourpaint-1.0.1.ebuild b/media-gfx/kolourpaint/kolourpaint-1.0.1.ebuild
index 90c670dea9c9..a69f3aabce42 100644
--- a/media-gfx/kolourpaint/kolourpaint-1.0.1.ebuild
+++ b/media-gfx/kolourpaint/kolourpaint-1.0.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kolourpaint/kolourpaint-1.0.1.ebuild,v 1.4 2004/06/24 22:44:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kolourpaint/kolourpaint-1.0.1.ebuild,v 1.5 2004/08/23 13:32:09 carlo Exp $
 
 inherit kde
-need-kde 3
+
 
 DESCRIPTION="A simple paint program for KDE"
 HOMEPAGE="http://kolourpaint.sourceforge.net"
@@ -12,3 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 KEYWORDS="x86 amd64 ~ppc"
+
+DEPEND="!>=kde-base/kdegraphics-3.3"
+RDEPEND="!>=kde-base/kdegraphics-3.3"
+need-kde 3
\ No newline at end of file
diff --git a/media-gfx/kolourpaint/kolourpaint-1.0.2.ebuild b/media-gfx/kolourpaint/kolourpaint-1.0.2.ebuild
index 7c1ea1e5c87a..d0b3ba9ce540 100644
--- a/media-gfx/kolourpaint/kolourpaint-1.0.2.ebuild
+++ b/media-gfx/kolourpaint/kolourpaint-1.0.2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kolourpaint/kolourpaint-1.0.2.ebuild,v 1.2 2004/06/24 22:44:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kolourpaint/kolourpaint-1.0.2.ebuild,v 1.3 2004/08/23 13:32:09 carlo Exp $
 
 inherit kde
-need-kde 3
 
 DESCRIPTION="A simple paint program for KDE"
 HOMEPAGE="http://kolourpaint.sourceforge.net"
@@ -13,3 +12,6 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~x86 ~amd64 ~ppc"
 
+DEPEND="!>=kde-base/kdegraphics-3.3"
+RDEPEND="!>=kde-base/kdegraphics-3.3"
+need-kde 3
\ No newline at end of file
diff --git a/media-gfx/kolourpaint/kolourpaint-1.0.ebuild b/media-gfx/kolourpaint/kolourpaint-1.0.ebuild
deleted file mode 100644
index 566ed4a10d52..000000000000
--- a/media-gfx/kolourpaint/kolourpaint-1.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kolourpaint/kolourpaint-1.0.ebuild,v 1.3 2004/06/24 22:44:51 agriffis Exp $
-
-inherit kde
-need-kde 3
-
-DESCRIPTION="A simple paint program for KDE"
-HOMEPAGE="http://kolourpaint.sourceforge.net"
-SRC_URI="mirror://sourceforge/kolourpaint/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86 amd64"