gentoo resync 08.09.2018

10 files changed, 2 insertions, 215 deletions

diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index b1881c84d6cc..89238d46dd08 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,16 +1,3 @@
-AUX tinyxml2-1.0.9_p20121123-test.patch 618 BLAKE2B 7a0cc49f47de3a08f16e119ed44dbcab5ed0b1847c80f3560f08a4bb7365e8b3a29ac20035ec0117866ce0e975b297bd3de66456b21a3dcfdedfeef7d040af49 SHA512 c86ef1946b3ade23b0fcbddffdbd085aa998b7fd165508181613c62e5db3c998db044f2d8eb25294a3fc2bfd358c0acb475815cc7076649253157c8238c90cb9
-AUX tinyxml2-4.0.1-optional-tests.patch 1059 BLAKE2B ae179ad1a8e7e52648dbf1b3192e59d128ef30a6fa92d97536eb9a1cdb3c13c0e0ad88029969153d45b8dbb3866dd94c5799de6c35fad5e301cd53a831f67636 SHA512 18286df9b643bc89fb7cc06bc7149d565add606590715eb80855ccd960498c09387329de232af1a007a5779a9e8cc5f11f796aa8383510008a206b7e2f2efed4
-AUX tinyxml2-4.0.1-xmltest.patch 302 BLAKE2B 916495ce5e3d33219754deb14069adb2f04ee6b3c28d301fc0f6287e643f094b798882bba003a900c699c314ccf0fb20c756c044e2900efe8ed1e0f1bcc1cd4b SHA512 6485c5efea35f580b2747e458265f80e758b20dee362c97825cb420cc4421fbf0deef93bcd5401ab25565152453cc37fe448bea6323d42d0b0d25eea88eb376e
-DIST tinyxml2-2.2.0.tar.gz 455226 BLAKE2B b3e76f0cda38ad01186b85ffadc554398edaf593624b869a7954ddf4aebe484abf95596fc4e7e11c622a1a23716d38d117035237c8e2f3d4e1f2fbe5551199ce SHA512 e06edb46f96dcc58cf16c8fef91dd072c9bd6dd296bb9ba3e082db059438f5f31e0689015deee7f1c390788d9bd0e64b6f5c0235c9d2839419ee2ab1784f53c4
-DIST tinyxml2-3.0.0.tar.gz 339620 BLAKE2B 02c083462779467a40a30922b224634179d7feee19191a36d6106962e59d3cf2e29e6080628bd89881241d0010355bad619d8f47a31a0139bed219cd3476195b SHA512 724f1f6ea9bbc74b679067dfe69d156eb05f5d4a694cd825814b717dd676fe53ddc8707e0512a0c8449bb13586cc4bc085bbaca41bf8e29c304c5fafae53b1d2
-DIST tinyxml2-4.0.1.tar.gz 344295 BLAKE2B 58044e7898b4004aa0c1ec4b65d11a75c7a85568665baff419a23ac096596bf424c49d13318bee43c467de2e722c21ac3304eab8978e7ca3602e68a83fad4ac5 SHA512 4add31a72c62b3f68bdb17fb90630bc51bf96b616f4beafb413082dc77bc699b8d516fa0955d001d5d69bc3371b7ca9ce5cd9696d91dd913b09a1c10681b819e
-DIST tinyxml2-5.0.1.tar.gz 349622 BLAKE2B 13cec7ee49ad2fc2e74ce993e27de96fba45ed599b38a2d08463c2b6513be862e9f5f6c425549f0f07ee81e6fc8dc0ca1056295929c862b9da628d507dc9a3a1 SHA512 a51ec5843774df0482620c549fb6c61d30a6db5025be26ff6d25b3c53533a27a57f00b026bd9fbca78e9e30084b3f5f6fbff9dba315d078419da084b57f518ba
-DIST tinyxml2-6.0.0.tar.gz 576612 BLAKE2B e7ad757edae2d07504b76821caf7a68a8dcac90fc90dc3d0a2fedd082297e522e5cc1f294ba31f14c6046d9742a09e16a046f6d283d7e1ed165d8d35703c6cb2 SHA512 30c68f491830187738b01ca5db1a96e7b4907cf8fa09a533c90ea084ab5e73f798dff6305cfc4edccc8989926e91c0482677bb5796799113c839dbd0528c8ad5
 DIST tinyxml2-6.2.0.tar.gz 585870 BLAKE2B 6f79ffe0894d625e3a2cccaf897c13962672f090c477b6b13e8685585a304b5cf0f5069d88d61650882e55f23768514dcbeea4795e3a4758b016cb177eee44d4 SHA512 ef784240aeb090ab04aad659352ad4b224c431feecf485f33aca7936bcaa0ef4ab9d0a2e0692d3cf6036ac3e8012019d65665e780a920bbad3d4820f736445b1
