diff options
author | Andrey Kislyuk <weaver@gentoo.org> | 2009-01-04 01:24:22 +0000 |
---|---|---|
committer | Andrey Kislyuk <weaver@gentoo.org> | 2009-01-04 01:24:22 +0000 |
commit | aa9ce06cb644cd9142649b104eff6ebfb91c6f03 (patch) | |
tree | 1baa9e82e6a714f5e5070a09d4c8b9cf1e83b8aa /sci-biology | |
parent | Block aspell-pt versions that would install a file conflict, per bug #247391. (diff) | |
download | historical-aa9ce06cb644cd9142649b104eff6ebfb91c6f03.tar.gz historical-aa9ce06cb644cd9142649b104eff6ebfb91c6f03.tar.bz2 historical-aa9ce06cb644cd9142649b104eff6ebfb91c6f03.zip |
Collision block, bug 247394
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-tuxonice i686
Diffstat (limited to 'sci-biology')
-rw-r--r-- | sci-biology/glimmer/ChangeLog | 10 | ||||
-rw-r--r-- | sci-biology/glimmer/Manifest | 4 | ||||
-rw-r--r-- | sci-biology/glimmer/glimmer-3.02-r1.ebuild (renamed from sci-biology/glimmer/glimmer-3.02.ebuild) | 7 |
3 files changed, 14 insertions, 7 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/Manifest b/sci-biology/glimmer/Manifest index 7e9c818daca6..ab599ee58718 100644 --- a/sci-biology/glimmer/Manifest +++ b/sci-biology/glimmer/Manifest @@ -1,4 +1,4 @@ DIST glimmer302.tar.gz 5637075 RMD160 bc29bb045f7a4179504cb3843741393f42e11ab8 SHA1 e2f27fdab82cd8978f1452bfcd4c0287c52b77b7 SHA256 a1e422ee56f495f9f99e1741ba2043f026fc8182afcc47cb20cfd2d989537221 -EBUILD glimmer-3.02.ebuild 1024 RMD160 6c4dfbfb86027a0ffa629328e525d3a0d65838d3 SHA1 8fe13973ae2b85210c9ca5d3d3b5f4ccfd30c7ec SHA256 2a3e44a14f2d5a5e9f1b5eb0f81c342542426f7ca51aeb802ee77cf055c43b15 -MISC ChangeLog 479 RMD160 e0a9ac25c82646efa3dbc0a2ddf45d0d43eebdd1 SHA1 90e9a1f17db645a7480f5a2a4c07f19490957119 SHA256 568962dd6be27d07aec6643d45ae317db90d72c0d045a7fb219bc3f40e15bb2f +EBUILD glimmer-3.02-r1.ebuild 1069 RMD160 a13e38d86cccb667c29551d56dcaec13e228c54e SHA1 79eef25e14c8f55507e1dbe332a3b3f47d5c82ff SHA256 4976d80b9bde54c5947801a52f7e2f669cb7d9677ca1c103966776e02409d1b6 +MISC ChangeLog 631 RMD160 d3cd14428f1ae35748a80a3352044a18c7cc64f7 SHA1 e314eb9e1245c79e732f3defb2816c90b1d4b98f SHA256 ceebaa6e5d381f8719d99813606293659530338e3dcdeaca7fb1eb5342e2326e MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110 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}" |