summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-01-29 15:12:47 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-01-29 15:12:47 +0000
commit06ea4a1d75a24cbf8dcd948fbbc54e1fdda3d5ea (patch)
treef53f570def796c5c61eee40189497d9085e693e2 /dev-libs/girara
parentInstall 80-net-name-slot.rules if the file isn't there yet for stabilization ... (diff)
downloadgentoo-2-06ea4a1d75a24cbf8dcd948fbbc54e1fdda3d5ea.tar.gz
gentoo-2-06ea4a1d75a24cbf8dcd948fbbc54e1fdda3d5ea.tar.bz2
gentoo-2-06ea4a1d75a24cbf8dcd948fbbc54e1fdda3d5ea.zip
Block old version to avoid file collision wrt #454416 by Nikolaj Sjujskij
(Portage version: 2.2.0_alpha155/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'dev-libs/girara')
-rw-r--r--dev-libs/girara/ChangeLog5
-rw-r--r--dev-libs/girara/girara-0.1.5-r300.ebuild5
2 files changed, 7 insertions, 3 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/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"