From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EE75F138A1A for ; Sun, 18 Jan 2015 02:16:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EED9DE090E; Sun, 18 Jan 2015 02:16:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CC2AAE0907 for ; Sun, 18 Jan 2015 02:16:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA9F3340723 for ; Sun, 18 Jan 2015 02:16:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D6974FD0A for ; Sun, 18 Jan 2015 02:16:07 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1421346196.1e0b6daf4f2da313a5d8b4fa9c8c786060155628.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: / X-VCS-Repository: proj/sci X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 1e0b6daf4f2da313a5d8b4fa9c8c786060155628 X-VCS-Branch: master Date: Sun, 18 Jan 2015 02:16:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 05e5457e-7fbc-42b9-bd72-f35d009cfc64 X-Archives-Hash: 466048748a1abfb8db4f2b11be9c8ea6 commit: 1e0b6daf4f2da313a5d8b4fa9c8c786060155628 Author: Marius Brehler linux sungazer de> AuthorDate: Thu Jan 15 18:23:16 2015 +0000 Commit: Christoph Junghans gentoo 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 + librecad-1.0.3.ebuild, librecad-1.0.4.ebuild: + Move to EAPI=5 + + 15 Jan 2015; Dongxu Li +librecad-2.0.7.ebuild, -librecad-2.0.3.ebuild: + Version bump: 2.0.7 + 19 Sep 2014; Dongxu Li : librecad-9999.ebuild: install appdata.xml