public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/files/, sci-physics/root/
Date: Tue, 19 Dec 2017 11:38:05 +0000 (UTC)	[thread overview]
Message-ID: <1513683480.eccd3f60c2d9e2582f471a3236bef0039faa2444.jlec@gentoo> (raw)

commit:     eccd3f60c2d9e2582f471a3236bef0039faa2444
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 08:32:22 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> 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 <jlec <AT> 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


             reply	other threads:[~2017-12-19 11:38 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-19 11:38 Justin Lecher [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-08-27 15:31 [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/files/, sci-physics/root/ Guilherme Amadio
2018-04-16  6:31 Benda XU
2017-12-18 13:13 Guilherme Amadio
2017-12-18 13:13 Guilherme Amadio
2016-12-22 12:20 Andrew Savchenko
2016-06-19 13:19 Andrew Savchenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1513683480.eccd3f60c2d9e2582f471a3236bef0039faa2444.jlec@gentoo \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox