From e23a08d0c97a0cc415aaa165da840b056f93c997 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Oct 2021 23:06:07 +0100 Subject: gentoo resync : 08.10.2021 --- dev-ruby/rmagick/Manifest | 4 +-- dev-ruby/rmagick/rmagick-4.1.2.ebuild | 67 ----------------------------------- dev-ruby/rmagick/rmagick-4.2.2.ebuild | 22 ++++++++++-- 3 files changed, 20 insertions(+), 73 deletions(-) delete mode 100644 dev-ruby/rmagick/rmagick-4.1.2.ebuild (limited to 'dev-ruby/rmagick') diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest index 880760d76fa7..b0a72289f6c2 100644 --- a/dev-ruby/rmagick/Manifest +++ b/dev-ruby/rmagick/Manifest @@ -1,7 +1,5 @@ DIST rmagick-3.2.0.gem 1950208 BLAKE2B 5d4255fec8fcfb8ec2f6f361fd54a3371935dbae323918b2fe1aea47645f160024a8dd16582acf5c930639a50f702b2062e475d231c3bb0acc0bd83ac9ea00ed SHA512 f6f15b013699da5c61e83ecf4ca16d64e7e2f447dc721c7db55cad6b880f9805eb8bdcbf70aef3e30a82f38bbab8ca093d8c6d2ce761cde4f47209e3f99a9f16 -DIST rmagick-4.1.2.tar.gz 1978867 BLAKE2B f89aadb3d0dc5274376c2fef335cbcef3bdfec3fa9aa2f9e0d1982c9d2b5568689a427c3b2f7536c0585316c0f53ca7111c3da30f8136df4c878782668830847 SHA512 671ce8ef0d2387d6f0091a7a7a79a5ee9a5c5cd9340f5d29b4a35227c2293eae5e0e5c9ef16a83dc24ed0cb59cc7258427f8880484f7bb49dfaccb00d280e2b4 DIST rmagick-4.2.2.tar.gz 1984143 BLAKE2B 8b8119a0002c48f3a289f72d4bbea6ac86cbecb287b34ddc14ca126fd2d951a34aefa39d68603dc4c9de674d346e47ef9e3b2c8ed96a5bc081373a4184a3ec40 SHA512 0a6a30a631786ea310d2c8add297abd527588be755d021143d6c64fbb597006aefef859c374604f8d26b0f8b1f6cd8a5f1cdd6489772ee713c71681f3980c7fd EBUILD rmagick-3.2.0.ebuild 1571 BLAKE2B 64042d8dca87fbb45cbbda5027238f514e3b318e8411bbc5533d69c1f363a29929059a3ece5feaae36addc9e2da64ea18329315a6b9dd2ccf3fc2c4d1b8818dd SHA512 bae5e087c94971cb2e5c5b1e60e72fbbfde68e134166d1ecd8b2f75deb61d2adcba6a43bc345f8395cc699c798e68ebc5b6d9402fc18ba9a4ba768de7551a5e7 -EBUILD rmagick-4.1.2.ebuild 1815 BLAKE2B 28b551d3619913b9a89e3b3185f19959d82ad4f1536befbded1c96afed760aed4c52b9095fcfad8d7a2c2e73dc54246211358fcff459d9096996c8b04cdb65bb SHA512 8d3eb2320c6f37bc65dfdbbf2b19498132e85024544728ed0a9915db12a950bf21505bed98d6f75488e13dcfd0bcb9e42563bf0fe7e5bfff5b431f08f35b06d8 -EBUILD rmagick-4.2.2.ebuild 1847 BLAKE2B 1313919f4b9104cb2ba305be3a4e590d7cc0996840fb9d1a5a2b8122379d83f1e0fb892093983c678dd9862340d65ba3af8d1b01f8f96bd482e063e3610bb25a SHA512 95e4e82fbd9dff8819b768124817aa73ed428112bf50b0e7b3d21a3195f2f9f1651a91ef01c29ef03826096b139246ec23817c3f0521cdd17aadf1f92015ad51 +EBUILD rmagick-4.2.2.ebuild 2350 BLAKE2B 2fabcd5effb838935edaa22c252a54ea267c26e68b7fad78967346d55e80e79a89d428312d4b7b7d0a203021031d9f237dc8079652b19528bbbfd54fc94b5dbb SHA512 f428cb34408b52bec1439c1d90028e9a33b19d9836d511fac9ef2bc9b4282de50626680afe99dafee75a1d6ab7c0c2ea227baef89721483327e21b3e16d1baef MISC metadata.xml 342 BLAKE2B cb38f3f9a158134520f82cef13b3322af5ebbe3b638bf695077e17406d754643ced9878aa304424057f0fd63da296efb787b40f5249d02e0d5993e2815256c00 SHA512 014d14485664346a449dff7c9a0c01bd1f6c549a6842da456bcb10c4f0b38111ccb025a8507f222e756cd4d136de6a217689e0ac807cf7fd0e3f806a6069fd28 diff --git a/dev-ruby/rmagick/rmagick-4.1.2.ebuild b/dev-ruby/rmagick/rmagick-4.1.2.ebuild deleted file mode 100644 index 0efd8df2af44..000000000000 --- a/dev-ruby/rmagick/rmagick-4.1.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -USE_RUBY="ruby24 ruby25 ruby26 ruby27" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_TASK_DOC="" - -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec" - -MY_PV=RMagick_${PV//\./-} - -inherit multilib ruby-fakegem - -DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library" -HOMEPAGE="https://github.com/rmagick/rmagick" -SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -RUBY_S="rmagick-${MY_PV}" - -LICENSE="Artistic" -SLOT="4" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="doc" - -RDEPEND+=" >=media-gfx/imagemagick-6.9.0:=" -DEPEND+=" test? ( >=media-gfx/imagemagick-6.9.0:=[jpeg,webp] )" - -all_ruby_prepare() { - # Avoid unused dependency on rake-compiler. This also avoids an - # extra compile during tests. - sed -i -e '/extensiontask/ s:^:#:' \ - -e '/ExtensionTask/,/end/ s:^:#:' \ - -e '/compile/ s:^:#:' Rakefile || die - sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die - sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die - - # Squelch harmless warning about imagemagick installation. - sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die - - # Reading PDFs is not allowed by the default Gentoo security policy for imagemagick - sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die -} - -each_ruby_configure() { - ${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed" -} - -each_ruby_compile() { - emake -Cext/RMagick V=1 - cp ext/RMagick/RMagick2$(get_modname) lib/ || die -} - -all_ruby_install() { - all_fakegem_install - - docinto examples - dodoc examples/* - - if use doc ; then - docinto . - dodoc -r doc - fi -} diff --git a/dev-ruby/rmagick/rmagick-4.2.2.ebuild b/dev-ruby/rmagick/rmagick-4.2.2.ebuild index 3cb79596f21d..5b061481d8a1 100644 --- a/dev-ruby/rmagick/rmagick-4.2.2.ebuild +++ b/dev-ruby/rmagick/rmagick-4.2.2.ebuild @@ -25,11 +25,11 @@ RUBY_S="rmagick-${MY_PV}" LICENSE="Artistic" SLOT="4" -KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~hppa ppc ppc64 x86" IUSE="doc" RDEPEND+=" >=media-gfx/imagemagick-6.9.0:=" -DEPEND+=" test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,webp] )" +DEPEND+=" test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] )" all_ruby_prepare() { # Avoid unused dependency on rake-compiler. This also avoids an @@ -44,7 +44,7 @@ all_ruby_prepare() { sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die # Reading PDFs is not allowed by the default Gentoo security policy for imagemagick - sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die + #sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die # Update version number hardcoded in tests sed -i -e 's/"7.0"/"7.1"/' spec/rmagick/image/channel_mean_spec.rb || die @@ -53,6 +53,22 @@ all_ruby_prepare() { mkdir tmp } +each_ruby_test() { + # Borrowed from media-gfx/gscan2pdf + # Needed to avoid test failures on e.g. ppc, bug #815856 + # (Unclear why it doesn't manifest on amd64 here at least) + local confdir="${HOME}/.config/ImageMagick" + mkdir -p "${confdir}" || die + cat > "${confdir}/policy.xml" <<-EOT || die + + + + + EOT + + RSPEC_VERSION="3" ruby-ng_rspec +} + all_ruby_install() { all_fakegem_install -- cgit v1.2.3