• Re: [gentoo-dev] [PATCH 1/3] sci-physics/root: rename uring USE flag to

    From Jaco Kroon@21:1/5 to Filip Kobierski on Sat Jan 4 13:20:01 2025
    Hi Filip,

    Unsure if this has been merged already...  If so I'll simply fix
    glusterfs when next I bump, otherwise, please for the three updated
    packages:

    The metadata.xml should retain alphabetical order.  This is really moot
    since io-uring goes global in 3/3, so the +lines here are just destined
    to go away again.  I don't think you need to worry about this one too much.

    IUSE= should also retain alphabetical order.  This is more of an issue
    since these lines don't get updated again in a future patch, and thus
    the ordering is lost.

    Kind regards,
    Jaco

    On 2025/01/02 00:40, Filip Kobierski wrote:

    Signed-off-by: Filip Kobierski <fkobi@pm.me>
    ---
    sci-physics/root/metadata.xml | 2 +-
    sci-physics/root/root-6.30.08.ebuild | 8 ++++----
    sci-physics/root/root-6.32.06.ebuild | 8 ++++----
    sci-physics/root/root-6.32.08.ebuild | 8 ++++----
    sci-physics/root/root-6.34.02.ebuild | 8 ++++----
    sci-physics/root/root-6.34.9999.ebuild | 8 ++++----
    sci-physics/root/root-9999.ebuild | 8 ++++----
    7 files changed, 25 insertions(+), 25 deletions(-)

    diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml index 43f73697047..6708cbdd75a 100644
    --- a/sci-physics/root/metadata.xml
    +++ b/sci-physics/root/metadata.xml
    @@ -42,7 +42,7 @@
    <flag name="tbb">Enable implicit multi-threading (IMT) with <pkg>dev-cpp/tbb</pkg></flag>
    <flag name="tmva">Built TMVA (ROOT's multi-variate analysis toolkit for machine learning)</flag>
    <flag name="unuran">Enable support for <pkg>sci-mathematics/unuran</pkg></flag>
    - <flag name="uring">Enabl
    e support for <pkg>sys-libs/liburing</pkg> in RNTuple</flag>
    + <flag name="io-uring">Enable support for <pkg>sys-libs/liburing</pkg> in RNTuple</flag>
    <flag name="vc">Enable support for <pkg>dev-libs/vc</pkg> with VecCore</flag>
    <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
    </use>
    diff --git a/sci-physics/root/root-6.30.08.ebuild b/sci-physics/root/root-6.30.08.ebuild
    index 652ded3c9a3..f74125bb1ba 100644
    --- a/sci-physics/root/root-6.30.08.ebuild
    +++ b/sci-physics/root/root-6.30.08.ebuild
    @@ -17,7 +17,7 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
    IUSE="+X aqua +asimage cuda cudnn +davix debug +examples fits fftw fortran
    +gdml graphviz +gsl +http jupyter libcxx +minuit mpi mysql odbc +opengl
    oracle postgres pythia6 pythia8 +python qt5 qt6 R +roofit +root7 shadow - sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd"
    + sqlite +ssl +tbb test +tmva +unuran io-uring vc +xml xrootd"

    if [[ ${PV}
    =~ "9999" ]] ; then
    inherit git-r3
    @@ -48,7 +48,7 @@ REQUIRED_USE="
    qt6? ( root7 http )
    roofit? ( minuit )
    tmva? ( gsl python )
    - uring? ( root7 )
    + io-uring? ( root7 )
    "

    CDEPEND="
    @@ -120,7 +120,7 @@ CDEPEND="
    dev-python/numpy[${PYTHON_USEDEP}]
    ')
    )
    - uring? ( sys-libs/liburing:= )
    + io-uring? ( sys-libs/liburing:= )
    vc? ( >=dev-libs/vc-1.4.4:= )
    xml? ( dev-libs/libxml2:2= )
    xrootd? ( net-libs/xrootd:0= )
    @@ -308,7 +308,7 @@ src_configure() {
    -Dtmva-rmva=$(usex R)
    -Dtmva-sofie=OFF
    -Dunuran=$(usex unuran)
    - -During=$(usex uring)
    + -During=$(usex io-uring)
    -Dvc=$(usex vc)
    -Dvdt=OFF
    -Dveccore=OFF
    diff --git a/sci-physics/root/root-6.32.06.ebuild b/sci-physics/root/root-6.32.06.ebuild
    index 44fcdf275fd..9d098d14d07 100644
    --- a/sci-physics/root/root-6.32.06.ebuild
    +++ b/sci-physics/root/root-6.32.06.ebuild
    @@ -17,7 +17,7 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
    IUSE="+X aqua +asimage
    cuda cudnn +davix debug +examples fits fftw fortran
    +gdml graphviz +gsl +http jupyter libcxx +minuit mpi mysql odbc +opengl
    postgres pythia8 +python qt5 qt6 R +roofit +root7 shadow sqlite +ssl
    - +tbb test +tmva +unuran uring vc +xml xrootd"
    + +tbb test +tmva +unuran io-uring vc +xml xrootd"

    if [[ ${PV} =~ "9999" ]] ; then
    inherit git-r3
    @@ -48,7 +48,7 @@ REQUIRED_USE="
    qt6? ( root7 http )
    roofit? ( minuit )
    tmva? ( gsl python )
    - uring? ( root7 )
    + io-uring? ( root7 )
    "

    CDEPEND="
    @@ -117,7 +117,7 @@ CDEPEND="
    dev-python/numpy[${PYTHON_USEDEP}]
    ')
    )
    - uring? ( sys-libs/liburing:= )
    + io-uring? ( sys-libs/liburing:= )
    vc? ( >=dev-libs/vc-1.4.4:= )
    xml? ( dev-libs/libxml2:2= )
    xrootd? ( net-libs/xrootd:0= )
    @@ -295,7 +295,7 @@ src_configure() {
    -Dtmva-rmva=$(usex R)
    -Dtmva-sofie=OFF
    -Dunuran=$(usex unuran)
    - -During=$(usex uring)
    + -During=$(usex io-uring)
    -Dvc=$(usex vc)
    -Dvdt=OFF
    -Dveccore=OFF
    diff
    --git a/sci-physics/root/root-6.32.08.ebuild b/sci-physics/root/root-6.32.08.ebuild
    index 44fcdf275fd..9d098d14d07 100644
    --- a/sci-physics/root/root-6.32.08.ebuild
    +++ b/sci-physics/root/root-6.32.08.ebuild
    @@ -17,7 +17,7 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
    IUSE="+X aqua +asimage cuda cudnn +davix debug +examples fits fftw fortran
    +gdml graphviz +gsl +http jupyter libcxx +minuit mpi mysql odbc +opengl
    postgres pythia8 +python qt5 qt6 R +roofit +root7 shadow sqlite +ssl
    - +tbb test +tmva +unuran uring vc +xml xrootd"
    + +tbb test +tmva +unuran io-uring vc +xml xrootd"

    if [[ ${PV} =~ "9999" ]] ; then
    inherit git-r3
    @@ -48,7 +48,7 @@ REQUIRED_USE="
    qt6? ( root7 http )
    roofit? ( minuit )
    tmva? ( gsl python )
    - uring? ( root7 )
    + io-uring? ( root7 )
    "

    CDEPEND="
    @@ -117,7 +117,7 @@ CDEPEND="
    dev-python/numpy[${PYTHON_USEDEP}]
    ')
    )
    - uring? ( sys-libs/liburing:= )
    + io-uring? ( sys-libs/liburing:= )
    vc? ( >
    =dev-libs/vc-1.4.4:= )
    xml? ( dev-libs/libxml2:2= )
    xrootd? ( net-libs/xrootd:0= )
    @@ -295,7 +295,7 @@ src_configure() {
    -Dtmva-rmva=$(usex R)
    -Dtmva-sofie=OFF
    -Dunuran=$(usex unuran)
    - -During=$(usex uring)
    + -During=$(usex io-uring)
    -Dvc=$(usex vc)
    -Dvdt=OFF
    -Dveccore=OFF
    diff --git a/sci-physics/root/root-6.34.02.ebuild b/sci-physics/root/root-6.34.02.ebuild
    index 453459c31cf..e73a5fb1cc6 100644
    --- a/sci-physics/root/root-6.34.02.ebuild
    +++ b/sci-physics/root/root-6.34.02.ebuild
    @@ -17,7 +17,7 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
    IUSE="+X aqua +asimage cuda cudnn +davix debug +examples fits fftw fortran
    +gdml graphviz +gsl +http jupyter libcxx +minuit mpi mysql odbc +opengl
    postgres pythia8 +python qt6 R +roofit +root7 shadow sqlite +ssl
    - +tbb test +tmva +unuran uring vc +xml xrootd"
    + +tbb test +tmva +unuran io-uring vc +xml xrootd"

    if [[ ${PV} =~ "9999" ]] ; then
    inherit git-r3
    @@ -47,7 +47,7 @
    @ REQUIRED_USE="
    qt6? ( root7 http )
    roofit? ( minuit )
    tmva? ( gsl python )
    - uring? ( root7 )
    + io-uring? ( root7 )
    "

    CDEPEND="
    @@ -112,7 +112,7 @@ CDEPEND="
    dev-python/numpy[${PYTHON_USEDEP}]
    ')
    )
    - uring? ( sys-libs/liburing:= )
    + io-uring? ( sys-libs/liburing:= )
    vc? ( >=dev-libs/vc-1.4.4:= )
    xml? ( dev-libs/libxml2:2= )
    xrootd? ( net-libs/xrootd:0= )
    @@ -290,7 +290,7 @@ src_configure() {
    -Dtmva-rmva=$(usex R)
    -Dtmva-sofie=OFF
    -Dunuran=$(usex unuran)
    - -During=$(usex uring)
    + -During=$(usex io-uring)
    -Dvc=$(usex vc)
    -Dvdt=OFF
    -Dveccore=OFF
    diff --git a/sci-physics/root/root-6.34.9999.ebuild b/sci-physics/root/root-6.34.9999.ebuild
    index 453459c31cf..e73a5fb1cc6 100644
    --- a/sci-physics/root/root-6.34.9999.ebuild
    +++ b/sci-physics/root/root-6.34.9999.ebuild
    @@ -17,7 +17,7 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
    IUSE="+X aqua +asimage cuda cudnn +davix debug +examples fits fftw fort
    ran
    +gdml graphviz +gsl +http jupyter libcxx +minuit mpi mysql odbc +opengl
    postgres pythia8 +python qt6 R +roofit +root7 shadow sqlite +ssl
    - +tbb test +tmva +unuran uring vc +xml xrootd"
    + +tbb test +tmva +unuran io-uring vc +xml xrootd"

    if [[ ${PV} =~ "9999" ]] ; then
    inherit git-r3
    @@ -47,7 +47,7 @@ REQUIRED_USE="
    qt6? ( root7 http )
    roofit? ( minuit )
    tmva? ( gsl python )
    - uring? ( root7 )
    + io-uring? ( root7 )
    "

    CDEPEND="
    @@ -112,7 +112,7 @@ CDEPEND="
    dev-python/numpy[${PYTHON_USEDEP}]
    ')
    )
    - uring? ( sys-libs/liburing:= )
    + io-uring? ( sys-libs/liburing:= )
    vc? ( >=dev-libs/vc-1.4.4:= )
    xml? ( dev-libs/libxml2:2= )
    xrootd? ( net-libs/xrootd:0= )
    @@ -290,7 +290,7 @@ src_configure() {
    -Dtmva-rmva=$(usex R)
    -Dtmva-sofie=OFF
    -Dunuran=$(usex unuran)
    - -During=$(usex uring)
    + -During=$(usex io-uring)
    -Dvc=$(usex vc)
    -Dvdt=OFF
    -Dveccore=OFF
    diff --git a/sci-physics/root/root-9999.ebuild b/sci-phys ics/root/root-9999.ebuild
    index 453459c31cf..e73a5fb1cc6 100644
    --- a/sci-physics/root/root-9999.ebuild
    +++ b/sci-physics/root/root-9999.ebuild
    @@ -17,7 +17,7 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
    IUSE="+X aqua +asimage cuda cudnn +davix debug +examples fits fftw fortran
    +gdml graphviz +gsl +http jupyter libcxx +minuit mpi mysql odbc +opengl
    postgres pythia8 +python qt6 R +roofit +root7 shadow sqlite +ssl
    - +tbb test +tmva +unuran uring vc +xml xrootd"
    + +tbb test +tmva +unuran io-uring vc +xml xrootd"

    if [[ ${PV} =~ "9999" ]] ; then
    inherit git-r3
    @@ -47,7 +47,7 @@ REQUIRED_USE="
    qt6? ( root7 http )
    roofit? ( minuit )
    tmva? ( gsl python )
    - uring? ( root7 )
    + io-uring? ( root7 )
    "

    CDEPEND="
    @@ -112,7 +112,7 @@ CDEPEND="
    dev-python/numpy[${PYTHON_USEDEP}]
    ')
    )
    - uring? ( sys-libs/liburing:= )
    + io-uring? ( sys-libs/liburing:= )
    vc? ( >=dev-libs/vc-1.4.4:= )
    xml? ( dev-libs/libxml2:2= )
    xrootd? (
    net-libs/xrootd:0= )
    @@ -290,7 +290,7 @@ src_configure() {
    -Dtmva-rmva=$(usex R)
    -Dtmva-sofie=OFF
    -Dunuran=$(usex unuran)
    - -During=$(usex uring)
    + -During=$(usex io-uring)
    -Dvc=$(usex vc)
    -Dvdt=OFF
    -Dveccore=OFF

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)