1. Forum
  2. Usenet
  3. LINUX.GENTOO.DEV

  • [gentoo-dev] [PATCH 0/8] Deprecate eutils.eclass

    From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Sat Jul 23 21:30:01 2022
    This series of patches splits off eqawarn in its own eclass, which
    will finally allow us to tag eutils.eclass as deprecated.

    Also, some eclasses call eqawarn in EAPI 6 without inheriting the
    function. Add a proper inherit statement to them, and drop EAPI 5
    support while at it.

    Ulrich Müller (8):
    eqawarn.eclass: New eclass, split off from eutils
    eutils.eclass: Add @DEPRECATED tag
    python*-r1.eclass: Add missing inherit for eqawarn
    ruby-ng.eclass: Drop support for EAPI 5
    ruby-ng.eclass: Add missing inherit for eqawarn
    vcs-snapshot.eclass: Add missing inherit for eqawarn
    java-pkg-simple.eclass: Drop support for EAPI 5
    java-pkg-simple.eclass: Inherit eqawarn instead of eutils

    eclass/eqawarn.eclass | 26 +++++++++++++++++++++++
    eclass/eutils.eclass | 28 ++----------------------
    eclass/java-pkg-simple.eclass | 10 +++------
    eclass/python-r1.eclass | 1 +
    eclass/python-utils-r1.eclass | 1 +
    eclass/ruby-ng.eclass | 40 +++++++++--------------------------
    eclass/vcs-snapshot.eclass | 3 ++-
    7 files changed, 45 insertions(+), 64 deletions(-)
    create mode 100644 eclass/eqawarn.eclass

    --
    2.35.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Sat Jul 23 21:30:01 2022
    Signed-off-by: Ulrich Müller <ulm@gentoo.org>
    ---
    eclass/ruby-ng.eclass | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
    index 167aab755f3a..06548392a501 100644
    --- a/eclass/ruby-ng.eclass
    +++ b/eclass/ruby-ng.eclass
    @@ -68,7 +68,7 @@

    case ${EAPI} in
    6)
    - inherit estack toolchain-funcs
    + inherit eqawarn estack toolchain-funcs
    ;;
    *)
    inherit estack
    --
    2.35.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Sat Jul 23 21:30:01 2022
    Signed-off-by: Ulrich Müller <ulm@gentoo.org>
    ---
    eclass/vcs-snapshot.eclass | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/eclass/vcs-snapshot.eclass b/eclass/vcs-snapshot.eclass
    index 64bc1da040f4..1b7299b92a3b 100644
    --- a/eclass/vcs-snapshot.eclass
    +++ b/eclass/vcs-snapshot.eclass
    @@ -43,7 +43,8 @@
    # in ${WORKDIR}/${P} and ${WORKDIR}/${P}-otherstuff respectively.

    case ${EAPI} in
    - 6|7|8) ;;
    + 6) inherit eqawarn ;;
    + 7|8) ;;
    *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac

    --
    2.35.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Sat Jul 23 21:30:01 2022
    Signed-off-by: Ulrich Müller <ulm@gentoo.org>
    ---
    eclass/java-pkg-simple.eclass | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 34c044e2ba2d..09062d9ede68 100644
    --- a/eclass/java-pkg-simple.eclass
    +++ b/eclass/java-pkg-simple.eclass
    @@ -17,7 +17,7 @@
    # directory before calling the src_compile function of this eclass.

    case ${EAPI} in
    - 6) inherit eutils ;; # eutils for eqawarn
    + 6) inherit eqawarn ;;
    7|8) ;;
    *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac
    --
    2.35.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Sat Jul 23 21:30:01 2022
    Signed-off-by: Ulrich Müller <ulm@gentoo.org>
    ---
    eclass/java-pkg-simple.eclass | 10 +++-------
    1 file changed, 3 insertions(+), 7 deletions(-)

    diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index c0a6b4d21df9..34c044e2ba2d 100644
    --- a/eclass/java-pkg-simple.eclass
    +++ b/eclass/java-pkg-simple.eclass
    @@ -6,7 +6,7 @@
    # java@gentoo.org
    # @AUTHOR:
    # Java maintainers <java@gentoo.org>
    -# @SUPPORTED_EAPIS: 5 6 7 8
    +# @SUPPORTED_EAPIS: 6 7 8
    # @BLURB: Eclass for packaging Java software with ease.
    # @DESCRIPTION:
    # This class is intended to build pure Java packages from Java sources
    @@ -16,8 +16,8 @@
    # addressed by an ebuild by putting corresponding files into the target
    # directory before calling the src_compile function of this eclass.

    -case ${EAPI:-0} in
    - 5|6) inherit eutils ;; # eutils for eqawarn
    +case ${EAPI} in
    + 6) inherit eutils ;; # eutils for eqawarn
    7|8) ;;
    *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac
    @@ -468,10 +468,6 @@ java-pkg-simple_src_install() {
    java-