From 4b42c99db172146da240cb8588ef046702eca5c8 Mon Sep 17 00:00:00 2001 From: Guilherme Amadio Date: Fri, 24 Aug 2018 14:06:42 +0200 Subject: [PATCH] sci-physics/root: drop support for Qt4 Support for Qt4 is deprecated upstream, and Qt4 is no longer in the main tree. Bug: https://bugs.gentoo.org/620754 Package-Manager: Portage-2.3.48, Repoman-2.3.10 --- sci-physics/root/root-6.12.06-r4.ebuild | 12 ++++-------- sci-physics/root/root-6.14.02.ebuild | 12 ++++-------- sci-physics/root/root-9999.ebuild | 12 ++++-------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/sci-physics/root/root-6.12.06-r4.ebuild b/sci-physics/root/root-6.12.06-r4.ebuild index 151a9f60739f..71738a81dbc7 100644 --- a/sci-physics/root/root-6.12.06-r4.ebuild +++ b/sci-physics/root/root-6.12.06-r4.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz" IUSE="+X avahi aqua +asimage +davix emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8 - +python qt4 qt5 R +roofit root7 shadow sqlite +ssl table +tbb test + +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd" SLOT="$(ver_cut 1-2)/$(ver_cut 3)" @@ -27,7 +27,7 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" KEYWORDS="~amd64 ~x86" REQUIRED_USE=" - !X? ( !asimage !opengl !qt4 !qt5 !tiff ) + !X? ( !asimage !opengl !qt5 !tiff ) python? ( ${PYTHON_REQUIRED_USE} ) tmva? ( gsl ) davix? ( ssl xml ) @@ -56,10 +56,6 @@ CDEPEND=" virtual/glu x11-libs/gl2ps:0= ) - qt4? ( - dev-qt/qtcore:4= - dev-qt/qtgui:4= - ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= @@ -233,8 +229,8 @@ src_configure() { -Dpythia8=$(usex pythia8) -Dpython=$(usex python) -Dqt5web=$(usex qt5) - -Dqtgsi=$(usex qt4) - -Dqt=$(usex qt4) + -Dqtgsi=OFF + -Dqt=OFF -Drfio=OFF -Droofit=$(usex roofit) -Droot7=$(usex root7) diff --git a/sci-physics/root/root-6.14.02.ebuild b/sci-physics/root/root-6.14.02.ebuild index 4d725bd70a50..7397f23d0d2f 100644 --- a/sci-physics/root/root-6.14.02.ebuild +++ b/sci-physics/root/root-6.14.02.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz" IUSE="+X avahi aqua +asimage +davix emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8 - +python qt4 qt5 R +roofit root7 shadow sqlite +ssl table +tbb test + +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd" SLOT="$(ver_cut 1-2)/$(ver_cut 3)" @@ -27,7 +27,7 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" KEYWORDS="~amd64 ~x86" REQUIRED_USE=" - !X? ( !asimage !opengl !qt4 !qt5 !tiff ) + !X? ( !asimage !opengl !qt5 !tiff ) python? ( ${PYTHON_REQUIRED_USE} ) tmva? ( gsl ) davix? ( ssl xml ) @@ -56,10 +56,6 @@ CDEPEND=" virtual/glu x11-libs/gl2ps:0= ) - qt4? ( - dev-qt/qtcore:4= - dev-qt/qtgui:4= - ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= @@ -232,8 +228,8 @@ src_configure() { -Dpythia8=$(usex pythia8) -Dpython=$(usex python) -Dqt5web=$(usex qt5) - -Dqtgsi=$(usex qt4) - -Dqt=$(usex qt4) + -Dqtgsi=OFF + -Dqt=OFF -Drfio=OFF -Droofit=$(usex roofit) -Droot7=$(usex root7) diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index 9231a3e5261a..1c079990b6ce 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -29,13 +29,13 @@ HOMEPAGE="https://root.cern" IUSE="+X avahi aqua +asimage +davix emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8 - +python qt4 qt5 R +roofit root7 shadow sqlite +ssl table +tbb test + +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd" LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" REQUIRED_USE=" - !X? ( !asimage !opengl !qt4 !qt5 !tiff ) + !X? ( !asimage !opengl !qt5 !tiff ) python? ( ${PYTHON_REQUIRED_USE} ) tmva? ( gsl ) davix? ( ssl xml ) @@ -65,10 +65,6 @@ CDEPEND=" virtual/glu x11-libs/gl2ps:0= ) - qt4? ( - dev-qt/qtcore:4= - dev-qt/qtgui:4= - ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= @@ -242,8 +238,8 @@ src_configure() { -Dpythia8=$(usex pythia8) -Dpython=$(usex python) -Dqt5web=$(usex qt5) - -Dqtgsi=$(usex qt4) - -Dqt=$(usex qt4) + -Dqtgsi=OFF + -Dqt=OFF -Drfio=OFF -Droofit=$(usex roofit) -Droot7=$(usex root7) -- 2.26.2