diff options
| author |   Guilherme Amadio <amadio@gentoo.org> | 2018-03-06 08:11:18 +0100 |
|---|---|---|
| committer | Guilherme Amadio <amadio@gentoo.org> | 2018-03-06 15:43:07 +0100 |
| commit | 07c7bca3d839057a25d4ea681e48e76f76d7c699 (patch) | |
| tree | 5c4e76b20cf33db3d8a4f3e4c63ada99d2efb920 /sci-physics | |
| parent | sci-physics/root: keep directories needed by rootd daemon (diff) | |
| download | gentoo-07c7bca3d839057a25d4ea681e48e76f76d7c699.tar.gz gentoo-07c7bca3d839057a25d4ea681e48e76f76d7c699.tar.bz2 gentoo-07c7bca3d839057a25d4ea681e48e76f76d7c699.zip | |
sci-physics/root: version bump to 6.12/06
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'sci-physics')
| -rw-r--r-- | sci-physics/root/Manifest | 2 | ||||
| -rw-r--r-- | sci-physics/root/files/root-6.12.04-find-oracle-12.patch | 34 | ||||
| -rw-r--r-- | sci-physics/root/root-6.12.06.ebuild (renamed from sci-physics/root/root-6.12.04-r3.ebuild) | 1 |
3 files changed, 1 insertions, 36 deletions
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index 0f1fa9ef4b39..9587434290a7 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -1,2 +1,2 @@ DIST root_v5.34.36.source.tar.gz 75427331 BLAKE2B 203af03e1459c7fe079fcb1b30da145b3262f90c074abb7ff8fb3b1b2b90ac24391ce51aa8afbd10e0db8d69549207f15176207bc30a13720e0ae94342a38dfa SHA512 2cc0c8f8b63b2a3ce01c49c41704483548a7324d92c21a63e3e36a00f4d6f5656a7844fdf48cb71a6f2a2c974112527300ffd3bb5502d8365ffaf138e6ae4c7a -DIST root_v6.12.04.source.tar.gz 162106020 BLAKE2B f27382cf748d4e31d71b460ecbf9b9f12294fb212bf23dc3d34c98737d8815b2eea2318247e56953ba184bb790bbb2f4b43c675dcb7a02b77c011f19e15d0d83 SHA512 67e400e9e7e8cabfb036a1eb1c262d462f613de7d6e18f8a17109c8eb52932e9ba77e69ab7b1f62c582d06b7f4d020cc888a0dfbefb4d3716743f142c3e3c063 +DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1 diff --git a/sci-physics/root/files/root-6.12.04-find-oracle-12.patch b/sci-physics/root/files/root-6.12.04-find-oracle-12.patch deleted file mode 100644 index 242e76d09879..000000000000 --- a/sci-physics/root/files/root-6.12.04-find-oracle-12.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7aa8aacad80c75b40bb25bdeccc7cacce9a270ca Mon Sep 17 00:00:00 2001 -From: Guilherme Amadio <amadio@cern.ch> -Date: Mon, 18 Dec 2017 13:32:06 +0100 -Subject: [PATCH] Fix FindOracle.cmake to find version 12.x - ---- - cmake/modules/FindOracle.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake -index 24031664a6..b7c8cfbb99 100644 ---- a/cmake/modules/FindOracle.cmake -+++ b/cmake/modules/FindOracle.cmake -@@ -12,7 +12,7 @@ set(ORACLE_FOUND 0) - if(ORACLE_INCLUDE_DIR AND ORACLE_LIBRARY_OCCI) - set(ORACLE_FIND_QUIETLY 1) - endif() --set(ORACLE_HOME $ENV{ORACLE_DIR}) -+set(ORACLE_HOME $ENV{ORACLE_HOME}) - - IF (ORACLE_PATH_INCLUDES) - SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES}) -@@ -55,7 +55,7 @@ FIND_LIBRARY( - ) - FIND_LIBRARY( - ORACLE_LIBRARY_LNNZ -- NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32 -+ NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 ociw32 - PATHS ${ORACLE_LIB_LOCATION} - ) - --- -2.15.1 - diff --git a/sci-physics/root/root-6.12.04-r3.ebuild b/sci-physics/root/root-6.12.06.ebuild index 9ff4f451b92b..c875fb4bddfb 100644 --- a/sci-physics/root/root-6.12.04-r3.ebuild +++ b/sci-physics/root/root-6.12.06.ebuild @@ -112,7 +112,6 @@ PATCHES=( "${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 ) |