[cygport - the Cygwin packaging tool] branch master, updated. 0.36.3

[cygport - the Cygwin packaging tool] branch master, updated. 0.36.3

[Jon Turney]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=25423edd01d8efae771557ac27e6d14895bb0e5b

commit 25423edd01d8efae771557ac27e6d14895bb0e5b
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Thu Apr 27 15:10:01 2023 +0100

    Bump version to 0.36.3

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=a2410e09164b191931bc4a277bfd20203a2ee516

commit a2410e09164b191931bc4a277bfd20203a2ee516
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Thu Apr 27 17:09:49 2023 +0100

    Update for updated ruby

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=7f48b6a45e69571975905cfa1d19c46890291aa4

commit 7f48b6a45e69571975905cfa1d19c46890291aa4
Author: Daisuke Fujimura <booleanlabel@gmail.com>
Date:   Sun Apr 23 14:24:10 2023 +0100

    pkg_info: add automatic determination of the appropriate ruby_xy0 requirement
    
    Add a ruby_xy0 requirement for packages which own files in the
    vendor_ruby directory, and for packages which contain executables or
    shared libraries dynamically linked with cygprubyxy0.dll.
    
    (Based on 6d34ca9e54a3 ("lib/pkg_info.cygport: implement automatic
    determination of the appropriate perl5_0xy requirement"))


Diff:
---
 NEWS                                  |  3 +++
 cygport.spec                          |  2 +-
 data/sample.cygport                   |  2 +-
 lib/pkg_info.cygpart                  | 21 +++++++++++++++-
 meson.build                           |  2 +-
 testsuite/ruby/gem/ruby-rack-ssl.list | 45 -----------------------------------
 6 files changed, 26 insertions(+), 49 deletions(-)

diff --git a/NEWS b/NEWS
index 67d0853c..03c58f8c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+0.36.3:
+	* Add automatic determination of the appropriate rub_xy requirement
+
 0.36.2:
 	* git: Try to fetch 'main' branch if 'master' branch doesn't exist.
 	* python-wheel: Handle PEP 518 projects with only pyproject.toml
diff --git a/cygport.spec b/cygport.spec
index e4379ad2..bfa77fbf 100644
--- a/cygport.spec
+++ b/cygport.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           cygport
-Version:        0.36.2
+Version:        0.36.3
 Release:        1%{?dist}
 Summary:        Cygwin package building tool
 
diff --git a/data/sample.cygport b/data/sample.cygport
index 80928e13..f6b85b19 100644
--- a/data/sample.cygport
+++ b/data/sample.cygport
@@ -1,7 +1,7 @@
 inherit meson
 
 NAME="cygport"
-VERSION=0.36.2
+VERSION=0.36.3
 RELEASE=1
 CATEGORY="Devel"
 SUMMARY="Cygwin source packaging tool"
diff --git a/lib/pkg_info.cygpart b/lib/pkg_info.cygpart
index b9022d73..37cfa676 100644
--- a/lib/pkg_info.cygpart
+++ b/lib/pkg_info.cygpart
@@ -81,7 +81,7 @@ __list_deps() {
 	local mldep mldir mllib
 	local phpdep phpmoddir pldep pldirs plver
 	local pydep pydirs pyexts pyscr pysite pyver
-	local rbdep rbdirs gemdir gemextdir gemspecdir
+	local rbdep rbdirs rbver gemdir gemextdir gemspecdir
 	local tcldep tclpkgs vapidep vapidir
 	local tcgcclibdir tcgccsysroot
 	local dlltool="dlltool"
@@ -599,6 +599,19 @@ for suffix, mode, type in imp.get_suffixes(): print(suffix)')
 		done
 	fi
 
+	rbver=( $(find "${@//^_^/ }" -path "usr/*/ruby/vendor_ruby/[0-9].[0-9]/*" \
+	        | sed -E 's!usr/.*/ruby/vendor_ruby/([0-9]).([0-9])/.*!ruby_\1\2!' \
+	        | sort -ru) )
+	if [ "${#rbver[@]}" -gt 1 ]
+	then
+		warning "More than one targeted Ruby version: ${rbver[*]},"
+		warning "using only the latest as dependency: ${rbver[0]}."
+	fi
+	if [ "${#rbver[@]}" -gt 0 ] && [ "${PN}" != "ruby" ]
+	then
+		echo "${rbver[0]}"
+	fi
+
 	if [ $(find "${@//^_^/ }" -path 'usr/share/doc/*' -prune \
 		${deps_prune} \
 		-o -path 'usr/share/help/*' -prune \
@@ -637,6 +650,7 @@ for suffix, mode, type in imp.get_suffixes(): print(suffix)')
 	alldeps+=" "$(find "${@//^_^/ }" -type l | xargs -r readlink -f)
 
 	# add perl5_0xy requirement if linked with cygperl5_xy.dll
+	# add ruby_xy requirement if linked with cygrubyxy0.dll
 	for dll in $(echo ${alldeps} | tr \\n ' ' ) ; do
 	    case "${dll##*/}" in
 		cygperl5_[0-9][0-9].dll)
@@ -644,6 +658,11 @@ for suffix, mode, type in imp.get_suffixes(): print(suffix)')
 		    plver="${plver%%.dll}"
 		    echo "perl5_0${plver}"
 		    ;;
+		cygruby[0-9][0-9]0.dll)
+		    rbver="${dll##*cygruby}"
+		    rbver="${rbver%%0.dll}"
+		    echo "ruby_${rbver}"
+		    ;;
 	    esac
 	done
 
diff --git a/meson.build b/meson.build
index 74a89281..e7ef4a39 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('cygport',
-        version: '0.36.2')
+        version: '0.36.3')
 
 bindir = join_paths(get_option('prefix'), get_option('bindir'))
 datadir = join_paths(get_option('prefix'), get_option('datadir'))
diff --git a/testsuite/ruby/gem/ruby-rack-ssl.list b/testsuite/ruby/gem/ruby-rack-ssl.list
index bac57e13..3452a8f2 100644
--- a/testsuite/ruby/gem/ruby-rack-ssl.list
+++ b/testsuite/ruby/gem/ruby-rack-ssl.list
@@ -1,48 +1,3 @@
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/Rack.html
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/Rack/SSL.html
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/css/fonts.css
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/css/rdoc.css
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/fonts/Lato-Light.ttf
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/fonts/Lato-LightItalic.ttf
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/fonts/Lato-Regular.ttf
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/fonts/Lato-RegularItalic.ttf
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/fonts/SourceCodePro-Bold.ttf
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/fonts/SourceCodePro-Regular.ttf
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/add.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/arrow_up.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/brick.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/brick_link.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/bug.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/bullet_black.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/bullet_toggle_minus.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/bullet_toggle_plus.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/date.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/delete.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/find.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/loadingAnimation.gif
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/macFFBgHack.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/package.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/page_green.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/page_white_text.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/page_white_width.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/plugin.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/ruby.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/tag_blue.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/tag_green.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/transparent.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/wrench.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/wrench_orange.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/zoom.png
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/index.html
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/darkfish.js
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/navigation.js
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/navigation.js.gz
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/search.js
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/search_index.js
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/search_index.js.gz
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/searcher.js
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/searcher.js.gz
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/table_of_contents.html
 /usr/share/gems/doc/rack-ssl-1.4.1/ri/Rack/SSL/call-i.ri
 /usr/share/gems/doc/rack-ssl-1.4.1/ri/Rack/SSL/cdesc-SSL.ri
 /usr/share/gems/doc/rack-ssl-1.4.1/ri/Rack/SSL/default_hsts_options-c.ri