1 |
bicatali 07/12/09 17:35:12 |
2 |
|
3 |
Modified: ChangeLog root-5.16.00.ebuild |
4 |
Removed: root-4.02.00.ebuild |
5 |
Log: |
6 |
Forced opengl as a dep, since it needs it anyway, added a possible fix for afs support, a die function for a g++ >= 4.2 and now use virtual/mysql instead of dev-db/mysql |
7 |
(Portage version: 2.1.4_rc8) |
8 |
|
9 |
Revision Changes Path |
10 |
1.16 sci-physics/root/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/ChangeLog?rev=1.16&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/ChangeLog?rev=1.16&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/ChangeLog?r1=1.15&r2=1.16 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v |
19 |
retrieving revision 1.15 |
20 |
retrieving revision 1.16 |
21 |
diff -u -r1.15 -r1.16 |
22 |
--- ChangeLog 23 Nov 2007 16:01:06 -0000 1.15 |
23 |
+++ ChangeLog 9 Dec 2007 17:35:12 -0000 1.16 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for sci-physics/root |
26 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.15 2007/11/23 16:01:06 drac Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.16 2007/12/09 17:35:12 bicatali Exp $ |
29 |
+ |
30 |
+ 09 Dec 2007; Sébastien Fabbro <bicatali@g.o> -root-4.02.00.ebuild, |
31 |
+ root-5.16.00.ebuild: |
32 |
+ Forced opengl as a dep, since it needs it anyway, added a possible fix for |
33 |
+ afs support, a die function for a g++ >= 4.2 and now use virtual/mysql |
34 |
+ instead of dev-db/mysql |
35 |
|
36 |
23 Nov 2007; Samuli Suominen <drac@g.o> root-5.16.00.ebuild: |
37 |
amd64 stable wrt #196282 |
38 |
|
39 |
|
40 |
|
41 |
1.10 sci-physics/root/root-5.16.00.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-5.16.00.ebuild?rev=1.10&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-5.16.00.ebuild?rev=1.10&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/root-5.16.00.ebuild?r1=1.9&r2=1.10 |
46 |
|
47 |
Index: root-5.16.00.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.16.00.ebuild,v |
50 |
retrieving revision 1.9 |
51 |
retrieving revision 1.10 |
52 |
diff -u -r1.9 -r1.10 |
53 |
--- root-5.16.00.ebuild 23 Nov 2007 16:01:06 -0000 1.9 |
54 |
+++ root-5.16.00.ebuild 9 Dec 2007 17:35:12 -0000 1.10 |
55 |
@@ -1,6 +1,6 @@ |
56 |
# Copyright 1999-2007 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.16.00.ebuild,v 1.9 2007/11/23 16:01:06 drac Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.16.00.ebuild,v 1.10 2007/12/09 17:35:12 bicatali Exp $ |
60 |
|
61 |
inherit versionator flag-o-matic eutils toolchain-funcs qt3 fortran |
62 |
|
63 |
@@ -14,16 +14,18 @@ |
64 |
SLOT="0" |
65 |
LICENSE="LGPL-2" |
66 |
KEYWORDS="amd64 sparc x86" |
67 |
-IUSE="afs cern doc fftw kerberos ldap mysql odbc opengl postgres |
68 |
+ |
69 |
+IUSE="afs cern doc fftw kerberos ldap mysql odbc postgres |
70 |
python ruby qt3 ssl truetype xml" |
71 |
|
72 |
DEPEND="sys-apps/shadow |
73 |
x11-libs/libXpm |
74 |
>=sci-libs/gsl-1.8 |
75 |
dev-libs/libpcre |
76 |
+ virtual/opengl |
77 |
+ virtual/glu |
78 |
|| ( media-libs/libafterimage x11-wm/afterstep ) |
79 |
- opengl? ( virtual/opengl virtual/glu ) |
80 |
- mysql? ( dev-db/mysql ) |
81 |
+ mysql? ( virtual/mysql ) |
82 |
postgres? ( dev-db/postgresql ) |
83 |
afs? ( net-fs/openafs ) |
84 |
kerberos? ( virtual/krb5 ) |
85 |
@@ -54,6 +56,12 @@ |
86 |
FORTRAN="gfortran g77 ifc" |
87 |
fortran_pkg_setup |
88 |
fi |
89 |
+ if [[ "$(tc-getCXX)" == *g++* ]] && \ |
90 |
+ version_is_at_least 4.2 $(gcc-version); then |
91 |
+ eerror "${P} will not compile with g++ >= 4.2" |
92 |
+ eerror "Either downgrade gcc, use another C++ compiler or use root >= 5.18." |
93 |
+ die "wrong g++ version" |
94 |
+ fi |
95 |
} |
96 |
|
97 |
src_unpack() { |
98 |
@@ -79,7 +87,7 @@ |
99 |
target=linuxicc |
100 |
fi |
101 |
fi |
102 |
- |
103 |
+ use afs && append-flags -DAFS_OLD_COM_ERR |
104 |
local myfortran |
105 |
use cern && myfortran="F77=${FORTRANC}" |
106 |
|
107 |
@@ -126,6 +134,7 @@ |
108 |
--enable-mathcore \ |
109 |
--enable-mathmore \ |
110 |
--enable-minuit2 \ |
111 |
+ --enable-opengl \ |
112 |
--enable-reflex \ |
113 |
--enable-roofit \ |
114 |
--enable-shared \ |
115 |
@@ -140,7 +149,6 @@ |
116 |
$(use_enable ldap) \ |
117 |
$(use_enable mysql) \ |
118 |
$(use_enable odbc) \ |
119 |
- $(use_enable opengl) \ |
120 |
$(use_enable postgres pgsql) \ |
121 |
$(use_enable python) \ |
122 |
$(use_enable qt3 qt) \ |
123 |
|
124 |
|
125 |
|
126 |
-- |
127 |
gentoo-commits@g.o mailing list |