From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-926181-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id DC400139085
for <garchives@archives.gentoo.org>; Tue, 24 Jan 2017 18:46:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2CB93E0E73;
Tue, 24 Jan 2017 18:46:01 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0AFE8E0E73
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Jan 2017 18:46:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7CF85341667
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Jan 2017 18:45:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E45A12DF6
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Jan 2017 18:45:57 +0000 (UTC)
From: "Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>
Message-ID: <1485283407.da0b020931c3075b2afe18448145eecd90e148e6.mmokrejs@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/picard/
X-VCS-Repository: proj/sci
X-VCS-Files: sci-biology/picard/picard-9999.ebuild
X-VCS-Directories: sci-biology/picard/
X-VCS-Committer: mmokrejs
X-VCS-Committer-Name: Martin Mokrejs
X-VCS-Revision: da0b020931c3075b2afe18448145eecd90e148e6
X-VCS-Branch: master
Date: Tue, 24 Jan 2017 18:45:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 179fd205-7732-474d-bf16-99dac8a04b81
X-Archives-Hash: 2e828a69d2f0dc59aceae7f5af1c637b
commit: da0b020931c3075b2afe18448145eecd90e148e6
Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Tue Jan 24 18:43:27 2017 +0000
Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Tue Jan 24 18:43:27 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=da0b0209
Revert "sci-biology/picard-9999: apply the 2.2.2 patch to drop bundled htsjdk"
This reverts commit 1bd613187ee8a70163d0d21bbe5ea726f53c5490.
Weird, on two hosts this patch does not apply because the build.xml
is updated. Somehow I have "old" git checkout on my dev machine
although all are at commit 3800c8218b8e4c75a4db14f97b409dbcc3dcaaa8.
Will fix the -9999 ebuild in a moment.
sci-biology/picard/picard-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-biology/picard/picard-9999.ebuild b/sci-biology/picard/picard-9999.ebuild
index ccc0062..e3f22b9 100644
--- a/sci-biology/picard/picard-9999.ebuild
+++ b/sci-biology/picard/picard-9999.ebuild
@@ -38,7 +38,7 @@ EANT_GENTOO_CLASSPATH="snappy-1.1,cofoja,commons-jexl-2,ant-core,htsjdk"
java_prepare() {
default
- epatch "${FILESDIR}"/2.2.2-build.xml.patch
+ epatch "${FILESDIR}"/${PV}-build.xml.patch
}
src_compile(){