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

  • [gentoo-dev] [PATCH] java-pkg-simple.eclass: respect SLOT="0" in JAVA_L

    From Volkmar W. Pogatzki@21:1/5 to All on Fri May 26 10:20:01 2023
    Avoids the need for setting JAVA_LAUNCHER_FILENAME="${PN}" if SLOT is 0.

    Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
    ---
    eclass/java-pkg-simple.eclass | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 929ce68c6c07..f919945280b1 100644
    --- a/eclass/java-pkg-simple.eclass
    +++ b/eclass/java-pkg-simple.eclass
    @@ -161,7 +161,11 @@ fi
    # If ${JAVA_MAIN_CLASS} is set, we will create a launcher to
    # execute the jar, and ${JAVA_LAUNCHER_FILENAME} will be the
    # name of the script.
    -: "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}"
    +if [[ ${SLOT} = 0 ]]; then
    + JAVA_LAUNCHER_FILENAME="${PN}"
    +else
    + JAVA_LAUNCHER_FILENAME="${PN}-${SLOT}"
    +fi

    # @ECLASS_VARIABLE: JAVA_TESTING_FRAMEWORKS
    # @DEFAULT_UNSET
    --
    2.39.3

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Ulrich Mueller@21:1/5 to All on Fri May 26 10:50:01 2023
    On Fri, 26 May 2023, Volkmar W Pogatzki wrote:

    -: "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}"
    +if [[ ${SLOT} = 0 ]]; then
    + JAVA_LAUNCHER_FILENAME="${PN}"
    +else
    + JAVA_LAUNCHER_FILENAME="${PN}-${SLOT}"
    +fi

    This will no longer allow overriding the variable in the ebuild
    (at least not pre-inherit). Is this intentional?

    Ulrich

    -----BEGIN PGP SIGNATURE-----

    iQFDBAEBCAAtFiEEtDnZ1O9xIP68rzDbUYgzUIhBXi4FAmRwcX0PHHVsbUBnZW50 b28ub3JnAAoJEFGIM1CIQV4uvicH/jdldH3ntSvAzp3odWcBr8iPw1oOCoOXoCh+ bBlHoWQKw5dgHdX4d7VN3+9tQbuU0Z7eagPZUMAnvh81hjDcqYX9TzSAtYzbZRY5 ia0vBubfVDijvO8BnQU4WbCyQPYjb8iW8aK2DY2Mmeff/OujXez7W0TcEMWnGx4T 2F9rr3X4w5fBjPce9fq12KKDfcYAe16i1MteuVArhlwVOKwwSd336HV2g1hQX88m 7kiWO+xSXJSeVVp12k+IClFgr45ARDrgks4YlhsGK8sGwoXLxTg9obo28Z03goq4 mj03hUEnyQaQqG4Kpu6eA60+8E2GOoPljJ9g/dKQuqu3UFoQ0Tk=
    =LL5Z
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Volkmar W. Pogatzki@21:1/5 to All on Mon May 29 09:20:01 2023
    Ulrich Mueller <ulm@gentoo.org> hat am 26.05.2023 10:44 CEST geschrieben:


    On Fri, 26 May 2023, Volkmar W Pogatzki wrote:

    -: "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}"
    +if [[ ${SLOT} = 0 ]]; then
    + JAVA_LAUNCHER_FILENAME="${PN}"
    +else
    + JAVA_LAUNCHER_FILENAME="${PN}-${SLOT}"
    +fi

    This will no longer allow overriding the variable in the ebuild
    (at least not pre-inherit). Is this intentional?

    Ulrich

    It exactly does what it's supposed to do.
    No clue about "not pre-inherit". How to sanitize?
    --
    Volkmar W. Pogatzki

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Ulrich Mueller@21:1/5 to All on Mon May 29 12:00:01 2023
    On Mon, 29 May 2023, Volkmar W Pogatzki wrote:

    -: "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}"
    +if [[ ${SLOT} = 0 ]]; then
    + JAVA_LAUNCHER_FILENAME="${PN}"
    +else
    + JAVA_LAUNCHER_FILENAME="${PN}-${SLOT}"
    +fi

    This will no longer allow overriding the variable in the ebuild
    (at least not pre-inherit). Is this intentional?

    It exactly does what it's supposed to do.
    No clue about "not pre-inherit".

    With the above, JAVA_LAUNCHER_FILENAME="foo" in the ebuild will work if
    comes after the inherit line, but not if it is before it.

    How to sanitize?

    As in your v2. :)

    --=-=-Content-Type: application/pgp-signature; name="signature.asc"

    -----BEGIN PGP SIGNATURE-----

    iQFDBAEBCAAtFiEEtDnZ1O9xIP68rzDbUYgzUIhBXi4FAmR0db0PHHVsbUBnZW50 b28ub3JnAAoJEFGIM1CIQV4uT6oH+QFEz7UKkMs6dgVeVAUwikdZXe0VRwSTbkXA 36WRX0i3OQ7RU7Xe1Owaa9bUFMAM2FkqTpBLiRYPjedQ3AsHrnUzmvAE+uvji2zF yaYK53T0lQtg4Fd5/AGgSNeA9red3is7NeIB8WmOO+SrmSfN6H+aiP3XSVkF4Ql3 NyTn0KABx++CcrXUwHOLYbBbIPr2quGWTSXQ4NnZ3UibCBC11BGYf4G0Lm3oCvsP hPGPNOiRJ4LBue7KrSboPgVCdZAm6uPjin/civyeQ1Sh2BOlvqx12GTVJzDIDgc2 1O8H3ReAmX7CEoyia6snao2MVRJbfQ5vbGnidfzisYV+4ZQ2BeM=yjqj
    -----END PGP SIGNATURE-----

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