Block old version to avoid file collision wrt #454416 by Nikolaj Sjujskij

Package-Manager: portage-2.2.0_alpha155/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 16 insertions, 12 deletions

diff --git a/dev-libs/girara/ChangeLog b/dev-libs/girara/ChangeLog
index b9b97da6f474..741275c0da25 100644
--- a/dev-libs/girara/ChangeLog
+++ b/dev-libs/girara/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/girara
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/girara/ChangeLog,v 1.21 2013/01/27 21:47:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/girara/ChangeLog,v 1.22 2013/01/29 15:12:47 ssuominen Exp $
+
+  29 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> girara-0.1.5-r300.ebuild:
+  Block old version to avoid file collision wrt #454416 by Nikolaj Sjujskij
 
 *girara-0.1.5-r300 (27 Jan 2013)
 *girara-0.1.5-r200 (27 Jan 2013)
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 1f4458730193..41a4a15ac4e4 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -5,17 +5,17 @@ DIST girara-0.1.4.tar.gz 73645 SHA256 831cf523b131bfa1c182efbf146d68fb642fe62d22
 DIST girara-0.1.5.tar.gz 73949 SHA256 8d2eeb6aa27286a298ef7b08017a3f702bcd84bfe61a382acebb79d4ab1cd1c1 SHA512 d170be2e5fe3388e2b6c2cca8a3a4d506625ff6c8d07e6f2e191042f924104756dc975310f0d8d9b7487204ac1f1a0b76a52ec9930aaeb242a029d1e03ccc54f WHIRLPOOL 3bd0261fc8ba4a7585496c8179c5613e02028423a07da47843943c0250ff1b733a29408d514756fe03ea3ec9234cc4ac1cba178f4b1c8c84ca86a851968ca58a
 EBUILD girara-0.1.4.ebuild 1157 SHA256 7bf699f047180e63d73c6b161aad767c898fe4c18d36a3ab87439fe481f7de4d SHA512 fc7b80243f16429866693547aedc4c48754b568d6686a207979952ffb12c9cbd9979a6bddbbf5a5856ab872b0f48d083c70be2ac9a9572acc958b06e87d542b4 WHIRLPOOL 0202969137fab64b837940052a3745ea33b7f8b565c5320f59b89aa475dfd324a689e7081fa2bf50438d73e9e0abb8833b19a6dd1534f4dc51d399f4e77f647b
 EBUILD girara-0.1.5-r200.ebuild 1251 SHA256 7c10b549a1fcf9ef82d6a6114d3e2b24421c82575a49626618087afa79308e83 SHA512 e9e5f3da82515e95224207551b613c7876a5c6a73931ad62530fdbdd62cf94ee2010dd55f23d5703770da429fce5dae294cb96520f5b1b10057af49ea9441afb WHIRLPOOL e81cc379492aacdcfe16e593e7f364eb174f9b5a4546d73d79f6169260d7f11f66727bc82894f3bd152ce7a38e851f6d01539195dfee34ed081ccce17c2c2b22
