On 09/19 11:33, Sebastian Reitenbach wrote:
> Hi,
>
> with updating the default ruby version to 3.0, puppet related ports stayed at
> 2.7, so did
> databases/ruby-hiera3. The hiera plugins were overlooked, they should also
> default to Ruby 2.7, otherwise they're unusable.
>
> I had to fiddle a little, as these plugins don't have FLAVOR set, and with
> the switch,
> to 3.0, something else seems to have changed as well. At least for
> ruby-hiera-eyaml,
> The GEM_BIN_SUFFIX in PLIST doesn't kick in, as well as for
> ruby-hiera-eyaml-gpg,
> had to remove the ${MODRUBY_FLAVOR} from the RUN_DEPENDS to ruby-hiera-eyaml.
> Below the version that got me to install them, and made them usable again.
I don't understand why you need to set this. Using ,${MODRUBY_FLAVOR}
in the RUN_DEPENDS should correctly set the dependency information.
This change looks wrong, since it looks like if you build it with a
ruby30 FLAVOR, it will build a package that has a ruby30 FLAVOR embedded
in it, but with ruby27 information.
You only need to specify a ruby version inside a port if the port
doesn't support ruby* FLAVORs. If the port supports ruby* FLAVORS,
then you do not need to specify a ruby version in the port, you just
need to build it with the correct FLAVOR.
Is the issue that ruby27 versions of ruby-hiera-eyaml-gpg and
ruby-hiera-eyaml aren't built by default? You can just change the
category Makefile to build ruby27 versions of the ports by default.
If that doesn't work, can you post the actual error you are
getting with -current puppet?
Thanks,
Jeremy
>
> OK?
>
> Sebastian
>
> Index: ruby-hiera-eyaml-gpg/Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/ruby-hiera-eyaml-gpg/Makefile,v
> retrieving revision 1.4
> diff -u -r1.4 Makefile
> --- ruby-hiera-eyaml-gpg/Makefile 22 Oct 2019 13:54:39 -0000 1.4
> +++ ruby-hiera-eyaml-gpg/Makefile 19 Sep 2021 21:20:37 -0000
> @@ -3,6 +3,7 @@
> COMMENT = gpg encryptor for the hiera eyaml backend
>
> DISTNAME = hiera-eyaml-gpg-0.7.4
> +REVISION = 0
> CATEGORIES = databases
>
> HOMEPAGE = http://github.com/sihil/hiera-eyaml-gpg
> @@ -14,9 +15,10 @@
> MODULES = lang/ruby
>
> CONFIGURE_STYLE = ruby gem
> +MODRUBY_REV = 2.7
>
> BUILD_DEPENDS = ${RUN_DEPENDS}
> -RUN_DEPENDS = databases/ruby-hiera-eyaml,${MODRUBY_FLAVOR} \
> +RUN_DEPENDS = databases/ruby-hiera-eyaml \
> security/ruby-gpgme,${MODRUBY_FLAVOR}
>
> .include <bsd.port.mk>
> Index: ruby-hiera-eyaml/Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/ruby-hiera-eyaml/Makefile,v
> retrieving revision 1.15
> diff -u -r1.15 Makefile
> --- ruby-hiera-eyaml/Makefile 23 May 2021 18:36:40 -0000 1.15
> +++ ruby-hiera-eyaml/Makefile 19 Sep 2021 21:20:46 -0000
> @@ -3,6 +3,7 @@
> COMMENT = Hiera backend for decrypting encrypted yaml properties
>
> DISTNAME = hiera-eyaml-3.2.2
> +REVISION = 0
> CATEGORIES = databases
>
> MAINTAINER = Sebastian Reitenbach <[email protected]>
> @@ -11,6 +12,7 @@
> PERMIT_PACKAGE = Yes
>
> MODULES = lang/ruby
> +MODRUBY_REV = 2.7
>
> CONFIGURE_STYLE = ruby gem
>
> Index: ruby-hiera-eyaml/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/databases/ruby-hiera-eyaml/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -r1.7 PLIST
> --- ruby-hiera-eyaml/pkg/PLIST 10 Mar 2021 22:05:08 -0000 1.7
> +++ ruby-hiera-eyaml/pkg/PLIST 19 Sep 2021 21:20:46 -0000
> @@ -1,5 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.7 2021/03/10 22:05:08 sebastia Exp $
> -${GEM_BIN}/eyaml${GEM_BIN_SUFFIX}
> +${GEM_BIN}/eyaml27
> ${GEM_LIB}/cache/${DISTNAME}.gem
> ${GEM_LIB}/gems/${DISTNAME}/
> ${GEM_LIB}/gems/${DISTNAME}/.github/
> Index: ruby-hiera-file/Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/ruby-hiera-file/Makefile,v
> retrieving revision 1.9
> diff -u -r1.9 Makefile
> --- ruby-hiera-file/Makefile 12 Jul 2019 20:44:01 -0000 1.9
> +++ ruby-hiera-file/Makefile 19 Sep 2021 21:20:59 -0000
> @@ -3,7 +3,7 @@
> COMMENT = data backend for Hiera to return whole files
>
> DISTNAME = hiera-file-1.1.1
> -REVISION = 1
> +REVISION = 2
> CATEGORIES = databases
>
> MAINTAINER = Sebastian Reitenbach <[email protected]>
> @@ -12,6 +12,7 @@
> PERMIT_PACKAGE = Yes
>
> MODULES = lang/ruby
> +MODRUBY_REV = 2.7
>
> CONFIGURE_STYLE = ruby gem
>
