summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kislyuk <weaver@gentoo.org>2009-01-04 01:24:22 +0000
committerAndrey Kislyuk <weaver@gentoo.org>2009-01-04 01:24:22 +0000
commit9063d59a89c175efb4c7507992e068b898a51646 (patch)
treeec5623236ef612a7ffbb2fd031ad4c335ba7049b /sci-biology/glimmer
parentBlock aspell-pt versions that would install a file conflict, per bug #247391. (diff)
downloadgentoo-2-9063d59a89c175efb4c7507992e068b898a51646.tar.gz
gentoo-2-9063d59a89c175efb4c7507992e068b898a51646.tar.bz2
gentoo-2-9063d59a89c175efb4c7507992e068b898a51646.zip
Collision block, bug 247394
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-tuxonice i686)
Diffstat (limited to 'sci-biology/glimmer')
-rw-r--r--sci-biology/glimmer/ChangeLog10
-rw-r--r--sci-biology/glimmer/glimmer-3.02-r1.ebuild (renamed from sci-biology/glimmer/glimmer-3.02.ebuild)7
2 files changed, 12 insertions, 5 deletions
diff --git a/sci-biology/glimmer/ChangeLog b/sci-biology/glimmer/ChangeLog
index a3403e4ca33d..1dccf70808bd 100644
--- a/sci-biology/glimmer/ChangeLog
+++ b/sci-biology/glimmer/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-biology/glimmer
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/glimmer/ChangeLog,v 1.2 2008/09/30 20:21:46 darkside Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/glimmer/ChangeLog,v 1.3 2009/01/04 01:24:22 weaver Exp $
+
+*glimmer-3.02-r1 (04 Jan 2009)
+
+ 04 Jan 2009; weaver <weaver@gentoo.org> -glimmer-3.02.ebuild,
+ +glimmer-3.02-r1.ebuild:
+ Collision block, bug 247394
30 Sep 2008; Jeremy Olexa <darkside@gentoo.org> glimmer-3.02.ebuild:
add ~amd64 kw based on Chad's testing. bug #239162
diff --git a/sci-biology/glimmer/glimmer-3.02.ebuild b/sci-biology/glimmer/glimmer-3.02-r1.ebuild
index c7f37b26cdf0..d83c29e0e9a4 100644
--- a/sci-biology/glimmer/glimmer-3.02.ebuild
+++ b/sci-biology/glimmer/glimmer-3.02-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/glimmer/glimmer-3.02.ebuild,v 1.3 2008/09/30 20:21:46 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/glimmer/glimmer-3.02-r1.ebuild,v 1.1 2009/01/04 01:24:22 weaver Exp $
inherit versionator
@@ -16,7 +16,8 @@ IUSE=""
KEYWORDS="~amd64 ~x86"
DEPEND=""
-RDEPEND=""
+RDEPEND="!app-crypt/pkcrack
+ !media-libs/libextractor"
S="${WORKDIR}/${PN}${PV}"