From nobody Wed Jun 29 05:55:00 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E0B3986DAA6; Wed, 29 Jun 2022 05:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LXrK05vB7z3p65; Wed, 29 Jun 2022 05:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656482100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NCB2mc+5X2/cNTZn2cDwa6eFM7irIDRAzDds3oPX3RQ=; b=FOaY+qlMS6wjtgqbbEnWqvodTiX0YhuoS6NkzIuKteC1KPfVQC3bfFx/dQ6wSBsE+ZyRqt ExYz1leC4EjidyubBd1r8pLz2dYTOEqixvx+QDCIeiGFBG52DJpkTljM4OVDgvJyk9a8uk wyUuf1lpYGTHo3r7G2RCsMkyio8E3z5Q4la4fePafA6sZ38fDogCpaEjejQjXP5mhige6e nVVmrHCCcRVnTFG/XfOlrVFcdA4rTMbYd4aiTa5/G211i9coNybrWQCTyhraOVNLabuCOP ienPGR+cdzD5GP4aWdf3NW2TeXKrCgwNONlYj0KCe6QeDQ6RpcCjTuN91/pOnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB1214108; Wed, 29 Jun 2022 05:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25T5t070012567; Wed, 29 Jun 2022 05:55:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25T5t09C012566; Wed, 29 Jun 2022 05:55:00 GMT (envelope-from git) Date: Wed, 29 Jun 2022 05:55:00 GMT Message-Id: <202206290555.25T5t09C012566@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Romain=20Tarti=C3=A8re?= Subject: git: 14dd59de61a1 - main - devel/rubygem-pdk: Fix packaging List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14dd59de61a1b65bd280535c2761bbe7c03dcf76 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656482100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NCB2mc+5X2/cNTZn2cDwa6eFM7irIDRAzDds3oPX3RQ=; b=yeUi9T8G5Yufqaz8vSquA81zvaFF4WBBfjOb8bmzE+cphzZevGLGyGZD+Dymq9E0mZI+fR 6yKpfYmLbDhN8sdrDMlRriLGI0ArjPj8kELaOkcJDnwBZ8xJpzxUzBt/3+Tojx3gXuzyKv Opp0nXsMghZ31DJpRjaEQNkG5u6d8fXT5oygPl4NwTyTcaHKYyQyG48hMQJmtOhiARmbyV S57ddnBQh3P9/VlT+0QiiAJayyoEGg0wRu6XPowCuOfa8QSWccRZRPWVgVzB2LCnuSUAOh Y4SDKSV6PySxdej+Fbs1BYftzNdJzDGkeH+4qnnTJEeHSl4wUBVi8R57IzX3og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656482100; a=rsa-sha256; cv=none; b=prF35vc4DmrawXu7uoXoWFN8WkdwXSV2yrkSVmunCySwkaJ+yZIroImXjmmZ8eLTjxdGAT 0aAG3dJ/t92Na04Sy+576wmtSE9/+iCHPpCvuxzk7+7DhDN1bYVjE+iwKxCWoggBPRJ+EJ txaIktU3nomVLoxq9Nf/Qj0+RKelc21JBSM9A+nYTFhwwFQdU513fRhEfmUT75YiKBq8ST QPr5Z1YaapcfYByrUseqxbQgFooFhB803fGnFvgdED4he+nrGyTAJEUROx0fOiBJjJU8UP m5W2PKhxH7Jg+U7Y55ttD1YtQpw/vfSNfck8GxhWS73/Oj5y94Y0tSEyFc5l+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=14dd59de61a1b65bd280535c2761bbe7c03dcf76 commit 14dd59de61a1b65bd280535c2761bbe7c03dcf76 Author: Romain Tartière AuthorDate: 2022-06-29 05:54:16 +0000 Commit: Romain Tartière CommitDate: 2022-06-29 05:54:44 +0000 devel/rubygem-pdk: Fix packaging While here, mark broken with "modern" Ruby because it use some legacy Ruby syntax but when corrected still fails with nonexistent dependencies: https://github.com/puppetlabs/puppet-module-gems/issues/166 With hat: puppet --- devel/rubygem-pdk/Makefile | 3 ++ .../files/patch-lib_pdk_cli_exec_command.rb | 20 +++++----- .../files/patch-lib_pdk_util_bundler.rb | 46 +++++++++++----------- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/devel/rubygem-pdk/Makefile b/devel/rubygem-pdk/Makefile index d8f253f0b7b2..8cad6a4cb69f 100644 --- a/devel/rubygem-pdk/Makefile +++ b/devel/rubygem-pdk/Makefile @@ -28,6 +28,9 @@ RUN_DEPENDS= rubygem-bundler>=1.15:sysutils/rubygem-bundler \ rubygem-tty-spinner>=0.5:devel/rubygem-tty-spinner \ rubygem-tty-which>=0.3:devel/rubygem-tty-which +BROKEN_RUBY30= yes +BROKEN_RUBY31= yes + USES= gem USE_RUBY= yes diff --git a/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb b/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb index 3b382ad89ec7..752848908f62 100644 --- a/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb +++ b/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb @@ -1,11 +1,11 @@ ---- lib/pdk/cli/exec/command.rb.orig 2022-02-13 01:06:51 UTC +--- lib/pdk/cli/exec/command.rb.orig 2022-06-29 04:55:12 UTC +++ lib/pdk/cli/exec/command.rb -@@ -187,7 +187,7 @@ module PDK - - resolved_env['GEM_HOME'] = PDK::Util::RubyVersion.gem_home - gem_path = PDK::Util::RubyVersion.gem_path -- resolved_env['GEM_PATH'] = gem_path.empty? ? resolved_env['GEM_HOME'] : gem_path -+ # resolved_env['GEM_PATH'] = gem_path.empty? ? resolved_env['GEM_HOME'] : gem_path - - # Make sure invocation of Ruby prefers our private installation. - package_binpath = PDK::Util.package_install? ? File.join(PDK::Util.pdk_package_basedir, 'bin') : nil +@@ -187,7 +187,7 @@ module PDK + + resolved_env['GEM_HOME'] = PDK::Util::RubyVersion.gem_home + gem_path = PDK::Util::RubyVersion.gem_path +- resolved_env['GEM_PATH'] = gem_path.empty? ? resolved_env['GEM_HOME'] : gem_path ++ # resolved_env['GEM_PATH'] = gem_path.empty? ? resolved_env['GEM_HOME'] : gem_path + + # Make sure invocation of Ruby prefers our private installation. + package_binpath = PDK::Util.package_install? ? File.join(PDK::Util.pdk_package_basedir, 'bin') : nil diff --git a/devel/rubygem-pdk/files/patch-lib_pdk_util_bundler.rb b/devel/rubygem-pdk/files/patch-lib_pdk_util_bundler.rb index aee8e54bf96f..12f5515fd640 100644 --- a/devel/rubygem-pdk/files/patch-lib_pdk_util_bundler.rb +++ b/devel/rubygem-pdk/files/patch-lib_pdk_util_bundler.rb @@ -1,24 +1,24 @@ ---- lib/pdk/util/bundler.rb.orig 2022-02-13 01:09:14 UTC +--- lib/pdk/util/bundler.rb.orig 2022-06-29 05:24:26 UTC +++ lib/pdk/util/bundler.rb -@@ -21,12 +21,7 @@ module PDK - return - end - -- unless bundle.locked? -- # Generate initial default Gemfile.lock, either from package cache or -- # by invoking `bundle lock` -- bundle.lock! -- end -- -+ if bundle.locked? - # Check if all dependencies will be available once we update the lockfile. - begin - original_lockfile = bundle.gemfile_lock -@@ -40,6 +35,7 @@ module PDK - end - - bundle.update_lock!(with: gem_overrides, local: all_deps_available) -+ end - - # If there are missing dependencies after updating the lockfile, let `bundle install` - # go out and get them. If the specified puppet gem version points to a remote location +@@ -21,12 +21,7 @@ module PDK + return + end + +- unless bundle.locked? +- # Generate initial default Gemfile.lock, either from package cache or +- # by invoking `bundle lock` +- bundle.lock! +- end +- ++ if bundle.locked? + # Check if all dependencies will be available once we update the lockfile. + begin + original_lockfile = bundle.gemfile_lock +@@ -40,6 +35,7 @@ module PDK + end + + bundle.update_lock!(with: gem_overrides, local: all_deps_available) ++ end + + # If there are missing dependencies after updating the lockfile, let `bundle install` + # go out and get them. If the specified puppet gem version points to a remote location