From 0bff53119f08d677db6c1a991bd30741682a8a08 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 2 Jun 2018 17:13:10 +0100 Subject: Revert "gentoo resync : 02.06.2018" This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec. --- dev-ruby/haml/Manifest | 5 ++-- dev-ruby/haml/haml-4.0.7-r2.ebuild | 49 -------------------------------- dev-ruby/haml/haml-5.0.2.ebuild | 57 ++++++++++++++++++++++++++++++++++++++ dev-ruby/haml/haml-5.0.4.ebuild | 2 +- 4 files changed, 61 insertions(+), 52 deletions(-) delete mode 100644 dev-ruby/haml/haml-4.0.7-r2.ebuild create mode 100644 dev-ruby/haml/haml-5.0.2.ebuild (limited to 'dev-ruby/haml') diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest index d8e92364824e..9debbcd6bab7 100644 --- a/dev-ruby/haml/Manifest +++ b/dev-ruby/haml/Manifest @@ -1,6 +1,7 @@ DIST haml-4.0.7.gem 121856 BLAKE2B e2598df73b9bf7337c06f60b30fcf7925fa5948f4643051aabbbdf600d25dbc2f614c4cf2054a916f69ef431847279eee1fbdf02e9bf2811369f2c195ed00413 SHA512 5736ded231bb10a0c0932453294604075e24a9020c2658e703c13ebf7a8d148327188157f982a3aea5db6d6938beb372c0167dfbc4ff06325517b2c8bd71a568 +DIST haml-5.0.2.tar.gz 124000 BLAKE2B 852a674d0519ca785fdd448295c402f203d21e627e9dccbbbfe835ed51fe19d4110c908e14cb40c18644e758d609d3651dddd750df7208627e108832c2f06cc9 SHA512 c266a48424db4c9949d29bdb72f2c96ef5878a78ae98867b9259b0e2e2f581cb9fecf4c51091e6bce3ba4d86c60b44e8c7e95759a8aec8c95d59b9707903032e DIST haml-5.0.4.tar.gz 124580 BLAKE2B c22e464be26f65bd94b202b21604bb9fe3d740865832c9299d93606293794316a5262504e15583fdc2628a3015ea58f9924a9b3aab2f46340b305ad5af7968ac SHA512 125ae514f800b2dd58f7f339ef3bf8c15114c5738813d911985182d4e4b1e8551c92a89149427aa8bf3326f45c8f71f4f13f37ecb7e2bee5cb75163538f6a3a8 EBUILD haml-4.0.7-r1.ebuild 1243 BLAKE2B 58a5b3eb31abf8a1d7587f42a2f2b1eef5a4f82bfb3c92d524b77bc29caccb571cf01495c688dc6cfe5bfa942d2e8fea344e07c8d5e6bd53852fd3116c803e54 SHA512 6d3187990262735c7ad65c2fec793f5b9faa347e9c2233e389632c7263a4a7853de261da820056488cf9d227efae6e5af4c41a6449f0581b10271a5f938ab805 -EBUILD haml-4.0.7-r2.ebuild 1271 BLAKE2B fb1cad324e3c909854eeb4022651a152bb2608d41209bcbc898d8bc3ec3db4c13744357b43d62c73af6cc3e55864540084c26142de3f857464952431ac014740 SHA512 c77e3d4b71c77b250eaf2a8b929b3e43cf59ea63e1102456181c959cd313cbdfe95d49110da1cd01436f2a68317841258623c69490e951f50160fde195d68d6c -EBUILD haml-5.0.4.ebuild 1602 BLAKE2B c86d75293465adf42cbb51466bd3e25b5051fc2452b5f6deb575fddecd669e2bc455889d4ecae69cc26c0c7fddd1c0e04bd31368c0669ca7df106877b356296d SHA512 c828a45bf5f6cc3ce7ee583ea183eb7372c1b25caabda39e3143f86ca0abfa1837e5ba0e3a327151c32c03789aa02daf56e92a0cf6c01f9db0d190ccec776cae +EBUILD haml-5.0.2.ebuild 1575 BLAKE2B efa40e6be7a11f7640d7a25a5b67b72131809e91f51cc918992aad4c0f50596d1231e83316041bff2c1abe49932a956edc9eb2ded785bff9aa49c230a66c22e7 SHA512 2e94b46ec7568a777ebb0f868b03aca76bf4fde9a9e1765188b0805829fc8d4896821b5de4d501b4333e38874ab6963c3752f0a2746fbf481982ad83da7a378e +EBUILD haml-5.0.4.ebuild 1602 BLAKE2B eb733f77db4d3e03a894e48a3536182dec41c5b59e6fcd808422a7bd8e00297289ffe091368377667da75278c4d77e1188f17db2c95578e8dd6beade8285551a SHA512 2e4b920a9a38ab95731be6e070f1a949fd23dff162da76638135abd2c02dbc98cd6ec16247d2ecb109ca0349fa491f436f27f8f555f3d354d7a3ca98a03be3b8 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09 diff --git a/dev-ruby/haml/haml-4.0.7-r2.ebuild b/dev-ruby/haml/haml-4.0.7-r2.ebuild deleted file mode 100644 index f2c698f635d3..000000000000 --- a/dev-ruby/haml/haml-4.0.7-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -USE_RUBY="ruby22 ruby23 ruby24" - -RUBY_FAKEGEM_TASK_TEST="test" -RUBY_FAKEGEM_TASK_DOC="-Ilib doc" - -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md" -RUBY_FAKEGEM_DOCDIR="doc" - -RUBY_FAKEGEM_BINWRAP="" - -inherit ruby-fakegem - -DESCRIPTION="A ruby web page templating engine" -HOMEPAGE="http://haml-lang.com/" - -LICENSE="MIT" -SLOT="4" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -IUSE="doc test" - -RDEPEND="${RDEPEND} !!=dev-ruby/maruku-0.7.2-r1 - )" - -all_ruby_prepare() { - # Remove test that fails when RedCloth is available - sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,+9 s/^/#/"\ - test/filters_test.rb || die - # Avoid tests that are fragile for whitespace - sed -i -e '/test_\(text_area\|partials_should_not_cause_textareas\)/,/^ end/ s:^:#:' test/helper_test.rb || die -} diff --git a/dev-ruby/haml/haml-5.0.2.ebuild b/dev-ruby/haml/haml-5.0.2.ebuild new file mode 100644 index 000000000000..d1bb7677ad7b --- /dev/null +++ b/dev-ruby/haml/haml-5.0.2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +USE_RUBY="ruby22 ruby23" + +RUBY_FAKEGEM_TASK_TEST="test" +RUBY_FAKEGEM_TASK_DOC="-Ilib doc" + +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md" +RUBY_FAKEGEM_DOCDIR="doc" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="A ruby web page templating engine" +HOMEPAGE="http://haml.info/" +SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="5" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +IUSE="doc test" + +RDEPEND="${RDEPEND} !!=dev-ruby/temple-0.8.0 dev-ruby/tilt:*" + +ruby_add_bdepend " + test? ( + dev-ruby/minitest:5 + dev-ruby/nokogiri + dev-ruby/railties:4.2 + dev-ruby/activemodel:4.2 + dev-ruby/actionpack:4.2 + ) + doc? ( + dev-ruby/yard + >=dev-ruby/maruku-0.7.2-r1 + )" + +all_ruby_prepare() { + sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die + + sed -i -e '/bundler/ s:^:#:' \ + -e 's/gem "minitest"/gem "minitest", "~>5.0"/'\ + -e '1igem "actionpack", "~>4.2"'\ + -e '1igem "activesupport", "~>4.2"; gem "activemodel", "~>4.2"'\ + -e '1igem "railties", "~>4.2"'\ + test/test_helper.rb || die + # Remove test that fails when RedCloth is available + sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,/^ end/ s/^/#/"\ + test/filters_test.rb || die +} diff --git a/dev-ruby/haml/haml-5.0.4.ebuild b/dev-ruby/haml/haml-5.0.4.ebuild index 22d89343e9a2..5edf17354124 100644 --- a/dev-ruby/haml/haml-5.0.4.ebuild +++ b/dev-ruby/haml/haml-5.0.4.ebuild @@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64- IUSE="doc test" -RDEPEND="${RDEPEND} !!=dev-ruby/temple-0.8.0 dev-ruby/tilt:*" -- cgit v1.2.3