1 |
commit: 9779664bcd17fe85e323a003115dbe4b998a055c |
2 |
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Aug 2 22:30:00 2011 +0000 |
4 |
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Aug 2 22:30:00 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9779664b |
7 |
|
8 |
Use rpath if prefix is enabled. |
9 |
|
10 |
(Portage version: 2.2.0_alpha50/git/Linux i686, unsigned Manifest commit) |
11 |
|
12 |
--- |
13 |
sci-physics/root/ChangeLog | 3 +++ |
14 |
sci-physics/root/root-5.30.00.ebuild | 8 ++++---- |
15 |
2 files changed, 7 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog |
18 |
index cda314e..91b9580 100644 |
19 |
--- a/sci-physics/root/ChangeLog |
20 |
+++ b/sci-physics/root/ChangeLog |
21 |
@@ -2,6 +2,9 @@ |
22 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
23 |
# $Header: $ |
24 |
|
25 |
+ 02 Aug 2011; Andrew Savchenko <bircoph@×××××.com> root-5.30.00.ebuild: |
26 |
+ Enable rpath if prefix is used, see bug 346933. |
27 |
+ |
28 |
*root-5.30.00 (02 Aug 2011) |
29 |
|
30 |
02 Aug 2011; Andrew Savchenko <bircoph@×××××.com> |
31 |
|
32 |
diff --git a/sci-physics/root/root-5.30.00.ebuild b/sci-physics/root/root-5.30.00.ebuild |
33 |
index a4c4bf8..f802d13 100644 |
34 |
--- a/sci-physics/root/root-5.30.00.ebuild |
35 |
+++ b/sci-physics/root/root-5.30.00.ebuild |
36 |
@@ -22,10 +22,10 @@ SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz |
37 |
|
38 |
SLOT="0" |
39 |
LICENSE="LGPL-2.1" |
40 |
-KEYWORDS="~amd64 ~x86" |
41 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux" |
42 |
IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap |
43 |
- llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres pythia6 |
44 |
- pythia8 python +reflex ruby qt4 ssl xft xml xinetd xrootd" |
45 |
+ llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix |
46 |
+ pythia6 pythia8 python +reflex ruby qt4 ssl xft xml xinetd xrootd" |
47 |
|
48 |
CDEPEND="app-arch/xz-utils |
49 |
>=dev-lang/cfortran-4.4-r2 |
50 |
@@ -182,7 +182,6 @@ src_configure() { |
51 |
--disable-builtin-pcre \ |
52 |
--disable-builtin-zlib \ |
53 |
--disable-builtin-lzma \ |
54 |
- --disable-rpath \ |
55 |
--enable-astiff \ |
56 |
--enable-exceptions \ |
57 |
--enable-explicitlink \ |
58 |
@@ -218,6 +217,7 @@ src_configure() { |
59 |
$(use_enable odbc) \ |
60 |
$(use_enable opengl) \ |
61 |
$(use_enable postgres pgsql) \ |
62 |
+ $(use_enable prefix rpath) \ |
63 |
$(use_enable pythia6) \ |
64 |
$(use_enable pythia8) \ |
65 |
$(use_enable python) \ |