summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-26 01:51:35 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-26 01:51:35 +0000
commit40bc1233d7927ac8d8026e206bc3e53968b360e5 (patch)
tree2b31202b7f5f412c321ccba49f7f8101d02b94d7 /dev-util
parentBump to 0.6.1, fixes #267430 (diff)
downloadhistorical-40bc1233d7927ac8d8026e206bc3e53968b360e5.tar.gz
historical-40bc1233d7927ac8d8026e206bc3e53968b360e5.tar.bz2
historical-40bc1233d7927ac8d8026e206bc3e53968b360e5.zip
Block dev-util/kdevelop:0 due to file collision with
/usr/share/apps/kdevappwizard/kdevappwizard.rc. Package-Manager: portage-2.2_rc31_p13391/cvs/Linux i686
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/kdevplatform/ChangeLog6
-rw-r--r--dev-util/kdevplatform/Manifest14
-rw-r--r--dev-util/kdevplatform/kdevplatform-0.9.91.ebuild3
3 files changed, 19 insertions, 4 deletions
diff --git a/dev-util/kdevplatform/ChangeLog b/dev-util/kdevplatform/ChangeLog
index a2cf85476413..de14f48cc751 100644
--- a/dev-util/kdevplatform/ChangeLog
+++ b/dev-util/kdevplatform/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/kdevplatform
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.4 2009/03/26 20:20:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.5 2009/04/26 01:51:35 zmedico Exp $
+
+ 26 Apr 2009; Zac Medico <zmedico@gentoo.org> kdevplatform-0.9.91.ebuild:
+ Block dev-util/kdevelop:0 due to file collision with
+ /usr/share/apps/kdevappwizard/kdevappwizard.rc.
26 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
kdevplatform-0.9.91.ebuild:
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index b541ce1a4b44..1e0380fcb590 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST kdevplatform-0.9.91.tar.bz2 811975 RMD160 9e1ad97985275cf681c7dc159351b3bf14b518cb SHA1 b06f7ef3e07f932f75049925c96d9e137d7a822a SHA256 08e38af488bb562a28d7d82346dbfc64552f392d9e5f6729218a1c16736e36d9
-EBUILD kdevplatform-0.9.91.ebuild 1215 RMD160 1b0de5000d147e37a7f42571661de15edc76d4a6 SHA1 d9679a9988d7bb967d96c6533867d27ea5fd8aa7 SHA256 b7c1b385349f2d12a777065d8a4b49bdae8dd586f5343bcaf0d4f58f000a8436
-MISC ChangeLog 744 RMD160 625c8054d6f7d6f9531df5baece63225ebf9af7c SHA1 5e196ce4e0e43d40302a9ef6604b710f13b46fe1 SHA256 78be8c9bd9caa1717380c7a3993ed16288626ee85b2c5e1340c0347fefbb675a
+EBUILD kdevplatform-0.9.91.ebuild 1235 RMD160 b47553d7ddb7b2cf297bbd6236390758e86fdb49 SHA1 4f6cfddd324ecabf804ae74a3c0f877d1155d0a2 SHA256 3cdfd534f601b2bcd1e048b913847c4d9e8cc0ffd95667203488f2d95eddc2a2
+MISC ChangeLog 923 RMD160 449aedb43fc0c4f9dc4b48e92b42304913a17a56 SHA1 d9d4605e3081898814f01a1d2cabc5432581fa17 SHA256 9aa77867940f58db64058d9630151eac824450908ad1ace744b778b2cb5c807c
MISC metadata.xml 331 RMD160 a867a3d44c687288864ebfd7ef0a1065455b29a1 SHA1 3ad8cae765ad8ebc88b7c5eca6474cb546a48119 SHA256 82410db37697d870ae14f1ec1f337a44fd7123ff6768b2b2080149f41d6ec3d1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknzvjcACgkQ/ejvha5XGaPLYwCfbFM2q9vGpu6BZeoGqMtLMeEO
+SoAAoI0PKeJ4wl7YzVR/4yhaIm/tbLh3
+=5fZz
+-----END PGP SIGNATURE-----
diff --git a/dev-util/kdevplatform/kdevplatform-0.9.91.ebuild b/dev-util/kdevplatform/kdevplatform-0.9.91.ebuild
index 5eb40087a502..2e0355991343 100644
--- a/dev-util/kdevplatform/kdevplatform-0.9.91.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-0.9.91.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-0.9.91.ebuild,v 1.4 2009/03/26 20:20:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-0.9.91.ebuild,v 1.5 2009/04/26 01:51:35 zmedico Exp $
EAPI="2"
@@ -24,6 +24,7 @@ RDEPEND="${DEPEND}
cvs? ( dev-util/cvs )
git? ( dev-util/git )
mercurial? ( dev-util/mercurial )
+ !dev-util/kdevelop:0
"
src_configure() {