-EBUILD tinyxml2-2.2.0.ebuild 745 BLAKE2B a3274f447601fe19bf427e42fc8ca0985d299e724843dab48fbf6748cd66bdcec5ad03cc40ce1314405d24a138a49c8fd79164fe02b7f340071fdb47ea7957ae SHA512 7eccbdbed726312173a7d46f3fde4deb07998797b7f4f0cec97cad1ea8c55ae6e87eaa460b25932dbd2236b2b90e2f7f35ed4dc5ebdb26a22f5c5a90ff3876db
-EBUILD tinyxml2-3.0.0.ebuild 673 BLAKE2B 2295bb669f272e5ba1fac220d5447524be9144c231648c956a30295aaf746ce5171707a9265c7a8c5fe8d3958664b83f21a6472863a97759d513a9982bb6c3af SHA512 dc23ed027f96b757b3b808f1115cf2f1d86e74acf8738b15fdb2c0bb6384807bb329fb1d62000b6f74690ec8b142019bce389dc05a51728e9e56ae3f3fbfdd4a
-EBUILD tinyxml2-4.0.1.ebuild 762 BLAKE2B d3a802a3813a9f99c16feec006f07a5e136b3415098a6e8793a757ca7583fec0d0b5989d80cc38efb2803a4eb564dc3ad53a76d649655c415101e3ac233c108e SHA512 0405efdf3fb5621653f620331050de75edae080e9bb7e41132ff532a7595d76dc9231e31102df0992f88be15321908ead5fd23d69544fed2e66cf697864d02bc
-EBUILD tinyxml2-5.0.1.ebuild 625 BLAKE2B 4e212a8cd13d3cdf62d89a1735e8e5d49e99426e5fd7b00e74049af868840a8be5997626356a42a04b86b39f2912342816ca56bf4b65da114ba5bae92fb6d84c SHA512 ef5934e90c628ab8a15e7824e930e19c7d461321cdbd1e69bff07226172bdb59bc228e992959f5d9373c5fe3b8513cdd1d42e0e51faf802dbdd3cc7340391af9
-EBUILD tinyxml2-6.0.0.ebuild 625 BLAKE2B 0d327c832f502b523d9e3479bcb474dfb0fa161a771ffdcb01af25253f29203c720bed574f2353c9effe0a1a65072bceae5d2357f17eac4f233e1b9a93f50b86 SHA512 c65e97a56c42b1cb81bfb4a116c534cdb9bae5ab67a42e104dbc4d95b01eba8a9b47537fa43c92baa84415d8df754bf1c0d74682eff24b3df7e946bc456cbb02
-EBUILD tinyxml2-6.2.0.ebuild 621 BLAKE2B 8ab8beee48cc0eafd9e1e3d4e2bfa020da42161533a25d3edd133aeb4e9b6282ffecd57fe5a6b92b38af1675784a8f65fbed3af881735892d46f91f2b9c3ed5e SHA512 fbfe662d555224092a37922b6a9db00a4c1636602feb38c51e5d7639f26871e70a83cbf784911aea829c2fe3bdad27f65fd6e7110005a8c5423f20c8d60fc9e2
+EBUILD tinyxml2-6.2.0.ebuild 620 BLAKE2B f60ccb2434b77c15b15b281c347f53513d6e27c40a8f5ea7d913574dc84504b54ec8ad8189104cfab3dbdbcb1862150c4a0b63ddc6717a480f6740c6f6a3126d SHA512 90f06488506b3238cbaab663e2801188a86e996679b211515c7bbac1cd1f1bde1bf37eab6f08ea9880ac2f3c5077c3f6f05500cc24188c59a65385749f78996a
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/files/tinyxml2-1.0.9_p20121123-test.patch b/dev-libs/tinyxml2/files/tinyxml2-1.0.9_p20121123-test.patch
deleted file mode 100644
index a6842eecb6e5..000000000000
--- a/dev-libs/tinyxml2/files/tinyxml2-1.0.9_p20121123-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tinyxml2-1.0.9_p20121123/CMakeLists.txt
-+++ tinyxml2-1.0.9_p20121123/CMakeLists.txt
-@@ -55,10 +55,13 @@
- 	VERSION "${GENERIC_LIB_VERSION}"

- 	SOVERSION "${GENERIC_LIB_SOVERSION}")

- 

--add_executable(test xmltest.cpp)

--add_dependencies(test tinyxml2)

--add_dependencies(test ${TARGET_DATA_COPY})

--target_link_libraries(test tinyxml2)

-+set(BUILD_TEST OFF CACHE BOOL "Set to ON to build tests")
-+if(BUILD_TEST)
-+	add_executable(test xmltest.cpp)
-+	add_dependencies(test tinyxml2)
-+	add_dependencies(test ${TARGET_DATA_COPY})
-+	target_link_libraries(test tinyxml2)
-+endif(BUILD_TEST)
- 

- 

- if(BUILD_STATIC_LIBS)

diff --git a/dev-libs/tinyxml2/files/tinyxml2-4.0.1-optional-tests.patch b/dev-libs/tinyxml2/files/tinyxml2-4.0.1-optional-tests.patch
deleted file mode 100644
index 95e849fdc8ff..000000000000
--- a/dev-libs/tinyxml2/files/tinyxml2-4.0.1-optional-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- tinyxml2-4.0.1/CMakeLists.txt
-+++ tinyxml2-4.0.1/CMakeLists.txt
-@@ -100,15 +100,18 @@
-         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

