summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregorio Guidi <greg_g@gentoo.org>2005-06-03 14:51:55 +0000
committerGregorio Guidi <greg_g@gentoo.org>2005-06-03 14:51:55 +0000
commit39832ebc4a16a54b0829ec535e273f01c17bddfa (patch)
tree0971c407118ce92409d135f9c434ed4269c63605
parentRe-add ~ppc at dholm's request, now that we have a working mono-1.1.x (diff)
downloadhistorical-39832ebc4a16a54b0829ec535e273f01c17bddfa.tar.gz
historical-39832ebc4a16a54b0829ec535e273f01c17bddfa.tar.bz2
historical-39832ebc4a16a54b0829ec535e273f01c17bddfa.zip
Add blockers on koffice.
Package-Manager: portage-2.0.51.19
-rw-r--r--dev-db/kexi/ChangeLog6
-rw-r--r--dev-db/kexi/Manifest6
-rw-r--r--dev-db/kexi/kexi-0.1_beta3.ebuild7
-rw-r--r--dev-db/kexi/kexi-0.1_beta4.ebuild5
4 files changed, 17 insertions, 7 deletions
diff --git a/dev-db/kexi/ChangeLog b/dev-db/kexi/ChangeLog
index 8e938801fe0e..c0d925b7e9fe 100644
--- a/dev-db/kexi/ChangeLog
+++ b/dev-db/kexi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/kexi
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/kexi/ChangeLog,v 1.6 2005/01/01 17:34:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kexi/ChangeLog,v 1.7 2005/06/03 14:51:55 greg_g Exp $
+
+ 03 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> kexi-0.1_beta3.ebuild,
+ kexi-0.1_beta4.ebuild:
+ Add blockers on koffice.
11 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> kexi-0.1_beta4.ebuild:
Added amd64 keyword, closing #62064.
diff --git a/dev-db/kexi/Manifest b/dev-db/kexi/Manifest
index bf9f3f02985c..1226686887e4 100644
--- a/dev-db/kexi/Manifest
+++ b/dev-db/kexi/Manifest
@@ -1,6 +1,6 @@
MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 652b3edb12ac764755854b2fd0d2e294 ChangeLog 667
-MD5 d2ff7c81b9b423828d41285e69107bf5 kexi-0.1_beta4.ebuild 511
-MD5 d4c661843393a12dcab9d1e0f760abcf kexi-0.1_beta3.ebuild 522
+MD5 f100fc561b484d391f7f61290ce86f88 ChangeLog 789
+MD5 e6e966d8a9da4b80d46b68599cf6c8fe kexi-0.1_beta4.ebuild 564
+MD5 0fdc39ea522e91fc275bdefc1d7a45dc kexi-0.1_beta3.ebuild 575
MD5 19c8a2053aeaa33422a5f3d977eaa527 files/digest-kexi-0.1_beta3 67
MD5 92699eddba9e63edded1689f4a73a94e files/digest-kexi-0.1_beta4 67
diff --git a/dev-db/kexi/kexi-0.1_beta3.ebuild b/dev-db/kexi/kexi-0.1_beta3.ebuild
index 77d741fc7d9b..f93076b9f142 100644
--- a/dev-db/kexi/kexi-0.1_beta3.ebuild
+++ b/dev-db/kexi/kexi-0.1_beta3.ebuild
@@ -1,8 +1,7 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/kexi/kexi-0.1_beta3.ebuild,v 1.4 2005/01/01 17:34:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kexi/kexi-0.1_beta3.ebuild,v 1.5 2005/06/03 14:51:55 greg_g Exp $
inherit kde
-need-kde 3.2
MY_P=${P/_beta/beta}
S=${WORKDIR}/${MY_P}
@@ -16,3 +15,7 @@ IUSE=""
SLOT="0"
KEYWORDS="~x86 ~ppc"
+DEPEND="!>=app-office/koffice-1.4_rc
+ !app-office/kexi"
+
+need-kde 3.2
diff --git a/dev-db/kexi/kexi-0.1_beta4.ebuild b/dev-db/kexi/kexi-0.1_beta4.ebuild
index 089fcee7c15d..e2981dfee45f 100644
--- a/dev-db/kexi/kexi-0.1_beta4.ebuild
+++ b/dev-db/kexi/kexi-0.1_beta4.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/dev-db/kexi/kexi-0.1_beta4.ebuild,v 1.3 2005/01/01 17:34:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kexi/kexi-0.1_beta4.ebuild,v 1.4 2005/06/03 14:51:55 greg_g Exp $
inherit kde
@@ -16,4 +16,7 @@ LICENSE="GPL-2"
KEYWORDS="~x86 ~ppc ~amd64"
IUSE=""
+DEPEND="!>=app-office/koffice-1.4_rc
+ !app-office/kexi"
+
need-kde 3.2