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 CC9621381F3 for ; Fri, 27 Sep 2013 17:36:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 969C4E0E81; Fri, 27 Sep 2013 17:36:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D7462E0E81 for ; Fri, 27 Sep 2013 17:36:45 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE13733EE79 for ; Fri, 27 Sep 2013 17:36:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 72974E5460 for ; Fri, 27 Sep 2013 17:36:43 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1380303246.a5f6d81b77e4d5390144f3f22f9eb7d8b2b1c708.nicolasbock@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: / X-VCS-Repository: proj/sci X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: a5f6d81b77e4d5390144f3f22f9eb7d8b2b1c708 X-VCS-Branch: master Date: Fri, 27 Sep 2013 17:36:43 +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: 02cb6e9d-dbec-4021-9628-d45ffcd0a050 X-Archives-Hash: cf6930a47d47290af086806cff7fdb9a commit: a5f6d81b77e4d5390144f3f22f9eb7d8b2b1c708 Author: Nicolas Bock gmail com> AuthorDate: Fri Sep 27 17:34:06 2013 +0000 Commit: Nicolas Bock gmail com> CommitDate: Fri Sep 27 17:34:06 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a5f6d81b Merge branch 'master' of github.com:gentoo-science/sci Conflicts: sys-cluster/charm/ChangeLog sys-cluster/charm/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --cc sys-cluster/charm/ChangeLog index ace12f1,2ff10b6..492cc96 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@@ -2,14 -2,10 +2,18 @@@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 27 Sep 2013; Nicolas Bock + +files/charm-6.5.1-charmc-gentoo.patch, charm-6.5.1-r1.ebuild, + files/charm-6.5.1-CkReductionMgr.patch, + files/charm-6.5.1-cleanup-config.patch, + files/charm-6.5.1-fix-string-parsing.patch: + sys-clyster/charm-6.5.1-r1: Fix missing DEPEND. This addresses bug 486202. + The ebuild had a missing DEPEND using the doc USE flag. + + 27 Sep 2013; Christoph Junghans + files/charm-6.5.1-fix-string-parsing.patch: + fix broken patch + 14 Sep 2013; Nicolas Bock files/charm-6.5.1-fix-string-parsing.patch: sys-cluster/charm-6.5.1: Small fix in patch to make printing less verbose.