| 1 |
commit: 61b06f12bb0b5809ced355582dcf5dd39677f9d5 |
| 2 |
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Jul 2 22:36:31 2014 +0000 |
| 4 |
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed Jul 2 22:36:31 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=61b06f12 |
| 7 |
|
| 8 |
sci-physics/root: fix aux docs installation |
| 9 |
|
| 10 |
Do not compress files required for .credits, .demo, .license |
| 11 |
commands. Fix tutorials patch. |
| 12 |
|
| 13 |
--- |
| 14 |
sci-physics/root/ChangeLog | 5 +++++ |
| 15 |
sci-physics/root/files/root-6.00.01-tutorials-path.patch | 12 ++++++++++++ |
| 16 |
sci-physics/root/root-6.00.01-r1.ebuild | 4 ++-- |
| 17 |
sci-physics/root/root-9999.ebuild | 8 +++++++- |
| 18 |
4 files changed, 26 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog |
| 21 |
index 9b12ba5..4770753 100644 |
| 22 |
--- a/sci-physics/root/ChangeLog |
| 23 |
+++ b/sci-physics/root/ChangeLog |
| 24 |
@@ -3,6 +3,11 @@ |
| 25 |
# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $ |
| 26 |
|
| 27 |
02 Jul 2014; Andrew Savchenko <bircoph@×××××.com> root-6.00.01-r1.ebuild, |
| 28 |
+ root-9999.ebuild, files/root-6.00.01-tutorials-path.patch: |
| 29 |
+ Do not compress files required for .credits, .demo, .license |
| 30 |
+ commands. Fix tutorials patch. |
| 31 |
+ |
| 32 |
+ 02 Jul 2014; Andrew Savchenko <bircoph@×××××.com> root-6.00.01-r1.ebuild, |
| 33 |
+files/root-6.00.01-tutorials-path.patch: |
| 34 |
Honor --tutdir from .demos CLI command. |
| 35 |
Install files for .license and .credits commands to work. |
| 36 |
|
| 37 |
diff --git a/sci-physics/root/files/root-6.00.01-tutorials-path.patch b/sci-physics/root/files/root-6.00.01-tutorials-path.patch |
| 38 |
index 2e496a4..cb68615 100644 |
| 39 |
--- a/sci-physics/root/files/root-6.00.01-tutorials-path.patch |
| 40 |
+++ b/sci-physics/root/files/root-6.00.01-tutorials-path.patch |
| 41 |
@@ -10,6 +10,18 @@ index 5950401..e4fbfbf 100644 |
| 42 |
#define ROOTSRCDIR "@srcdir@" |
| 43 |
#define ROOTICONPATH "@iconpath@" |
| 44 |
#define EXTRAICONPATH "@extraiconpath@" |
| 45 |
+diff --git a/configure b/configure |
| 46 |
+index 131df92..2c8ea95 100755 |
| 47 |
+--- a/configure |
| 48 |
++++ b/configure |
| 49 |
+@@ -7537,6 +7537,7 @@ sed \ |
| 50 |
+ -e "s|@prefix@|$prefix|" \ |
| 51 |
+ -e "s|@srcdir@|$srcdir|" \ |
| 52 |
+ -e "s|@ttffontdir@|$fontdir|" \ |
| 53 |
++ -e "s|@tutdir@|$tutdir|" \ |
| 54 |
+ -e "s|@setresuid@|$setresuid|" \ |
| 55 |
+ -e "s|@hasmathmore@|$hasmathmore|" \ |
| 56 |
+ -e "s|@haspthread@|$haspthread|" \ |
| 57 |
diff --git a/core/base/src/TApplication.cxx b/core/base/src/TApplication.cxx |
| 58 |
index 1c1809a..7d7ed37 100644 |
| 59 |
--- a/core/base/src/TApplication.cxx |
| 60 |
|
| 61 |
diff --git a/sci-physics/root/root-6.00.01-r1.ebuild b/sci-physics/root/root-6.00.01-r1.ebuild |
| 62 |
index 74c7af8..d5993c0 100644 |
| 63 |
--- a/sci-physics/root/root-6.00.01-r1.ebuild |
| 64 |
+++ b/sci-physics/root/root-6.00.01-r1.ebuild |
| 65 |
@@ -426,9 +426,9 @@ src_install() { |
| 66 |
cleanup_install |
| 67 |
|
| 68 |
# do not copress files used by ROOT's CLI (.credit, .demo, .license) |
| 69 |
- docompress -x "${DOC_DIR}/{CREDITS,LICENSE,examples/tutorials}" |
| 70 |
+ docompress -x "${DOC_DIR}"/{CREDITS,LICENSE,examples/tutorials} |
| 71 |
# needed for .license command to work |
| 72 |
- dosym "${ED}"/usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE" |
| 73 |
+ dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE" |
| 74 |
} |
| 75 |
|
| 76 |
pkg_postinst() { |
| 77 |
|
| 78 |
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild |
| 79 |
index 26f1dd1..9c76fed 100644 |
| 80 |
--- a/sci-physics/root/root-9999.ebuild |
| 81 |
+++ b/sci-physics/root/root-9999.ebuild |
| 82 |
@@ -200,7 +200,8 @@ src_prepare() { |
| 83 |
"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \ |
| 84 |
"${FILESDIR}"/${PN}-6.00.01-prop-flags.patch \ |
| 85 |
"${FILESDIR}"/${PN}-6.00.01-llvm.patch \ |
| 86 |
- "${FILESDIR}"/${PN}-6.00.01-geocad.patch |
| 87 |
+ "${FILESDIR}"/${PN}-6.00.01-geocad.patch \ |
| 88 |
+ "${FILESDIR}"/${PN}-6.00.01-tutorials-path.patch |
| 89 |
|
| 90 |
# make sure we use system libs and headers |
| 91 |
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die |
| 92 |
@@ -422,6 +423,11 @@ src_install() { |
| 93 |
daemon_install |
| 94 |
desktop_install |
| 95 |
cleanup_install |
| 96 |
+ |
| 97 |
+ # do not copress files used by ROOT's CLI (.credit, .demo, .license) |
| 98 |
+ docompress -x "${DOC_DIR}"/{CREDITS,LICENSE,examples/tutorials} |
| 99 |
+ # needed for .license command to work |
| 100 |
+ dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE" |
| 101 |
} |
| 102 |
|
| 103 |
pkg_postinst() { |
Archives