Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/asciidoctor/files/, dev-ruby/asciidoctor/
Date: Sun, 06 Mar 2016 22:21:53
Message-Id: 1457302889.90556cf2d63ed053cf1b47d2e559d7dbade24622.mrueg@gentoo
1 commit: 90556cf2d63ed053cf1b47d2e559d7dbade24622
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 6 22:18:19 2016 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 6 22:21:29 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90556cf2
7
8 dev-ruby/asciidoctor: Remove old
9
10 Package-Manager: portage-2.2.27
11
12 dev-ruby/asciidoctor/Manifest | 2 -
13 dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild | 43 --------------------
14 dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild | 46 ----------------------
15 .../files/asciidoctor-1.5.3-slim-options.patch | 31 ---------------
16 4 files changed, 122 deletions(-)
17
18 diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
19 index b3a9124..cf72b92 100644
20 --- a/dev-ruby/asciidoctor/Manifest
21 +++ b/dev-ruby/asciidoctor/Manifest
22 @@ -1,3 +1 @@
23 -DIST asciidoctor-1.5.2.tar.gz 494239 SHA256 f10242d7ea5e8c3b6279c9535e67d58fb0b8ffe2c5625e7b211af3dd683dd368 SHA512 5d50134d4bed58bb5dc610929c30b1272c8d75e9748f6587a4e00cd8d76b4f86e8edd17b04a8579d984e9ce3864c3d96a81bc526988a6c6d71e418923c94d67a WHIRLPOOL 67cf1cdd71dd4819c2d829d729057ec0b7b6ac107a5754333eb257a80545c4229870a1ae83b14172bd52e5e8b145bc1f56db6bca6af341d6ee7ca6b63267e7c8
24 -DIST asciidoctor-1.5.3.tar.gz 509233 SHA256 b6aa27203bf9fc8ca55d0c0468f8f3e70ae1b3aa60f1bb50dd6aa53497275841 SHA512 17e5c930b2d2d1727b5b5f2100f6b625edf3af73e98aadf84135bdf01bbbef8587b310fe513508ae575ee6b8a08d573ac512fbfc3d6e9ea9e144048786865c35 WHIRLPOOL 9333bee73633e18b9c334d6f622df07e8d07c1a491852b710b2edc31c892ebbc00e2d915a9234253f7a13611988f8d53e3a791a73e4ca6cbd82e90444dce9fe1
25 DIST asciidoctor-1.5.4.tar.gz 520793 SHA256 2963fdf5ce12962e3a514d7d83426897184c947de5df89300ee524970dc2f3bc SHA512 c3a6405a6c39d1aa70e4d10ce42a6f6e01f3b7ddd8f695e8043fce9116ac91ad1f1f881a449ee8a61172213720dae1285f9c4de03a5cec908de906ed5b14e626 WHIRLPOOL bb06147e6c77fc5d0133b0b747103ec362cc724624087cb84756b2a193540e6b164aed1c8a20a1578298be135e7b65938ae07a902409ba778c25792bd6350ec9
26
27 diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild
28 deleted file mode 100644
29 index 6448f8f..0000000
30 --- a/dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild
31 +++ /dev/null
32 @@ -1,43 +0,0 @@
33 -# Copyright 1999-2015 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -EAPI=5
38 -USE_RUBY="ruby19 ruby20 ruby21"
39 -
40 -RUBY_FAKEGEM_TASK_TEST="test features"
41 -RUBY_FAKEGEM_RECIPE_DOC="rdoc"
42 -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
43 -
44 -RUBY_FAKEGEM_EXTRAINSTALL="data"
45 -
46 -inherit ruby-fakegem
47 -
48 -DESCRIPTION="Processor for converting AsciiDoc source files or strings into HTML 5, DocBook 4.5 and other formats"
49 -HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
50 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
51 -
52 -LICENSE="MIT"
53 -SLOT="0"
54 -KEYWORDS="~amd64"
55 -IUSE=""
56 -
57 -ruby_add_bdepend "test? (
58 - dev-util/cucumber
59 - dev-ruby/rspec-expectations:*
60 - dev-ruby/coderay
61 - dev-ruby/erubis
62 - dev-ruby/haml
63 - dev-ruby/nokogiri
64 - dev-ruby/slim
65 - dev-ruby/tilt )"
66 -
67 -all_ruby_prepare() {
68 - rm Gemfile || die
69 -}
70 -
71 -all_ruby_install() {
72 - all_fakegem_install
73 -
74 - doman man/asciidoctor.1
75 -}
76
77 diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild
78 deleted file mode 100644
79 index ff08e44..0000000
80 --- a/dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild
81 +++ /dev/null
82 @@ -1,46 +0,0 @@
83 -# Copyright 1999-2015 Gentoo Foundation
84 -# Distributed under the terms of the GNU General Public License v2
85 -# $Id$
86 -
87 -EAPI=5
88 -USE_RUBY="ruby20 ruby21"
89 -
90 -RUBY_FAKEGEM_TASK_TEST="test features"
91 -RUBY_FAKEGEM_RECIPE_DOC="rdoc"
92 -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
93 -
94 -RUBY_FAKEGEM_EXTRAINSTALL="data"
95 -
96 -inherit ruby-fakegem
97 -
98 -DESCRIPTION="Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats"
99 -HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
100 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
101 -
102 -LICENSE="MIT"
103 -SLOT="0"
104 -KEYWORDS="~amd64"
105 -IUSE=""
106 -
107 -RUBY_PATCHES=( ${P}-slim-options.patch )
108 -
109 -ruby_add_bdepend "test? (
110 - dev-util/cucumber
111 - dev-ruby/rspec-expectations:*
112 - dev-ruby/asciimath
113 - dev-ruby/coderay
114 - dev-ruby/erubis
115 - dev-ruby/haml
116 - dev-ruby/nokogiri
117 - dev-ruby/slim
118 - dev-ruby/tilt )"
119 -
120 -all_ruby_prepare() {
121 - rm Gemfile || die
122 -}
123 -
124 -all_ruby_install() {
125 - all_fakegem_install
126 -
127 - doman man/asciidoctor.1
128 -}
129
130 diff --git a/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch b/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch
131 deleted file mode 100644
132 index 3494269..0000000
133 --- a/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch
134 +++ /dev/null
135 @@ -1,31 +0,0 @@
136 -From 04b9d6153d1e289bd450a2f52bffde754ef4d1b0 Mon Sep 17 00:00:00 2001
137 -From: Antonio Terceiro <terceiro@×××××××××××××.org>
138 -Date: Tue, 17 Nov 2015 11:17:16 -0200
139 -Subject: [PATCH] Initialize slim-related attributes regardless of when slim
140 - was loaded
141 -
142 -Setting instance attributes of the Template class cannot depend on
143 -whether slim has been loaded before or not.
144 ----
145 - lib/asciidoctor/converter/template.rb | 8 ++++----
146 - 1 file changed, 4 insertions(+), 4 deletions(-)
147 -
148 -diff --git a/lib/asciidoctor/converter/template.rb b/lib/asciidoctor/converter/template.rb
149 -index 10eaa99..43be87b 100644
150 ---- a/lib/asciidoctor/converter/template.rb
151 -+++ b/lib/asciidoctor/converter/template.rb
152 -@@ -253,10 +253,10 @@ def scan_dir template_dir, pattern, template_cache = nil
153 - unless defined? ::Slim
154 - # slim doesn't get loaded by Tilt, so we have to load it explicitly
155 - Helpers.require_library 'slim'
156 -- if @safe && ::Slim::VERSION >= '3.0'
157 -- slim_asciidoc_opts = (@engine_options[:slim][:asciidoc] ||= {})
158 -- slim_asciidoc_opts[:safe] ||= @safe
159 -- end
160 -+ end
161 -+ if @safe && ::Slim::VERSION >= '3.0'
162 -+ slim_asciidoc_opts = (@engine_options[:slim][:asciidoc] ||= {})
163 -+ slim_asciidoc_opts[:safe] ||= @safe
164 - end
165 - # load include plugin when using Slim >= 2.1
166 - require 'slim/include' unless (defined? ::Slim::Include) || ::Slim::VERSION < '2.1'