From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jan 2022 20:27:28 +0000 Subject: gentoo resync : 16.01.2021 --- dev-ruby/rubygems/Manifest | 6 +- dev-ruby/rubygems/files/gentoo-defaults-5.rb | 44 ++++------- dev-ruby/rubygems/rubygems-3.2.31.ebuild | 110 --------------------------- dev-ruby/rubygems/rubygems-3.2.33.ebuild | 110 +++++++++++++++++++++++++++ 4 files changed, 126 insertions(+), 144 deletions(-) delete mode 100644 dev-ruby/rubygems/rubygems-3.2.31.ebuild create mode 100644 dev-ruby/rubygems/rubygems-3.2.33.ebuild (limited to 'dev-ruby/rubygems') diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest index 0797fe014537..b9e521f6f81e 100644 --- a/dev-ruby/rubygems/Manifest +++ b/dev-ruby/rubygems/Manifest @@ -3,7 +3,7 @@ AUX auto_gem.rb.ruby19 509 BLAKE2B 3aeb669d0dc6c6016091375adf8df8f8a2b810d40e11b AUX conf.d-gem_server 81 BLAKE2B 2019f1b5085a824e1a9e0551a8b224391b1db777f15aea7fa613faa1c7a51f6c0015f92c16a95c0c368ad701c125307c0535ca1029891345476636fe45289fb8 SHA512 71630a0530ec62f4024d9bfc4e6afe1f409f3bcb5d71ee5876d1e190c9e69016571ca8f500fcc7ffea6cbc36a8dab5eef2d0c61f72de99f2776c9137010b9ccd AUX gentoo-defaults-3.rb 1899 BLAKE2B 5a0d83e40bae62ce76e1caf609cc931aaa6cd40ff41ccdc68f0bdfd9559b8691dbc7293d72715b0555122c8c87e695660e8ebff326a2b2805fbfde8711318e48 SHA512 5da2b92f6ca56ed3fa9e51258f9e5c13883c8da34236b609c0d43ef8b788b97a6d5fb2ede235340d8ed99c0c09b32ff76bb6a3f190d55b5b2e1832f66af0d3cd AUX gentoo-defaults-4.rb 1907 BLAKE2B 6e41d5534d47ef7bad5ae798fff81dd8ab928ef97f771150d7d6198e7d10fd5ec8625c044a77a8549d7ebf0947a4578e8cd860b5362f3a8c7352495a14928857 SHA512 86b25f61689044496dbf41424664e0109714abc212a536a75e20146617c55176b9a77edcc2c633de30ecacaf0f48c8f7820007bed1dd2d4c31e004f545fdfb2b -AUX gentoo-defaults-5.rb 2035 BLAKE2B 6b55cd77e987cb0cb36b85b36514a8639d75ad3461d015cf6529f376af502b1dd550422f0f9c798e32899b4bc23b58602c8b18b9d5f2dec336b48314d9c19b77 SHA512 18f2b5a319650217503839b14b0063e1f67cb60a329767c58f65c02abba68ffe6b86f8c7496a3ea77ee8186b7fc8c819f3849625bff5506d97d7110193d0ffdf +AUX gentoo-defaults-5.rb 1362 BLAKE2B 2410b639b383080eb1a3905b603d94dabe5a1c6ab0362080a441c42da33885a383237f06c10f7698ffa551315dea8b78c289ae86065115d87e180c28b5c33eac SHA512 fb1e2062f7a7cb3742473f7b4f7dc91aa5e5de9d7996f3b9037f87a3752851d71b727140b96423843f1fedf2de47b528dc8cdabd53bb1c0500d382041968a56c AUX gentoo-defaults.rb 972 BLAKE2B 4353b782296ad04f400fbdbd67dcc2f26b23a9bc4a716d107a8f98c5058676c675eb42e1d5e0a7214cd74df9148d54220c0202189938c45f4000301e52a3a73f SHA512 fd5a33c433041efeefba4bb8d550b8db66f31d4c0966188f07943f4f575ee9e13da6ef6fd66f89a4b3b979c5b310d96e2876407b79aee6ed404ca3027859160c AUX init.d-gem_server2 505 BLAKE2B ea5807a1c8ffdaa61bf37315c71d910bbf2bf4b0b4c62e3cef3b76176e9cc1fc39272f59bd46e55e17427f730315e2c691fa3f471c1cbf697073c45c0c7589a2 SHA512 fc2c57f4deebf479a36e69c3507f109abeda9f73b22bb2e617f56e6be0069af075fa6d66708d7324922f3d8bfaa96bd8c71292d9e388e27217cc7687ab4004e1 DIST rubygems-3.0.3.tgz 904175 BLAKE2B d99de4bdd51779ab214bc4a81f55483341a2c193d4304b8eeb6105cb95877e0a33fe03d93c47433ad3c6bdc8d3e453e33ffb799fd36164feac31616f95eeced4 SHA512 1dd585243341901c7b4cc60a4902000c10ce57fe2cc9c28e27e274a2e6029f936cde1c99d7097c93c2c5b2c8bcee5d692c8fe5cc00c996a040e4954b674e330e @@ -11,11 +11,11 @@ DIST rubygems-3.0.9.tgz 886153 BLAKE2B 942f641c7dec30d3dd2f0756d04b1b6b071f5d3b5 DIST rubygems-3.1.6.tgz 996339 BLAKE2B 8dc242a64c6f934b876de841cb6ea86455d7754cbe3902620a10ac40bb97264c03c1002b45a5734d1882617d95e8b390873ed390d00fe7e54b6d8f11a301c2b3 SHA512 730381cf683cd57f7ea7889f63cf21abb699bf28d2a25fa63f510756ece285cb63e4208130c20fa7c0232d6093d869e5d99d5b5fdad9bc68be5e8ead21863d97 DIST rubygems-3.2.14.tgz 987419 BLAKE2B cfd1545f022194f8b7a99b1698a38d4cfae08b8fe25c45fc7b7c935953ec7a66b0b00f21f77eefe757226d80f19a2093f2b85767e5caabfe13f445fbf6dc5508 SHA512 de28bdfdc239cd49bb5a1f78f0a9e3ec432fb70c8326c7899f7ef0a088f60becd99ba81285b20388296f96afb46ca3ca359208621d88a6be68b7388d155a2383 DIST rubygems-3.2.22.tgz 1236895 BLAKE2B c4782e064d2d9748519f915264411e11151edf9273e6a0473e70c39d9fc484b0c2d45e5fe4f00c6b83d9f27393a487c9e0b87a6f9d02449b370ae64a32f891a6 SHA512 6872e08b22ed3903e9d6e67ed03bb79f1ab6819eac0837b9f1003c0ef88ee751a380f9f55e548988baf2658470fcad204eca289acbd2043e04a9d12ed23eac16 -DIST rubygems-3.2.31.tar.gz 11219985 BLAKE2B befb5910365e109e130ca63fb71cc9b94ad92ab0eac41808a2d1955bb062a0c548e9faf283e0bc4b65409041ba4ffdc665335c920417e176bea7d2b08b7c2418 SHA512 34f934b4091a883c9e583563e37f7238c817c1dc9634506239ecd177b7c3cffee49eaaa33c6e9f52dfd7ee195609f2b6d7096254e2fb995396b835c9526f0a3f +DIST rubygems-3.2.33.tar.gz 12131881 BLAKE2B 6ec9321d808df2ee1bbde7f9889471bb7dbadb719872577a9f04863ccf7c314f6b9e2edb178efa8b1996070112673163efb2cf7501d289cecbddd134770dcb12 SHA512 dcabbbbc57031ffa3ca04227a631323559ea99cb0b26e082b3bc51dd4f9b34b996903c7701932aa303192c0483a9e1c66661424233937d1d406773b4279263a4 EBUILD rubygems-3.0.3.ebuild 4646 BLAKE2B 42f400a5286dea3ff7aa5f3739f7d259ba56bb147d8fdcc5644ec583d0ea98fc7337bc3e9def844a293d09a8bb9745184822b09f7d7c6dc71ec0689e3bf44166 SHA512 4d86e443da752f2422437e9426cbdd32cf32db2ddc7bc36a20f382c4756c9251c96e79e581b93ba2764bece593c95a0c79b7a1063c2c202aec4afd58f0840752 EBUILD rubygems-3.0.9.ebuild 2635 BLAKE2B 45c6fa75ffd962eebe61fa8fca8a7867dd0cacd5a0503d3ba946cb1f13b0f00f54a90adaf0d069c2550d510e912fa2619cbcbb6b1f65421075062270fc7bb367 SHA512 e2c67911e5a521cb630bdd071d0dadab5a775e965918cf73fa3f3f8cfabfaa81a64d2f189c063d72689d9f6a1453f61a95044c52d9f3f4e36d3b91f3e97225b0 EBUILD rubygems-3.1.6.ebuild 2839 BLAKE2B a43114e777b786bdca79c591dcf10bbbedbcb09e7518cd37f9823a526f92e8c96ab3a16b920998877e239c3e12661adb829a4483fc7736a9721c97424129b1dd SHA512 04745c5b1c8b7f4601de19f41c72a8be8a8ba7ec2d3eb7c351a41d8d0330522555d12ebe93dc24675853a1203b7efdca2a6061920afb875a662d8b75b7391857 EBUILD rubygems-3.2.14.ebuild 3154 BLAKE2B 12e440bb8a187063330c58307299c10119258238741af575582fa13e15802266e0fbec31f1b07ba9736b785925f622ac56e0a13034c9f89faca59083d84fbf09 SHA512 ab894afb51c0114f355b7189739c34de8e0718c08fad6566dc48ea6e8e7f648958da55e71d5e8efc4a09cb40aa9915705a9fe61cef0f483d02a26c96c89b3ad7 EBUILD rubygems-3.2.22.ebuild 3147 BLAKE2B 3467a6f8ede381989f2a4303a001e01f979be15c8fa98dfe5af556443d38e4bdf72281b69e1e0fe2cf41beae1552ca5c1f5304e474c72b9b380aacf0dd4d642d SHA512 aecbf87c7f97725fdc2858ca1397aa8c0de13e7e760c28ff7005b0ff11db58018398d79d533746e098d15bfe2080412573755eda872bb4139c4c8ba4d9adb45f -EBUILD rubygems-3.2.31.ebuild 3319 BLAKE2B 2cea263f93591b45b02303a66263bc07c23169df65ac58eab7cf1371312507e270224290ba40229dcd1e244e3d58739be6962bf0604c4c91380260f43e1146b1 SHA512 bee763825c7404308ce13dc14ff53f30efe0eeab4a0da051edf0b134c53270e6e77da53307c6522e6f2ae21b131892344233108852ca8a33de7a1155ecb67c80 +EBUILD rubygems-3.2.33.ebuild 3319 BLAKE2B 0d0efee6da06e03dc0b229f897c023e79c6c4ad374ae46479472a93111eac292fc1ee5ccab7a9701c1d9a980cacbf8653117643cd4ff2bf6905c5b21358a9831 SHA512 23abd59af15c2872995048144e8bf87e61912e2a25a405a9a37f758248f9ecb0f22c65e5897fec5679702d064b454b2a9b8e391eef45567f41ce6906bde29057 MISC metadata.xml 336 BLAKE2B ecfca0944e7009be46f398152d0858c119a01660c84767594af30797d15407baa8ad6b2ad464d1e561c9688fcaa701d9f1316942a5c32a6041aa29eb28b42f3b SHA512 533cd9bc43b23201a785034e5a8ba954201c37024d654fb57e848c1ab6eb99ef98398be224a4d346d8431d1e10a7ddedb2134babea287082b348dd1ff2392803 diff --git a/dev-ruby/rubygems/files/gentoo-defaults-5.rb b/dev-ruby/rubygems/files/gentoo-defaults-5.rb index 602ad0e4055e..b6ac5554b121 100644 --- a/dev-ruby/rubygems/files/gentoo-defaults-5.rb +++ b/dev-ruby/rubygems/files/gentoo-defaults-5.rb @@ -6,30 +6,23 @@ # /usr/local and to keep /usr managed by Gentoo. This policy file # ensures that all manually installed gems using "gem install" as root # are installed in /usr/local. Gentoo gems are installed in /usr. - -# TODO: We used to manipulate the default_dir, but this no longer -# works since this is now the base for the new "default" gems that -# ruby 2.6 uses with irb. So default_dir should refer to the system -# default now. rubygems also provides various hooks so we may be able -# to use those to install gems in /usr/local by default in a less -# intrusive way. module Gem class << self - def portage_gems_dir + def gentoo_gems_dir RbConfig::CONFIG['sitelibdir'].gsub('site_ruby', 'gems') end - def bindir + def gentoo_bindir Process.euid.zero? ? '@GENTOO_PORTAGE_EPREFIX@/usr/local/bin' : File.join(user_home, 'bin') end - def local_dir - portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr', - '@GENTOO_PORTAGE_EPREFIX@/usr/local') + def gentoo_local_dir + gentoo_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr', + '@GENTOO_PORTAGE_EPREFIX@/usr/local') end - def install_dir - Process.euid.zero? ? local_dir : user_dir + def gentoo_install_dir + Process.euid.zero? ? gentoo_local_dir : user_dir end undef :default_path @@ -38,27 +31,16 @@ module Gem path << user_dir if user_home && File.exist?(user_home) path << default_dir path << vendor_dir if vendor_dir && File.directory?(vendor_dir) - path << local_dir - path << portage_gems_dir - end - - def system_config_path - '@GENTOO_PORTAGE_EPREFIX@/etc' + path << gentoo_local_dir + path << gentoo_gems_dir end - # Set Gentoo defaults for gem commands - begin - undef :operating_system_defaults - rescue NameError - # Avoid either runtime errors or redefinition warnings since - # this method is not present in all rubygem versions distributed - # with dev-lang/ruby. - end def operating_system_defaults + options = "--install-dir #{gentoo_install_dir} --bindir #{gentoo_bindir}" { - 'install' => "--install-dir #{install_dir}", - 'uninstall' => "--install-dir #{install_dir}", - 'update' => "--install-dir #{install_dir}" + 'install' => options, + 'uninstall' => options, + 'update' => options } end end diff --git a/dev-ruby/rubygems/rubygems-3.2.31.ebuild b/dev-ruby/rubygems/rubygems-3.2.31.ebuild deleted file mode 100644 index b0596c49d95d..000000000000 --- a/dev-ruby/rubygems/rubygems-3.2.31.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -USE_RUBY="ruby26 ruby27 ruby30" - -inherit ruby-ng prefix - -DESCRIPTION="Centralized Ruby extension management system" -HOMEPAGE="https://rubygems.org/" -LICENSE="GPL-2 || ( Ruby MIT )" - -SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -IUSE="server test" -RESTRICT="!test? ( test )" - -PDEPEND="server? ( =dev-ruby/builder-3* )" - -ruby_add_depend "virtual/ruby-ssl" - -ruby_add_bdepend " - test? ( - dev-ruby/json - dev-ruby/minitest:5 - dev-ruby/rake - dev-ruby/rdoc - dev-ruby/webrick - )" - -all_ruby_prepare() { - # Remove unpackaged automatiek from Rakefile which stops it from working - sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die - - mkdir -p lib/rubygems/defaults || die - cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die - - eprefixify lib/rubygems/defaults/operating_system.rb - - # Disable broken tests when changing default values: - sed -i -e '/test_default_path/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die - sed -i -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' test/rubygems/test_gem_path_support.rb || die - # Avoid test that won't work as json is also installed as plain ruby code - sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die - - # Avoid test that requires additional utility scripts - rm -f test/test_changelog_generator.rb || die - - # Update manifest after changing files to avoid a test failure - if use test; then - rake update_manifest || die - fi -} - -each_ruby_compile() { - # Not really a build but... - sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem -} - -each_ruby_test() { - # Unset RUBYOPT to avoid interferences, bug #158455 et. al. - #unset RUBYOPT - - if [[ "${EUID}" -ne "0" ]]; then - RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \ - -e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed" - else - ewarn "The userpriv feature must be enabled to run tests, bug 408951." - eerror "Testsuite will not be run." - fi -} - -each_ruby_install() { - # Unset RUBYOPT to avoid interferences, bug #158455 et. al. - unset RUBYOPT - export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" - - pushd lib &>/dev/null - doruby -r * - popd &>/dev/null - - local sld=$(ruby_rbconfig_value 'sitelibdir') - insinto "${sld#${EPREFIX}}" # bug #320813 - newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb - - newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') -} - -all_ruby_install() { - dodoc CHANGELOG.md README.md - - if use server; then - newinitd "${FILESDIR}/init.d-gem_server2" gem_server - newconfd "${FILESDIR}/conf.d-gem_server" gem_server - fi -} - -pkg_postinst() { - if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then - eselect ruby set $(eselect --brief --colour=no ruby show | head -n1) - fi - - ewarn - ewarn "To switch between available Ruby profiles, execute as root:" - ewarn "\teselect ruby set ruby(25|26|...)" - ewarn -} diff --git a/dev-ruby/rubygems/rubygems-3.2.33.ebuild b/dev-ruby/rubygems/rubygems-3.2.33.ebuild new file mode 100644 index 000000000000..752c178a4872 --- /dev/null +++ b/dev-ruby/rubygems/rubygems-3.2.33.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby26 ruby27 ruby30" + +inherit ruby-ng prefix + +DESCRIPTION="Centralized Ruby extension management system" +HOMEPAGE="https://rubygems.org/" +LICENSE="GPL-2 || ( Ruby MIT )" + +SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +SLOT="0" +IUSE="server test" +RESTRICT="!test? ( test )" + +PDEPEND="server? ( =dev-ruby/builder-3* )" + +ruby_add_depend "virtual/ruby-ssl" + +ruby_add_bdepend " + test? ( + dev-ruby/json + dev-ruby/minitest:5 + dev-ruby/rake + dev-ruby/rdoc + dev-ruby/webrick + )" + +all_ruby_prepare() { + # Remove unpackaged automatiek from Rakefile which stops it from working + sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die + + mkdir -p lib/rubygems/defaults || die + cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die + + eprefixify lib/rubygems/defaults/operating_system.rb + + # Disable broken tests when changing default values: + sed -i -e '/test_default_path/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die + sed -i -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' test/rubygems/test_gem_path_support.rb || die + # Avoid test that won't work as json is also installed as plain ruby code + sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die + + # Avoid test that requires additional utility scripts + rm -f test/test_changelog_generator.rb || die + + # Update manifest after changing files to avoid a test failure + if use test; then + rake update_manifest || die + fi +} + +each_ruby_compile() { + # Not really a build but... + sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem +} + +each_ruby_test() { + # Unset RUBYOPT to avoid interferences, bug #158455 et. al. + #unset RUBYOPT + + if [[ "${EUID}" -ne "0" ]]; then + RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \ + -e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed" + else + ewarn "The userpriv feature must be enabled to run tests, bug 408951." + eerror "Testsuite will not be run." + fi +} + +each_ruby_install() { + # Unset RUBYOPT to avoid interferences, bug #158455 et. al. + unset RUBYOPT + export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" + + pushd lib &>/dev/null + doruby -r * + popd &>/dev/null + + local sld=$(ruby_rbconfig_value 'sitelibdir') + insinto "${sld#${EPREFIX}}" # bug #320813 + newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb + + newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') +} + +all_ruby_install() { + dodoc CHANGELOG.md README.md + + if use server; then + newinitd "${FILESDIR}/init.d-gem_server2" gem_server + newconfd "${FILESDIR}/conf.d-gem_server" gem_server + fi +} + +pkg_postinst() { + if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then + eselect ruby set $(eselect --brief --colour=no ruby show | head -n1) + fi + + ewarn + ewarn "To switch between available Ruby profiles, execute as root:" + ewarn "\teselect ruby set ruby(25|26|...)" + ewarn +} -- cgit v1.2.3