summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2011-04-11 21:02:57 +0200
committerAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2011-04-11 21:03:13 +0200
commit451e31ee2428d90f8f22f8356d9e57b125a86307 (patch)
tree0218daf482d0b716fbb443032670398ef4c7d25d
parentc13fb353d0394fb8426cc2e5b76f34101c39e25d (diff)
downloadkde-451e31ee2428d90f8f22f8356d9e57b125a86307.tar.gz
kde-451e31ee2428d90f8f22f8356d9e57b125a86307.tar.bz2
kde-451e31ee2428d90f8f22f8356d9e57b125a86307.zip
[kde-base/kde-l10n] Block <kde-misc/konq-plugins-4.6 because of file collisions, bug 363091
(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
-rw-r--r--kde-base/kde-l10n/Manifest24
-rw-r--r--kde-base/kde-l10n/kde-l10n-4.6.9999.ebuild2
-rw-r--r--kde-base/kde-l10n/kde-l10n-9999.ebuild2
3 files changed, 24 insertions, 4 deletions
diff --git a/kde-base/kde-l10n/Manifest b/kde-base/kde-l10n/Manifest
index 9a02488f979..f3fe310c7d2 100644
--- a/kde-base/kde-l10n/Manifest
+++ b/kde-base/kde-l10n/Manifest
@@ -1,3 +1,23 @@
-EBUILD kde-l10n-4.6.9999.ebuild 2573 RMD160 2b06d4e08ce8b517ece8ec6d22fb50b3b4a2561d SHA1 37b5eafd63e9f6e20bf42988beeea8fc7c3725f9 SHA256 2c7cffd084dc25178c55317b71994955a2339039ded20d15d58a6569c3b27528
-EBUILD kde-l10n-9999.ebuild 2573 RMD160 2b06d4e08ce8b517ece8ec6d22fb50b3b4a2561d SHA1 37b5eafd63e9f6e20bf42988beeea8fc7c3725f9 SHA256 2c7cffd084dc25178c55317b71994955a2339039ded20d15d58a6569c3b27528
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+EBUILD kde-l10n-4.6.9999.ebuild 2600 RMD160 ac5c7d1ec4b54323f060c556f8f0f383a54d2797 SHA1 001d28e52ea88caacdb451beffa9f5ca3ce26330 SHA256 6749474b814273c9d435e4ce055d5555c0c19f0c7e7e143ab9fd864386b419cf
+EBUILD kde-l10n-9999.ebuild 2600 RMD160 ac5c7d1ec4b54323f060c556f8f0f383a54d2797 SHA1 001d28e52ea88caacdb451beffa9f5ca3ce26330 SHA256 6749474b814273c9d435e4ce055d5555c0c19f0c7e7e143ab9fd864386b419cf
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNo1BhAAoJENwGBM22xffeSU4P/iega897dkLSjdmP/UiTZnXF
+JMVrI8LQwoBFLJrhiV7RyIGH4zmy86L4pxHun5f4XOPjJBUA8ceO8xVhwUkj6LVR
+j6ZSFhuQZ0v4bsw8WKsWhr8kBmRASZlc/x418Sagl+vV3ICp/fJ8I3rQZDzRWRig
+jgunBs6B+HjOFuM6KWHYO2YLxryHjBl3rKTk46cgaa7V+jtAGmyTlo6+55W9bmpZ
+q6kGaCEwPQal9oklMrDUoQtcODZcFXyFrbDWr6gyf4bbUZ8p6yxt+DxpTUixPclH
+7von/lpcOeEooK+K9ucKf4itIWxd0Ns1h/Kq+fVjB5o89jcv9A67NtorKBdTwNQu
+hXYybnLRDrrV0eCNf2A4Rv8ROJLjVMzUNwi+ABZcoAkzLlSKg23Zg430rLTqgVZJ
+PDMHeiHSJEaRvoHJxrVx/wUY77knte76zjdpBZLkDEIe0FadeWL7plBl9oplJhAS
+vvxF6Q0hdhcEDU7ecHVNX3rqwyfr3hXRw2UDu75gAQXY8Ly1M0uDupG11UhzFBQj
+hCi8HNOFdqKUZcdXLkeUeIqcCXcFqyMCi9A6cssy1yNstiN18kzF8681VCqn2bhW
+860PuEGouxLeJ2kPwbqOtg2GP2wKNhTdfkKjV1GprvTA/qN+ABg0R+dP7F11fKUi
+joUCM+MMjXUBY58JxX0u
+=zvyw
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kde-l10n/kde-l10n-4.6.9999.ebuild b/kde-base/kde-l10n/kde-l10n-4.6.9999.ebuild
index 16f9ad012d4..f3aa798d9f7 100644
--- a/kde-base/kde-l10n/kde-l10n-4.6.9999.ebuild
+++ b/kde-base/kde-l10n/kde-l10n-4.6.9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.kde.org/"
LICENSE="GPL-2"
DEPEND=">=sys-devel/gettext-0.17"
-RDEPEND=""
+RDEPEND="!<kde-misc/konq-plugins-4.6"
KEYWORDS=""
IUSE=""
diff --git a/kde-base/kde-l10n/kde-l10n-9999.ebuild b/kde-base/kde-l10n/kde-l10n-9999.ebuild
index 16f9ad012d4..f3aa798d9f7 100644
--- a/kde-base/kde-l10n/kde-l10n-9999.ebuild
+++ b/kde-base/kde-l10n/kde-l10n-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.kde.org/"
LICENSE="GPL-2"
DEPEND=">=sys-devel/gettext-0.17"
-RDEPEND=""
+RDEPEND="!<kde-misc/konq-plugins-4.6"
KEYWORDS=""
IUSE=""