Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/wikicloth/files/, dev-ruby/wikicloth/
Date: Wed, 12 Dec 2018 09:30:56
Message-Id: 1544606952.bb90530d2d255ec025bff6db16ccdc6eb141d06d.graaff@gentoo
1 commit: bb90530d2d255ec025bff6db16ccdc6eb141d06d
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 12 09:29:12 2018 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 12 09:29:12 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb90530d
7
8 dev-ruby/wikicloth: remove masked package, bug 661262
9
10 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
11
12 dev-ruby/wikicloth/Manifest | 1 -
13 .../files/wikicloth-0.8.3-fix-tests.patch | 68 ----------------------
14 dev-ruby/wikicloth/metadata.xml | 11 ----
15 dev-ruby/wikicloth/wikicloth-0.8.3.ebuild | 44 --------------
16 4 files changed, 124 deletions(-)
17
18 diff --git a/dev-ruby/wikicloth/Manifest b/dev-ruby/wikicloth/Manifest
19 deleted file mode 100644
20 index 13b48d3fa5e..00000000000
21 --- a/dev-ruby/wikicloth/Manifest
22 +++ /dev/null
23 @@ -1 +0,0 @@
24 -DIST wikicloth-0.8.3.tar.gz 120576 BLAKE2B 50b9982e048ec095264b2aa1f965e25ca5f8082ed0e2a7803546dcf7e904465dcdcdc84756caa8f9ae580333f5d86fde735f327e60a9b1ab7eb007c94e73629b SHA512 8b9e1fbfd58a965ad93d5963d6b9e22eaf6b6805a4946b47a8b5f88071e4321c72f5715619622b404807a4b2bfcd6e966812a80b1f9c5fdd767cc6b7ade79221
25
26 diff --git a/dev-ruby/wikicloth/files/wikicloth-0.8.3-fix-tests.patch b/dev-ruby/wikicloth/files/wikicloth-0.8.3-fix-tests.patch
27 deleted file mode 100644
28 index b50752a9ae9..00000000000
29 --- a/dev-ruby/wikicloth/files/wikicloth-0.8.3-fix-tests.patch
30 +++ /dev/null
31 @@ -1,68 +0,0 @@
32 -From 5c84028cadb36e7e2a220c7ab05398722c6d0e84 Mon Sep 17 00:00:00 2001
33 -From: Per Andersson <avtobiff@×××××.com>
34 -Date: Sat, 10 Oct 2015 22:33:58 +0200
35 -Subject: [PATCH 1/2] Update output assert in autolinking pre statement
36 -
37 -The <pre> tag doesn't keep html entities.
38 ----
39 - test/wiki_cloth_test.rb | 2 +-
40 - 1 file changed, 1 insertion(+), 1 deletion(-)
41 -
42 -diff --git a/test/wiki_cloth_test.rb b/test/wiki_cloth_test.rb
43 -index 2f0481a..483cecf 100644
44 ---- a/test/wiki_cloth_test.rb
45 -+++ b/test/wiki_cloth_test.rb
46 -@@ -58,7 +58,7 @@ class WikiClothTest < Test::Unit::TestCase
47 - test "autolinking keeps html entities intact" do
48 - wiki = WikiCloth::Parser.new(:data => "<div>&amp; &gt;</div><pre>&amp; &lt;</pre> https://github.com/repo/README.md &gt; &amp;")
49 - data = wiki.to_html
50 -- assert_equal "\n<p><div>&amp; &gt;</div><pre>&amp; &lt;</pre> <a href=\"https://github.com/repo/README.md\">https://github.com/repo/README.md</a> &gt; &amp;</p>", data
51 -+ assert_equal "\n<p><div>&amp; &gt;</div><pre>&amp;amp&#59; &amp;lt&#59;</pre> <a href=\"https://github.com/repo/README.md\">https://github.com/repo/README.md</a> &gt; &amp;</p>", data
52 - end
53 -
54 - test "image url override" do
55 -
56 -From a7eccc2970b0f1b1973881fe139b1f2cb51af2eb Mon Sep 17 00:00:00 2001
57 -From: Per Andersson <avtobiff@×××××.com>
58 -Date: Sat, 10 Oct 2015 22:40:25 +0200
59 -Subject: [PATCH 2/2] Update output for table of content tests
60 -
61 -Newlines seems to have been removed from HTML output for TOC.
62 -
63 -* empty item in toc
64 -* toc declared as list
65 -* toc numbered
66 ----
67 - test/wiki_cloth_test.rb | 8 +++++---
68 - 1 file changed, 5 insertions(+), 3 deletions(-)
69 -
70 -diff --git a/test/wiki_cloth_test.rb b/test/wiki_cloth_test.rb
71 -index 483cecf..198295c 100644
72 ---- a/test/wiki_cloth_test.rb
73 -+++ b/test/wiki_cloth_test.rb
74 -@@ -446,7 +446,7 @@ class WikiClothTest < Test::Unit::TestCase
75 - test "empty item in toc" do
76 - wiki = WikiCloth::WikiCloth.new({:data => "__TOC__\n=A="})
77 - data = wiki.render
78 -- assert data.include?("<table id=\"toc\" class=\"toc\" summary=\"Contents\"><tr><td>\n<div id=\"toctitle\"><h2>Table of Contents</h2></div>\n<ul><li><a href=\"#A\">A</a></li></ul>\n</td></tr></table>")
79 -+ assert data.include?('<table id="toc" class="toc" summary="Contents"><tr><td><div id="toctitle"><h2>Table of Contents</h2></div><ul></li><li><a href="#A">A</a></li></ul></td></tr></table>')
80 - end
81 -
82 - test "pre at beginning" do
83 -@@ -458,12 +458,14 @@ class WikiClothTest < Test::Unit::TestCase
84 - test "toc declared as list" do
85 - wiki = WikiCloth::WikiCloth.new({:data => "__TOC__\n=A=\n==B==\n===C==="})
86 - data = wiki.render
87 -- assert data.include?("<table id=\"toc\" class=\"toc\" summary=\"Contents\"><tr><td>\n<div id=\"toctitle\"><h2>Table of Contents</h2></div>\n<ul><li>\n<a href=\"#A\">A</a><ul><li>\n<a href=\"#B\">B</a><ul><li><a href=\"#C\">C</a></li></ul>\n</li></ul>\n</li></ul>\n</td></tr></table>")
88 -+ puts data
89 -+ assert data.include?('<table id="toc" class="toc" summary="Contents"><tr><td><div id="toctitle"><h2>Table of Contents</h2></div><ul></li><li><a href="#A">A</a><ul><li><a href="#B">B</a><ul><li><a href="#C">C</a></li></ul></ul></ul></td></tr></table>')
90 - end
91 -
92 - test "toc numbered" do
93 - wiki = WikiCloth::WikiCloth.new({:data => "=A=\n=B=\n==C==\n==D==\n===E===\n===F===\n====G====\n====H====\n==I==\n=J=\n=K=\n===L===\n===M===\n====N====\n====O===="})
94 - data = wiki.render(:noedit => true, :toc_numbered => true)
95 -- assert data.include?("<table id=\"toc\" class=\"toc\" summary=\"Contents\"><tr><td>\n<div id=\"toctitle\"><h2>Table of Contents</h2></div>\n<ul>\n<li><a href=\"#A\">1 A</a></li>\n<li>\n<a href=\"#B\">2 B</a><ul>\n<li><a href=\"#C\">2.1 C</a></li>\n<li>\n<a href=\"#D\">2.2 D</a><ul>\n<li><a href=\"#E\">2.2.1 E</a></li>\n<li>\n<a href=\"#F\">2.2.2 F</a><ul>\n<li><a href=\"#G\">2.2.2.1 G</a></li>\n<li><a href=\"#H\">2.2.2.2 H</a></li>\n</ul>\n</li>\n</ul>\n</li>\n<li><a href=\"#I\">2.3 I</a></li>\n</ul>\n</li>\n<li><a href=\"#J\">3 J</a></li>\n<li>\n<a href=\"#K\">4 K</a><ul><ul>\n<li><a href=\"#L\">4.1 L</a></li>\n<li>\n<a href=\"#M\">4.2 M</a><ul>\n<li><a href=\"#N\">4.2.1 N</a></li>\n<li><a href=\"#O\">4.2.2 O</a></li>\n</ul>\n</li>\n</ul></ul>\n</li>\n</ul>\n</td></tr></table>")
96 -+ assert data.include?('<table id="toc" class="toc" summary="Contents"><tr><td><div id="toctitle"><h2>Table of Contents</h2></div><ul></li><li><a href="#A">1 A</a></li><li><a href="#B">2 B</a><ul><li><a href="#C">2.1 C</a></li><li><a href="#D">2.2 D</a><ul><li><a href="#E">2.2.1 E</a></li><li><a href="#F">2.2.2 F</a><ul><li><a href="#G">2.2.2.1 G</a></li><li><a href="#H">2.2.2.2 H</a></li></ul></ul><li><a href="#I">2.3 I</a></li></ul><li><a href="#J">3 J</a></li><li><a href="#K">4 K</a><ul><ul><li><a href="#L">4.1 L</a></li><li><a href="#M">4.2 M</a><ul><li><a href="#N">4.2.1 N</a></li><li><a href="#O">4.2.2 O</a></li></ul></ul></ul></ul></td></tr></table>')
97 -+
98 - end
99 - end
100
101 diff --git a/dev-ruby/wikicloth/metadata.xml b/dev-ruby/wikicloth/metadata.xml
102 deleted file mode 100644
103 index 548849f88c9..00000000000
104 --- a/dev-ruby/wikicloth/metadata.xml
105 +++ /dev/null
106 @@ -1,11 +0,0 @@
107 -<?xml version="1.0" encoding="UTF-8"?>
108 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
109 -<pkgmetadata>
110 - <maintainer type="project">
111 - <email>ruby@g.o</email>
112 - <name>Gentoo Ruby Project</name>
113 - </maintainer>
114 - <upstream>
115 - <remote-id type="github">nricciar/wikicloth</remote-id>
116 - </upstream>
117 -</pkgmetadata>
118
119 diff --git a/dev-ruby/wikicloth/wikicloth-0.8.3.ebuild b/dev-ruby/wikicloth/wikicloth-0.8.3.ebuild
120 deleted file mode 100644
121 index 9ad0db53216..00000000000
122 --- a/dev-ruby/wikicloth/wikicloth-0.8.3.ebuild
123 +++ /dev/null
124 @@ -1,44 +0,0 @@
125 -# Copyright 1999-2017 Gentoo Foundation
126 -# Distributed under the terms of the GNU General Public License v2
127 -
128 -EAPI=5
129 -USE_RUBY="ruby21 ruby22 ruby23"
130 -
131 -RUBY_FAKEGEM_RECIPE_DOC="rdoc"
132 -RUBY_FAKEGEM_EXTRADOC="README README.textile"
133 -
134 -inherit ruby-fakegem
135 -
136 -DESCRIPTION="A mediawiki parser"
137 -HOMEPAGE="https://github.com/nricciar/wikicloth"
138 -SRC_URI="https://github.com/nricciar/wikicloth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
139 -
140 -LICENSE="MIT"
141 -SLOT="0"
142 -KEYWORDS="~amd64"
143 -IUSE=""
144 -
145 -RUBY_PATCHES=( "${FILESDIR}"/${P}-fix-tests.patch )
146 -
147 -ruby_add_rdepend "dev-ruby/builder:*
148 - dev-ruby/expression_parser
149 - dev-ruby/htmlentities
150 - dev-ruby/nokogiri
151 - dev-ruby/rinku
152 - dev-ruby/twitter-text"
153 -ruby_add_bdepend "test? (
154 - dev-ruby/activesupport
155 - dev-ruby/test-unit
156 - dev-ruby/i18n )"
157 -
158 -all_ruby_prepare() {
159 - sed -i \
160 - -e '/[Bb]undler/d' \
161 - -e "/require 'simplecov'/d" \
162 - Rakefile || die "sed failed"
163 - sed -i -e '1igem "test-unit"' test/test_helper.rb
164 -}
165 -
166 -each_ruby_test() {
167 - ${RUBY} -Ilib:test test/wiki_cloth_test.rb || die
168 -}