Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidxml/files/, dev-libs/rapidxml/
Date: Sun, 31 Oct 2021 12:40:17
Message-Id: 1635683925.8cb190827ef65b5711693a08333f5cf3729a0826.juippis@gentoo
1 commit: 8cb190827ef65b5711693a08333f5cf3729a0826
2 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 31 12:38:45 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 31 12:38:45 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb19082
7
8 dev-libs/rapidxml: treeclean
9
10 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
11
12 dev-libs/rapidxml/Manifest | 1 -
13 dev-libs/rapidxml/files/rapidxml-1.13-clang.patch | 23 -----------
14 .../rapidxml/files/rapidxml-1.13-iterators.patch | 48 ----------------------
15 dev-libs/rapidxml/metadata.xml | 11 -----
16 dev-libs/rapidxml/rapidxml-1.13-r1.ebuild | 26 ------------
17 5 files changed, 109 deletions(-)
18
19 diff --git a/dev-libs/rapidxml/Manifest b/dev-libs/rapidxml/Manifest
20 deleted file mode 100644
21 index 845a370f233..00000000000
22 --- a/dev-libs/rapidxml/Manifest
23 +++ /dev/null
24 @@ -1 +0,0 @@
25 -DIST rapidxml-1.13.zip 44163 BLAKE2B 9db90dfca1943c47e95541a323e1210368447c054cf072d6768031488070e375fe2aa78a4e41f61f252d4c487e94cf1e24e4d3756e3f8774b0c2c52ef86959e7 SHA512 6c10583e6631ccdb0217d0a5381172cb4c1046226de6ef1acf398d85e81d145228e14c3016aefcd7b70a1db8631505b048d8b4f5d4b0dbf1811d2482eefdd265
26
27 diff --git a/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch b/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
28 deleted file mode 100644
29 index 7609984f5a2..00000000000
30 --- a/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
31 +++ /dev/null
32 @@ -1,23 +0,0 @@
33 ---- a/rapidxml_print.hpp
34 -+++ b/rapidxml_print.hpp
35 -@@ -102,6 +102,20 @@
36 - ///////////////////////////////////////////////////////////////////////////
37 - // Internal printing operations
38 -
39 -+ // =====================================
40 -+ // fix for clang for this bug in gcc and others: https://sourceforge.net/p/rapidxml/bugs/16/
41 -+
42 -+ template<class OutIt, class Ch> inline OutIt print_children(OutIt out, const xml_node<Ch> *node, int flags, int indent);
43 -+ template<class OutIt, class Ch> inline OutIt print_element_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
44 -+ template<class OutIt, class Ch> inline OutIt print_data_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
45 -+ template<class OutIt, class Ch> inline OutIt print_cdata_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
46 -+ template<class OutIt, class Ch> inline OutIt print_declaration_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
47 -+ template<class OutIt, class Ch> inline OutIt print_comment_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
48 -+ template<class OutIt, class Ch> inline OutIt print_doctype_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
49 -+ template<class OutIt, class Ch> inline OutIt print_pi_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
50 -+
51 -+ // =====================================
52 -+
53 - // Print node
54 - template<class OutIt, class Ch>
55 - inline OutIt print_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
56
57 diff --git a/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch b/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch
58 deleted file mode 100644
59 index 06854524138..00000000000
60 --- a/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch
61 +++ /dev/null
62 @@ -1,48 +0,0 @@
63 -https://sources.debian.org/data/main/r/rapidxml/1.13-3/debian/patches/fix-iterators.patch
64 -https://bugs.gentoo.org/791328
65 ---- a/rapidxml_iterators.hpp
66 -+++ b/rapidxml_iterators.hpp
67 -@@ -18,9 +18,9 @@
68 -
69 - public:
70 -
71 -- typedef typename xml_node<Ch> value_type;
72 -- typedef typename xml_node<Ch> &reference;
73 -- typedef typename xml_node<Ch> *pointer;
74 -+ typedef typename rapidxml::xml_node<Ch> value_type;
75 -+ typedef typename rapidxml::xml_node<Ch> &reference;
76 -+ typedef typename rapidxml::xml_node<Ch> *pointer;
77 - typedef std::ptrdiff_t difference_type;
78 - typedef std::bidirectional_iterator_tag iterator_category;
79 -
80 -@@ -56,7 +56,7 @@
81 - node_iterator operator++(int)
82 - {
83 - node_iterator tmp = *this;
84 -- ++this;
85 -+ ++(*this);
86 - return tmp;
87 - }
88 -
89 -@@ -70,7 +70,7 @@
90 - node_iterator operator--(int)
91 - {
92 - node_iterator tmp = *this;
93 -- ++this;
94 -+ ++(*this);
95 - return tmp;
96 - }
97 -
98 -@@ -97,9 +97,9 @@
99 -
100 - public:
101 -
102 -- typedef typename xml_attribute<Ch> value_type;
103 -- typedef typename xml_attribute<Ch> &reference;
104 -- typedef typename xml_attribute<Ch> *pointer;
105 -+ typedef typename rapidxml::xml_attribute<Ch> value_type;
106 -+ typedef typename rapidxml::xml_attribute<Ch> &reference;
107 -+ typedef typename rapidxml::xml_attribute<Ch> *pointer;
108 - typedef std::ptrdiff_t difference_type;
109 - typedef std::bidirectional_iterator_tag iterator_category;
110 -
111
112 diff --git a/dev-libs/rapidxml/metadata.xml b/dev-libs/rapidxml/metadata.xml
113 deleted file mode 100644
114 index cb1847380d2..00000000000
115 --- a/dev-libs/rapidxml/metadata.xml
116 +++ /dev/null
117 @@ -1,11 +0,0 @@
118 -<?xml version="1.0" encoding="UTF-8"?>
119 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
120 -<pkgmetadata>
121 - <maintainer type="project">
122 - <email>sci@g.o</email>
123 - <name>Gentoo Science Project</name>
124 - </maintainer>
125 - <upstream>
126 - <remote-id type="sourceforge">rapidxml</remote-id>
127 - </upstream>
128 -</pkgmetadata>
129
130 diff --git a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
131 deleted file mode 100644
132 index d072ba673bc..00000000000
133 --- a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
134 +++ /dev/null
135 @@ -1,26 +0,0 @@
136 -# Copyright 1999-2021 Gentoo Authors
137 -# Distributed under the terms of the GNU General Public License v2
138 -
139 -EAPI=7
140 -
141 -DESCRIPTION="Fast XML parser"
142 -HOMEPAGE="http://rapidxml.sourceforge.net/"
143 -SRC_URI="mirror://sourceforge/rapidxml/rapidxml-${PV}.zip"
144 -
145 -LICENSE="Boost-1.0 MIT"
146 -SLOT="0"
147 -KEYWORDS="~amd64 ~x86"
148 -
149 -BDEPEND="app-arch/unzip"
150 -
151 -PATCHES=(
152 - "${FILESDIR}"/${P}-iterators.patch
153 - "${FILESDIR}"/${P}-clang.patch
154 -)
155 -
156 -src_install() {
157 - insinto /usr/include/rapidxml
158 - doins *.hpp
159 - docinto html
160 - dodoc manual.html
161 -}