-EBUILD girara-0.1.5-r300.ebuild 1164 SHA256 9ed67f5b8450a203b9fe6962583d8f6fd63d519973bbf87cb4afa12fed45c7b6 SHA512 0198888614c946383eeaead1e9214425d68a0635d93cbfd6c7785c42e5f7e5580d4dda4750ed259ecda5212fa63f38e237f48b2f1c1ad6dbe201c19c0349c9d2 WHIRLPOOL 8f89757f146a2199ef9f3fa8351934dc032c554e92ecfab0c801f334f9dc5a42bcddf52f7731bf70bdf9d0cf2838b046990cc0066f400d04cc4e5b2bdc3d02f7
-MISC ChangeLog 2874 SHA256 5a91f1fa891adfa485db367a8a61edaa7511890590af97012b678effa225a798 SHA512 52f776d0ba0f69877d6426fb1e10a7d1a403c6ed87af73af764259aaade1cd1c85a59b537ce9c60b6952ac514ecb122bdb0de0bbd3299e50d4820e8f3ef675a2 WHIRLPOOL 0ee909e111c0bf14ad4d1a70680db6ff1de86e6bf520ac395049ffcaec177b593f39c58528cd6d7b798d092a5d1e467c82c0cee449d2c4d1cf5154422eb9ae1e
+EBUILD girara-0.1.5-r300.ebuild 1196 SHA256 c831a91e7db59a905f1f524ba9a915e20970455c7b5d6d63c70a02424158353c SHA512 3d4292db011f8527263435ee0a829e3ecd0ded47b0d26ee196d9e400aa0029a50224bb1a9b5b02a736acabbc50a9c98de460b577b9bb5c66209e4c2032bcfd4a WHIRLPOOL 352f5e87c9eca432911bacfb8e4ed8640bac8520967d35fe51c3587dda59859dfcaceb29adb063b9d1a2adf6ba5f9af7051367e250073dce252338fa01b37618
+MISC ChangeLog 3031 SHA256 f83c494167284f450a5b109b2cae700aaf7308a3eef10a99507575a534db0898 SHA512 1662532181a399be8cae462fac0f394a0d39bac1d42493d2be42bd80aa711a693deb60f4f9dfaea174240551ea13791f95a5f3ac470f7d845a3aeffc7f428bc2 WHIRLPOOL f9444a9506766714b927535fd7030a3e84f514be326d51efaed843d53604685aec3d16f1206a7e9fcee47eecfc12e575a0b5fca8a627d0ec451e581e2de5fef5
 MISC metadata.xml 342 SHA256 57da1012a80ac7b3f5844c593af2f963adb5318cffc057cbe243b4bc7bc356ce SHA512 8ec10499ea8c8792afe0bdfea65c61614ecce69b759ec43e65c2fc2d1577bb98a057bbb580edc3a658ecb477bb14a834a3f66aa757948759633033a20503bccd WHIRLPOOL 7572e8d401cc445f7325bcf28a49654edb3001e6a94f4c6631ee038789880dac8dab0e9d8f7d607ea0f43be2475ae3e2966959a49c9ade9441be7dd284fe7c5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRBaBmAAoJEEdUh39IaPFN6kIH/0FXetkBSro+x2xzG8NiNONe
-n21hng1QnHmEazyCQ4bC75B5RkuijEUt5/ipRhQgugwrN2Okc4GU4/F2fQr0Qd1A
-KZsWeNsh5Rvdun7EQkNP+B2nW10gKNRxB8a5BTQ6+M5AhKe2D0qqdT8O+9ksGzeX
-4hY4awiLplkgGH0jrYUPtziphWkicFKY8iKYFmYaCIzSqZYKta/kAGTTfW6Simsy
-wRLd/2A0gcFXzJWZ4TXEQ5qxCmVWgjqHe1aQe85nLdKLOGXgG1jJKgSl6Qeahx/3
-3URPh+B7/mKcut8meaNopSnIpTz619VKofy95QWVSSL4TDUPsAND5cUEvsutjJM=
-=S4iG
+iQEcBAEBCAAGBQJRB+buAAoJEEdUh39IaPFNEy4H/0XtdNOjj0GDK1lxBm6M+nyN
+eZEeSwncmDaNEgRqd3ktVnOsGFP7r5qXJaDJBlX6DlaJv5VUPG7FejG1jDYTWUem
+SewVfbYc0oj2qRyjq7gWv05dU9Vh3s7PVGfxFvanhOV0yF1fMAjRl2edZTveKDUl
+1krz26L+EkQIwGXalKKI6FUruu1t/0P9pcP4NF1+ILsZYQa/P40fdhlcmzuDxF7E
+z1NwgAgS/KjkJZLz8n1AQr+4kHZFaJwJXkeeu+gPQsIWbC+efQlH1NwEzsNtu382
+Qtv1mQXODNFZDulwyVYoM7m9e7/J2grTKgmc+gSr4BHpSbuF2kmhHQL5cyliffI=
+=NEEs
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/girara/girara-0.1.5-r300.ebuild b/dev-libs/girara/girara-0.1.5-r300.ebuild
index 5d7b4b9b15bb..8ae027a26414 100644
--- a/dev-libs/girara/girara-0.1.5-r300.ebuild
+++ b/dev-libs/girara/girara-0.1.5-r300.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/girara/girara-0.1.5-r300.ebuild,v 1.1 2013/01/27 21:47:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/girara/girara-0.1.5-r300.ebuild,v 1.2 2013/01/29 15:12:47 ssuominen Exp $
 
 EAPI=5
 inherit multilib toolchain-funcs
@@ -14,7 +14,8 @@ SLOT="3"
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
-RDEPEND=">=x11-libs/gtk+-3.0.11:3"
+RDEPEND=">=x11-libs/gtk+-3.0.11:3
+	!<${CATEGORY}/${PN}-0.1.5-r200"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"