commit: 1e0b6daf4f2da313a5d8b4fa9c8c786060155628 Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> AuthorDate: Thu Jan 15 18:23:16 2015 +0000 Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org> CommitDate: Thu Jan 15 18:23:16 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1e0b6daf
Merge branch 'master' into librecad Conflicts: media-gfx/librecad/ChangeLog media-gfx/librecad/ChangeLog | 3 ++ media-gfx/librecad/Manifest | 2 +- ...librecad-2.0.3.ebuild => librecad-2.0.7.ebuild} | 2 +- sci-biology/bcftools/ChangeLog | 3 ++ sci-biology/bcftools/bcftools-1.1.ebuild | 2 +- sci-biology/edena/ChangeLog | 9 +++++ sci-biology/edena/Manifest | 1 + sci-biology/edena/edena-3.131028.ebuild | 35 +++++++++++++++++++ sci-biology/{zmsort => edena}/metadata.xml | 0 sci-biology/mosaik/ChangeLog | 11 ++++-- sci-biology/mosaik/Manifest | 2 +- .../{mosaik-2.1.33.ebuild => mosaik-2.2.3.ebuild} | 10 ++++-- sci-biology/ncbi-blast+/ChangeLog | 4 ++- sci-biology/ncbi-blast+/metadata.xml | 27 +++++++++++++++ sci-biology/quast/ChangeLog | 11 +++++- sci-biology/quast/Manifest | 2 +- .../quast/{quast-2.2.ebuild => quast-2.3.ebuild} | 4 +-- sci-biology/sabre/ChangeLog | 9 +++++ sci-biology/{zmsort => sabre}/metadata.xml | 0 sci-biology/sabre/sabre-9999.ebuild | 39 ++++++++++++++++++++++ sci-biology/sickle/ChangeLog | 6 ++-- sci-biology/sickle/sickle-9999.ebuild | 4 +-- sci-chemistry/nwchem/ChangeLog | 7 ++++ ...26243-r4.ebuild => nwchem-6.5_p26243-r5.ebuild} | 2 +- 24 files changed, 177 insertions(+), 18 deletions(-) diff --cc media-gfx/librecad/ChangeLog index 7b80bf4,dfded70..e719749 --- a/media-gfx/librecad/ChangeLog +++ b/media-gfx/librecad/ChangeLog @@@ -1,11 -1,10 +1,14 @@@ # ChangeLog for media-gfx/librecad -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header$ + 15 Jan 2015; Marius Brehler <mar...@linux.sungazer.de> + librecad-1.0.3.ebuild, librecad-1.0.4.ebuild: + Move to EAPI=5 + + 15 Jan 2015; Dongxu Li <dongxuli2...@gmail.com> +librecad-2.0.7.ebuild, -librecad-2.0.3.ebuild: + Version bump: 2.0.7 + 19 Sep 2014; Dongxu Li <dongxuli2...@gmail.com> : librecad-9999.ebuild: install appdata.xml