Gentoo Archives: gentoo-commits

From: Guilherme Amadio <amadio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/
Date: Fri, 24 Aug 2018 12:57:45
Message-Id: 1535115447.4b42c99db172146da240cb8588ef046702eca5c8.amadio@gentoo
1 commit: 4b42c99db172146da240cb8588ef046702eca5c8
2 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 24 12:06:42 2018 +0000
4 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 24 12:57:27 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b42c99d
7
8 sci-physics/root: drop support for Qt4
9
10 Support for Qt4 is deprecated upstream,
11 and Qt4 is no longer in the main tree.
12
13 Bug: https://bugs.gentoo.org/620754
14 Package-Manager: Portage-2.3.48, Repoman-2.3.10
15
16 sci-physics/root/root-6.12.06-r4.ebuild | 12 ++++--------
17 sci-physics/root/root-6.14.02.ebuild | 12 ++++--------
18 sci-physics/root/root-9999.ebuild | 12 ++++--------
19 3 files changed, 12 insertions(+), 24 deletions(-)
20
21 diff --git a/sci-physics/root/root-6.12.06-r4.ebuild b/sci-physics/root/root-6.12.06-r4.ebuild
22 index 151a9f60739..71738a81dbc 100644
23 --- a/sci-physics/root/root-6.12.06-r4.ebuild
24 +++ b/sci-physics/root/root-6.12.06-r4.ebuild
25 @@ -19,7 +19,7 @@ SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
26 IUSE="+X avahi aqua +asimage +davix emacs +examples fits fftw fortran
27 +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat
28 +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8
29 - +python qt4 qt5 R +roofit root7 shadow sqlite +ssl table +tbb test
30 + +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test
31 +threads +tiff +tmva +unuran vc xinetd +xml xrootd"
32
33 SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
34 @@ -27,7 +27,7 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
35 KEYWORDS="~amd64 ~x86"
36
37 REQUIRED_USE="
38 - !X? ( !asimage !opengl !qt4 !qt5 !tiff )
39 + !X? ( !asimage !opengl !qt5 !tiff )
40 python? ( ${PYTHON_REQUIRED_USE} )
41 tmva? ( gsl )
42 davix? ( ssl xml )
43 @@ -56,10 +56,6 @@ CDEPEND="
44 virtual/glu
45 x11-libs/gl2ps:0=
46 )
47 - qt4? (
48 - dev-qt/qtcore:4=
49 - dev-qt/qtgui:4=
50 - )
51 qt5? (
52 dev-qt/qtcore:5=
53 dev-qt/qtgui:5=
54 @@ -233,8 +229,8 @@ src_configure() {
55 -Dpythia8=$(usex pythia8)
56 -Dpython=$(usex python)
57 -Dqt5web=$(usex qt5)
58 - -Dqtgsi=$(usex qt4)
59 - -Dqt=$(usex qt4)
60 + -Dqtgsi=OFF
61 + -Dqt=OFF
62 -Drfio=OFF
63 -Droofit=$(usex roofit)
64 -Droot7=$(usex root7)
65
66 diff --git a/sci-physics/root/root-6.14.02.ebuild b/sci-physics/root/root-6.14.02.ebuild
67 index 4d725bd70a5..7397f23d0d2 100644
68 --- a/sci-physics/root/root-6.14.02.ebuild
69 +++ b/sci-physics/root/root-6.14.02.ebuild
70 @@ -19,7 +19,7 @@ SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
71 IUSE="+X avahi aqua +asimage +davix emacs +examples fits fftw fortran
72 +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat
73 +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8
74 - +python qt4 qt5 R +roofit root7 shadow sqlite +ssl table +tbb test
75 + +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test
76 +threads +tiff +tmva +unuran vc xinetd +xml xrootd"
77
78 SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
79 @@ -27,7 +27,7 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
80 KEYWORDS="~amd64 ~x86"
81
82 REQUIRED_USE="
83 - !X? ( !asimage !opengl !qt4 !qt5 !tiff )
84 + !X? ( !asimage !opengl !qt5 !tiff )
85 python? ( ${PYTHON_REQUIRED_USE} )
86 tmva? ( gsl )
87 davix? ( ssl xml )
88 @@ -56,10 +56,6 @@ CDEPEND="
89 virtual/glu
90 x11-libs/gl2ps:0=
91 )
92 - qt4? (
93 - dev-qt/qtcore:4=
94 - dev-qt/qtgui:4=
95 - )
96 qt5? (
97 dev-qt/qtcore:5=
98 dev-qt/qtgui:5=
99 @@ -232,8 +228,8 @@ src_configure() {
100 -Dpythia8=$(usex pythia8)
101 -Dpython=$(usex python)
102 -Dqt5web=$(usex qt5)
103 - -Dqtgsi=$(usex qt4)
104 - -Dqt=$(usex qt4)
105 + -Dqtgsi=OFF
106 + -Dqt=OFF
107 -Drfio=OFF
108 -Droofit=$(usex roofit)
109 -Droot7=$(usex root7)
110
111 diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
112 index 9231a3e5261..1c079990b6c 100644
113 --- a/sci-physics/root/root-9999.ebuild
114 +++ b/sci-physics/root/root-9999.ebuild
115 @@ -29,13 +29,13 @@ HOMEPAGE="https://root.cern"
116 IUSE="+X avahi aqua +asimage +davix emacs +examples fits fftw fortran
117 +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat
118 +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8
119 - +python qt4 qt5 R +roofit root7 shadow sqlite +ssl table +tbb test
120 + +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test
121 +threads +tiff +tmva +unuran vc xinetd +xml xrootd"
122
123 LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
124
125 REQUIRED_USE="
126 - !X? ( !asimage !opengl !qt4 !qt5 !tiff )
127 + !X? ( !asimage !opengl !qt5 !tiff )
128 python? ( ${PYTHON_REQUIRED_USE} )
129 tmva? ( gsl )
130 davix? ( ssl xml )
131 @@ -65,10 +65,6 @@ CDEPEND="
132 virtual/glu
133 x11-libs/gl2ps:0=
134 )
135 - qt4? (
136 - dev-qt/qtcore:4=
137 - dev-qt/qtgui:4=
138 - )
139 qt5? (
140 dev-qt/qtcore:5=
141 dev-qt/qtgui:5=
142 @@ -242,8 +238,8 @@ src_configure() {
143 -Dpythia8=$(usex pythia8)
144 -Dpython=$(usex python)
145 -Dqt5web=$(usex qt5)
146 - -Dqtgsi=$(usex qt4)
147 - -Dqt=$(usex qt4)
148 + -Dqtgsi=OFF
149 + -Dqt=OFF
150 -Drfio=OFF
151 -Droofit=$(usex roofit)
152 -Droot7=$(usex root7)