gentoo resync : 28.11.2020

3 files changed, 4 insertions, 31 deletions

diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index 4d5794396651..19de4ac04e47 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -2,9 +2,8 @@ AUX pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch 1670 BLAKE2B f5e44
 AUX pugixml-1.9-always-install-the-pkg-config-file.patch 2820 BLAKE2B 768af20490d163f581a4c683426055fe50fee716e29124d4af28d1a347dbb4e48ff4ea95eab93820ec69d875ece957f66977ff68288b452ba20d2151b9c8c78d SHA512 5ce40e7838ec950902a02b74ebd81958ff821e0dc0a2d8be8d65e194c40c32056f137a8cdbbfa9beaf43665f261c3a8db18e8f6485c3b903f7e59840702ee250
 AUX pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch 1641 BLAKE2B 281f24717276e7e21d380d048e6e6896fdc89de88f1ee8745b9880b0c39d5c0043af6f408bd2bfb6dbbea1ef3e516635ea486ed1f247e5b5ef19f7c7e01358a0 SHA512 60a1b80b26d663cccc2da4ed3b2fa631ffe1dd09a62d7e42a00d28844cb097be6c682aa6ecf92e2ce3d9c20569e23d2f1e8133af6c1eb4ceb3f99692fa5c1623
 DIST pugixml-1.10.tar.gz 381990 BLAKE2B ea446d11fe5213a5250b7e737a9e80a3976454724e1a1c326b689214ad4d3e183abd417a7782b3d5c68a0aabce42228e121352e4d2dd33f5f2bb2334f6c72c27 SHA512 bfc80661005d0a0fb82ca6d5299e5efdd1bb468e11ee52d7ee9367e15776d28efb60266ce03842715cd43aae023afc2b369797bb3cbecd6d6a65c3ae3903e469
-DIST pugixml-1.9.tar.gz 377369 BLAKE2B 39b5b0d63a20e9c15c5634e56f82207aed63843d252900db94dbf06d100d03916a16523ccb9de433cc94ded4a9e9d1dc11f47bfd6fd75e348a9a2af31c305db6 SHA512 853a9d985aae537391c6524d5413ef4de237d99d96cc58ea7fe7152f786df1e408cdacd2e4387697e23c3e67cdc1d42b29de554501309eae16d86edd0e24785f
+DIST pugixml-1.11.tar.gz 385889 BLAKE2B e3acd45c396f56e4bd4d265f4fcb68fd5c8127acc5aaaf147ff7d50ac8340cef14b31369ca09762f1d3be9781b13f30a6976244cf99bdb4aec6f737e7bf9413d SHA512 a559be72910dc6d9d74c32f1b5389b173bc92858f627e61007a5f2284da251d8511e08571b870e7c6ce6e18cf42ef42fdb10f8b30b608067b452ccb9105d5ade
 EBUILD pugixml-1.10.ebuild 571 BLAKE2B 882d1cf798f1b6f033d26204059fef59169588d7f939620f8a61dbbfe582d9c6888bc9918b657841cef5eba110dee6a977dab63a5a2c731ceb2d9a329635d447 SHA512 eefcb601ccfe5aa7c529ab220a1e21faaf3fdf4dfbac06f847e268ec6b784d7f6d3962d57d53b92c0645d735529d7f8ed56009ddbcecedc0f640b5f5f20420ef
-EBUILD pugixml-1.9-r1.ebuild 776 BLAKE2B 85ff23be70e107f4163ad8e518bf8ae3a8b4ff0ac37cfd24a2375317e09d538908b1d729822ed44547577c3d73e0b9bafbebc1a9ca87adf05e3b474d2f89cfad SHA512 8c560bda6ace8d80345c3fcbed113e06321828709a3f080826242303ec2c8d8664bfe7c18b19b123c22913f398337d4f223d39d34f7ae50e9eebda2e0b6302e0
-EBUILD pugixml-1.9.ebuild 586 BLAKE2B 96f5e5452308058f3cc2fbc102cf679b216d24807f89cea88c63685089dac7a4ace3e6ec26bf9d46c7f50da59200f62f91b838d5b919cc7a3660c1ba47375681 SHA512 a43e0e3e7c28274910daaa84f7f8b85d4dace40ca5b380175146f48c4b689bb567685132c001de439e979affa504593e230338f06cb25379a202c5511ec529d8
+EBUILD pugixml-1.11.ebuild 576 BLAKE2B 03902967dd711c63b01b8e11c1769f769f7b4df57dd889b87f23c316abe8bf746339058de220644decefaf133d8032c45c480cfcf4d51addc164e8894543c800 SHA512 71bc00b077502f5592e41f36ab6faea344caaff4a8e5787c5ddf88f0ff151bc313811594d0ce83e6506a60879c2f8009c7e4c1f49532f2c8ba3a5f6b1499ec28
 EBUILD pugixml-9999.ebuild 569 BLAKE2B 353fb5e610b766647e1e3bd921a05390dec00f185d193437f96d7a8cf0bbfda8813168243dc80bf0b3cc1fd8c4e1c9e8e83b27590e1a3018f3a5ef1947f66e41 SHA512 248a298f4cde950be75592de172fc89fd36d979fcd76684c63e652456a60cd84a6bc0f2312248de003e4bc0771ce3bf2c9b28ff5c72087be245c202af50fbc99
 MISC metadata.xml 346 BLAKE2B 68e81d68ef327995169a33c1716bf546958902854870095704000abc97634073a87945a54968a1e167bb94b845032b5ab3d8822b1663e7fb3fdfdb5abaf0d789 SHA512 90152b3b666bf26a6b0be0a411aff980d340ab1b38e2068a170b809c883e7a1c29de6adc0c8aef90b5702682a8fe548ba59e2bf077cc3ad145f9d1e3699afcaa
diff --git a/dev-libs/pugixml/pugixml-1.9-r1.ebuild b/dev-libs/pugixml/pugixml-1.11.ebuild
index 9524a4044813..0750359ebd79 100644
--- a/dev-libs/pugixml/pugixml-1.9-r1.ebuild
+++ b/dev-libs/pugixml/pugixml-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
@@ -18,9 +18,3 @@ HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/"
 
 LICENSE="MIT"
 SLOT="0"
-
-PATCHES=(
-	"${FILESDIR}/${P}-always-install-the-pkg-config-file.patch"
-	"${FILESDIR}/${P}-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch"
-	"${FILESDIR}/${P}-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch"
-)
diff --git a/dev-libs/pugixml/pugixml-1.9.ebuild b/dev-libs/pugixml/pugixml-1.9.ebuild
deleted file mode 100644
index 66f69a3ac620..000000000000
--- a/dev-libs/pugixml/pugixml-1.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake-utils
-
-DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
-HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/"
-SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_SHARED_LIBS=ON )
-	cmake-utils_src_configure
-}