summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2011-04-11 02:46:30 +0400
committerAlexey Shvetsov <alexxy@gentoo.org>2011-04-11 02:46:30 +0400
commitddcd11a8121c2d43d3a84b749e2bb94f3c16e736 (patch)
treefa98808e4eb6bfcf7da5c86b3078028aab17494e
parent948e3cde35b732693106bbcb065ccc81b98a312d (diff)
downloadkde-ddcd11a8121c2d43d3a84b749e2bb94f3c16e736.tar.gz
kde-ddcd11a8121c2d43d3a84b749e2bb94f3c16e736.tar.bz2
kde-ddcd11a8121c2d43d3a84b749e2bb94f3c16e736.zip
[kde-base] Fix deps for libkdeedu since its merged now with kvtml-data
-rw-r--r--kde-base/kvtml-data/Manifest1
-rw-r--r--kde-base/kvtml-data/kvtml-data-9999.ebuild18
-rw-r--r--kde-base/libkdeedu/Manifest2
-rw-r--r--kde-base/libkdeedu/libkdeedu-9999.ebuild2
4 files changed, 3 insertions, 20 deletions
diff --git a/kde-base/kvtml-data/Manifest b/kde-base/kvtml-data/Manifest
index 90929ea0457..551536f8f1b 100644
--- a/kde-base/kvtml-data/Manifest
+++ b/kde-base/kvtml-data/Manifest
@@ -1,3 +1,2 @@
EBUILD kvtml-data-4.6.9999.ebuild 247 RMD160 8754c35613074f701c4a125d27c084ebcc8fd5e8 SHA1 f1f19bc016891b0d04e9570370fa81f856724d70 SHA256 2c5e3439f62738a8cc7b3746448f8f3674fe30cf5e7795d93e5f299c6f3e68ce
-EBUILD kvtml-data-9999.ebuild 322 RMD160 7b5c976f66b3ecdcb0fb3744a913172e4b478362 SHA1 37bd34718ffb14bcd42bf40f20e66abe702f6ac4 SHA256 5a05cd37c2504722f95a2fc9197826aaa35247ce20e15c5b21142e88ee3609c2
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kvtml-data/kvtml-data-9999.ebuild b/kde-base/kvtml-data/kvtml-data-9999.ebuild
deleted file mode 100644
index 015675bf85d..00000000000
--- a/kde-base/kvtml-data/kvtml-data-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-if [[ ${PV} == *9999 ]]; then
- KDE_SCM="git"
- inherit kde4-base
-else
- KMNAME="kdeedu"
- KMMODULE="data"
- inherit kde4-meta
-fi
-
-DESCRIPTION="Kvtml data for various KDE games"
-KEYWORDS=""
-IUSE=""
diff --git a/kde-base/libkdeedu/Manifest b/kde-base/libkdeedu/Manifest
index bd3e7f4283a..49f5493eeb8 100644
--- a/kde-base/libkdeedu/Manifest
+++ b/kde-base/libkdeedu/Manifest
@@ -1,3 +1,3 @@
EBUILD libkdeedu-4.6.9999.ebuild 518 RMD160 cf70fa2dad5f5cfec8a35219d7cfced940517012 SHA1 da162b57067e7c570cf87f7965e7913e8340365c SHA256 bcba58637a5071b212946647e5be73b85a6fb5a3bde4037aed7b11601d29cf02
-EBUILD libkdeedu-9999.ebuild 439 RMD160 a3598f99889e58e1b30dc84a3bd9eba12fc633d3 SHA1 8ff732fd4a5cdc85691e9c6f3fe533e8f91c17bc SHA256 25f0075a97837ca042de207fe44a8418acf71fea5415d08fd5ff9d225954e41e
+EBUILD libkdeedu-9999.ebuild 463 RMD160 7e26e12b4ca43fc1e225c8edacd71d81e4dc811e SHA1 71ded28594a734c2bd112a17138558d80563b07e SHA256 3502cd7e644826c8e872f0783e8ff49156b84f9aef79042392c53910c3607554
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/libkdeedu/libkdeedu-9999.ebuild b/kde-base/libkdeedu/libkdeedu-9999.ebuild
index 85482663cc0..14b34b11631 100644
--- a/kde-base/libkdeedu/libkdeedu-9999.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-9999.ebuild
@@ -18,3 +18,5 @@ IUSE="debug"
# 4 of 4 tests fail. Last checked for 4.6.1. Tests are fundamentally broken,
# see bug 258857 for details.
RESTRICT=test
+
+add_blocker kvtml-data