[gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidxml/, dev-libs/rapidxml/files/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidxml/, dev-libs/rapidxml/files/

[Sam James]

commit:     0b91dabf8af25062719b31c753e8c90a397090f5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  3 21:50:19 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  3 21:50:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b91dabf

dev-libs/rapidxml: port old to EAPI 7, BDEPEND for app-arch/unzip

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/rapidxml/files/rapidxml-1.13-clang.patch | 44 +++++++++++------------
 dev-libs/rapidxml/rapidxml-1.13-r1.ebuild         | 15 ++++----
 dev-libs/rapidxml/rapidxml-1.13.ebuild            | 13 +++----
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch b/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
index 007ee19fa8d..c8e80b83039 100644
--- a/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
+++ b/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
@@ -1,23 +1,23 @@
---- rapidxml_print.hpp.orig	2015-06-21 15:46:43.330070116 +0200
-+++ rapidxml_print.hpp	2015-06-21 15:50:58.745053512 +0200
+--- a/rapidxml_print.hpp
++++ b/rapidxml_print.hpp
 @@ -102,6 +102,20 @@
-         ///////////////////////////////////////////////////////////////////////////
-         // Internal printing operations
-     
-+        // =====================================
-+        // fix for clang for this bug in gcc and others: https://sourceforge.net/p/rapidxml/bugs/16/
-+
-+        template<class OutIt, class Ch> inline OutIt print_children(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+        template<class OutIt, class Ch> inline OutIt print_element_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+        template<class OutIt, class Ch> inline OutIt print_data_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+        template<class OutIt, class Ch> inline OutIt print_cdata_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+        template<class OutIt, class Ch> inline OutIt print_declaration_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+        template<class OutIt, class Ch> inline OutIt print_comment_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+        template<class OutIt, class Ch> inline OutIt print_doctype_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+        template<class OutIt, class Ch> inline OutIt print_pi_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+
-+        // =====================================
-+
-         // Print node
-         template<class OutIt, class Ch>
-         inline OutIt print_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
+         ///////////////////////////////////////////////////////////////////////////
+         // Internal printing operations
+     
++        // =====================================
++        // fix for clang for this bug in gcc and others: https://sourceforge.net/p/rapidxml/bugs/16/
++
++        template<class OutIt, class Ch> inline OutIt print_children(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++        template<class OutIt, class Ch> inline OutIt print_element_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++        template<class OutIt, class Ch> inline OutIt print_data_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++        template<class OutIt, class Ch> inline OutIt print_cdata_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++        template<class OutIt, class Ch> inline OutIt print_declaration_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++        template<class OutIt, class Ch> inline OutIt print_comment_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++        template<class OutIt, class Ch> inline OutIt print_doctype_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++        template<class OutIt, class Ch> inline OutIt print_pi_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++
++        // =====================================
++
+         // Print node
+         template<class OutIt, class Ch>
+         inline OutIt print_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)

diff --git a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
index 316fb1fc0d3..80a5284c808 100644
--- a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
+++ b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Fast XML parser"
 HOMEPAGE="http://rapidxml.sourceforge.net/"
@@ -12,11 +10,12 @@ SRC_URI="mirror://sourceforge/rapidxml/rapidxml-${PV}.zip"
 LICENSE="Boost-1.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-clang.patch
-}
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang.patch
+)
 
 src_install() {
 	insinto /usr/include/rapidxml

diff --git a/dev-libs/rapidxml/rapidxml-1.13.ebuild b/dev-libs/rapidxml/rapidxml-1.13.ebuild
index 4b862586721..53fd6adb881 100644
--- a/dev-libs/rapidxml/rapidxml-1.13.ebuild
+++ b/dev-libs/rapidxml/rapidxml-1.13.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Fast XML parser"
 HOMEPAGE="http://rapidxml.sourceforge.net/"
@@ -12,10 +10,13 @@ SRC_URI="mirror://sourceforge/rapidxml/rapidxml-${PV}.zip"
 LICENSE="Boost-1.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
+BDEPEND="app-arch/unzip"
 
 src_install() {
 	insinto /usr/include/rapidxml
 	doins *.hpp
-	dohtml manual.html
+
+	docinto html
+	dodoc manual.html
 }