diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2017-12-19 08:32:22 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2017-12-19 11:38:00 +0000 |
| commit | eccd3f60c2d9e2582f471a3236bef0039faa2444 (patch) | |
| tree | cdfd847c2a5dfb6906a0ec8c0effd4e1cbf9eb82 /sci-physics | |
| parent | sys-kernel/gentoo-sources: amd64 stable (diff) | |
| download | gentoo-eccd3f60c2d9e2582f471a3236bef0039faa2444.tar.gz gentoo-eccd3f60c2d9e2582f471a3236bef0039faa2444.tar.bz2 gentoo-eccd3f60c2d9e2582f471a3236bef0039faa2444.zip | |
sci-physics/root: Fix patches for EAPI 6
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'sci-physics')
| -rw-r--r-- | sci-physics/root/files/root-5.32.00-cfitsio.patch | 4 | ||||
| -rw-r--r-- | sci-physics/root/files/root-5.32.00-chklib64.patch | 4 | ||||
| -rw-r--r-- | 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 853c3f39f207..156667f8fee4 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 979220f02f35..23f20d54f0cc 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 f428493ad11e..7bb076d35565 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 |