From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 D6AFB139083 for ; Tue, 19 Dec 2017 11:38:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DB1EE0FE4; Tue, 19 Dec 2017 11:38:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0F15E0FE4 for ; Tue, 19 Dec 2017 11:38:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8FE0B33BE19 for ; Tue, 19 Dec 2017 11:38:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5573BAE1D for ; Tue, 19 Dec 2017 11:38:05 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1513683480.eccd3f60c2d9e2582f471a3236bef0039faa2444.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/files/, sci-physics/root/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-physics/root/files/root-5.32.00-cfitsio.patch sci-physics/root/files/root-5.32.00-chklib64.patch sci-physics/root/root-6.12.04-r1.ebuild X-VCS-Directories: sci-physics/root/files/ sci-physics/root/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: eccd3f60c2d9e2582f471a3236bef0039faa2444 X-VCS-Branch: master Date: Tue, 19 Dec 2017 11:38:05 +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: 32394a1d-7732-44a3-8af0-2629a7ae83df X-Archives-Hash: 0a46bfa77866cef53fada3f13c72af34 commit: eccd3f60c2d9e2582f471a3236bef0039faa2444 Author: Justin Lecher gentoo org> AuthorDate: Tue Dec 19 08:32:22 2017 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Dec 19 11:38:00 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eccd3f60 sci-physics/root: Fix patches for EAPI 6 Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.19, Repoman-2.3.6 sci-physics/root/files/root-5.32.00-cfitsio.patch | 4 ++-- sci-physics/root/files/root-5.32.00-chklib64.patch | 4 ++-- sci-physics/root/root-6.12.04-r1.ebuild | 23 +++++++++++----------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/sci-physics/root/files/root-5.32.00-cfitsio.patch b/sci-physics/root/files/root-5.32.00-cfitsio.patch index 853c3f39f20..156667f8fee 100644 --- a/sci-physics/root/files/root-5.32.00-cfitsio.patch +++ b/sci-physics/root/files/root-5.32.00-cfitsio.patch @@ -1,5 +1,5 @@ ---- configure.orig 2012-01-19 23:44:44.127607638 +0100 -+++ configure 2012-01-20 00:19:20.420652913 +0100 +--- a/configure 2012-01-19 23:44:44.127607638 +0100 ++++ b/configure 2012-01-20 00:19:20.420652913 +0100 @@ -3435,9 +3435,7 @@ cfitsioinc=$found_hdr cfitsioincdir=$found_dir diff --git a/sci-physics/root/files/root-5.32.00-chklib64.patch b/sci-physics/root/files/root-5.32.00-chklib64.patch index 979220f02f3..23f20d54f0c 100644 --- a/sci-physics/root/files/root-5.32.00-chklib64.patch +++ b/sci-physics/root/files/root-5.32.00-chklib64.patch @@ -1,6 +1,6 @@ bug fix for #406817 ---- configure.orig 2012-02-29 19:46:41.000000000 +0400 -+++ configure 2012-03-22 03:28:43.458968696 +0400 +--- a/configure 2012-02-29 19:46:41.000000000 +0400 ++++ b/configure 2012-03-22 03:28:43.458968696 +0400 @@ -441,14 +441,13 @@ fi else diff --git a/sci-physics/root/root-6.12.04-r1.ebuild b/sci-physics/root/root-6.12.04-r1.ebuild index f428493ad11..7bb076d3556 100644 --- a/sci-physics/root/root-6.12.04-r1.ebuild +++ b/sci-physics/root/root-6.12.04-r1.ebuild @@ -102,6 +102,18 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} xinetd? ( sys-apps/xinetd )" +PATCHES=( + "${FILESDIR}"/${PN}-5.28.00b-glibc212.patch + "${FILESDIR}"/${PN}-5.32.00-afs.patch + "${FILESDIR}"/${PN}-5.32.00-cfitsio.patch + "${FILESDIR}"/${PN}-5.32.00-chklib64.patch + "${FILESDIR}"/${PN}-6.00.01-dotfont.patch + "${FILESDIR}"/${PN}-6.11.02-hsimple.patch + "${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch + "${FILESDIR}"/${PN}-6.12.04-find-oracle-12.patch + "${FILESDIR}"/${PN}-6.12.04-z3.patch +) + pkg_setup() { use fortran && fortran-2_pkg_setup use python && python-single-r1_pkg_setup @@ -122,17 +134,6 @@ pkg_setup() { src_prepare() { cmake-utils_src_prepare - epatch \ - "${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \ - "${FILESDIR}"/${PN}-5.32.00-afs.patch \ - "${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \ - "${FILESDIR}"/${PN}-5.32.00-chklib64.patch \ - "${FILESDIR}"/${PN}-6.00.01-dotfont.patch \ - "${FILESDIR}"/${PN}-6.11.02-hsimple.patch \ - "${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch \ - "${FILESDIR}"/${PN}-6.12.04-find-oracle-12.patch \ - "${FILESDIR}"/${PN}-6.12.04-z3.patch - # make sure we use system libs and headers rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die rm -r graf2d/asimage/src/libAfterImage || die