- endif()

- 

--add_executable(xmltest xmltest.cpp)

--if(BUILD_SHARED_LIBS)

--   add_dependencies(xmltest tinyxml2)

--   add_dependencies(xmltest ${TARGET_DATA_COPY})

--   target_link_libraries(xmltest tinyxml2)

--else(BUILD_STATIC_LIBS)

--   add_dependencies(xmltest tinyxml2_static)

--   add_dependencies(xmltest ${TARGET_DATA_COPY})

--   target_link_libraries(xmltest tinyxml2_static)

-+set(BUILD_TEST OFF CACHE BOOL "Set to ON to build tests")

-+if(BUILD_TEST)

-+	add_executable(xmltest xmltest.cpp)

-+	if(BUILD_SHARED_LIBS)

-+		add_dependencies(xmltest tinyxml2)

-+		add_dependencies(xmltest ${TARGET_DATA_COPY})

-+		target_link_libraries(xmltest tinyxml2)

-+	else(BUILD_STATIC_LIBS)

-+		add_dependencies(xmltest tinyxml2_static)

-+		add_dependencies(xmltest ${TARGET_DATA_COPY})

-+		target_link_libraries(xmltest tinyxml2_static)

-+	endif()

- endif()

- install(TARGETS DESTINATION ${CMAKE_INSTALL_BINDIR})

- 

diff --git a/dev-libs/tinyxml2/files/tinyxml2-4.0.1-xmltest.patch b/dev-libs/tinyxml2/files/tinyxml2-4.0.1-xmltest.patch
deleted file mode 100644
index 94b2668a1a48..000000000000
--- a/dev-libs/tinyxml2/files/tinyxml2-4.0.1-xmltest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tinyxml2-4.0.1/xmltest.cpp
-+++ tinyxml2-4.0.1/xmltest.cpp
-@@ -1618,7 +1618,7 @@
- 

- 		FILE* perfFP = fopen("resources/dream.xml", "r");

- 		fseek(perfFP, 0, SEEK_END);

--		long size = ftell(fp);

-+		long size = ftell(perfFP);

- 		fseek(perfFP, 0, SEEK_SET);

- 

- 		char* mem = new char[size + 1];

diff --git a/dev-libs/tinyxml2/tinyxml2-2.2.0.ebuild b/dev-libs/tinyxml2/tinyxml2-2.2.0.ebuild
deleted file mode 100644
index 650e51c55b06..000000000000
--- a/dev-libs/tinyxml2/tinyxml2-2.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A simple, small, efficient, C++ XML parser"
-HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
-SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/2"
-KEYWORDS="amd64 arm hppa sparc x86"
-IUSE="static-libs test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.9_p20121123-test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build static-libs STATIC_LIBS)
-		$(cmake-utils_use_build test TEST)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-	./test || die "Tests failed"
-}
diff --git a/dev-libs/tinyxml2/tinyxml2-3.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-3.0.0.ebuild
deleted file mode 100644
index 8477f44d99d3..000000000000
--- a/dev-libs/tinyxml2/tinyxml2-3.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A simple, small, efficient, C++ XML parser"
-HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
-SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/3"
-KEYWORDS="amd64 ~arm ~hppa ~sparc ~x86"
-IUSE="static-libs test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TEST=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-	./xmltest || die "Tests failed"
-}
diff --git a/dev-libs/tinyxml2/tinyxml2-4.0.1.ebuild b/dev-libs/tinyxml2/tinyxml2-4.0.1.ebuild
deleted file mode 100644
index ef4b25aababd..000000000000
--- a/dev-libs/tinyxml2/tinyxml2-4.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A simple, small, efficient, C++ XML parser"
-HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
-SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
-IUSE="static-libs test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-optional-tests.patch
-	"${FILESDIR}"/${P}-xmltest.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TEST=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-	./xmltest || die "Tests failed"
-}
diff --git a/dev-libs/tinyxml2/tinyxml2-5.0.1.ebuild b/dev-libs/tinyxml2/tinyxml2-5.0.1.ebuild
deleted file mode 100644
index 29d2f704db50..000000000000
--- a/dev-libs/tinyxml2/tinyxml2-5.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A simple, small, efficient, C++ XML parser"
-HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
-SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="static-libs test"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/tinyxml2/tinyxml2-6.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-6.0.0.ebuild
deleted file mode 100644
index adc1f1a46ed7..000000000000
--- a/dev-libs/tinyxml2/tinyxml2-6.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A simple, small, efficient, C++ XML parser"
-HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
-SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/6"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="static-libs test"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild b/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild
index 0cdc6766266d..97f2b558c247 100644
--- a/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="ZLIB"
 SLOT="0/6"
-KEYWORDS="amd64 arm ~arm64 ~hppa sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa sparc x86"
 IUSE="static-libs test"
 
 multilib_src_configure() {