commit: bc855f122bf4992b1c35d35f8aedeac1ca809be5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Jun 8 03:38:48 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jun 8 03:40:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc855f12
dev-libs/tinyxml2: add 9.0.0, drop 8.1.0 Closes: https://bugs.gentoo.org/791163 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/tinyxml2/Manifest | 2 +- .../{tinyxml2-8.1.0.ebuild => tinyxml2-9.0.0.ebuild} | 16 +++++----------- profiles/package.mask | 5 ----- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest index 0b8ab041f85..18325f2bb6b 100644 --- a/dev-libs/tinyxml2/Manifest +++ b/dev-libs/tinyxml2/Manifest @@ -1,3 +1,3 @@ DIST tinyxml2-7.1.0.tar.gz 592717 BLAKE2B 5936356d472b8642bebb9f02579e6beda14446d57749f1e7a869ff941a03a5ad30624c4db4b2eaaaca48d7f339e3100fddfd58f96bbcfc22737a23d9c9198c9a SHA512 09d5f37018f79a593ff35e33d4296c9ec643a22e83c0cee4c37949300f86201eee07e9b7e6ba55044d8abb438d5d21b70d5843a96ae4652389bb164047ec31e1 DIST tinyxml2-8.0.0.tar.gz 593833 BLAKE2B afc21220e28a1c139b1abd89e67f8e64980d2ba9bc6f60a33d435a4a02cb40ecacc27ac28bd9702ac3a435f66764ebb752b597a1b1e178d0b549e366d5b669dd SHA512 bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6 -DIST tinyxml2-8.1.0.tar.gz 619733 BLAKE2B 7a7e1a250bc8944614ecf578183b41340e7519ad2181e8023244d82e83d9a85fc600e5f00051b7f6f8ebda760a1ac11cb8bfe381fc9f6432f315aa6fdb310a83 SHA512 1ef50ee2648d423f38b6ebb3e45ec3798b87cf73a75aa0e49ae697a2006517d05c8298b325de70ee2aa706546235860f01541ff753c8a1bd97fa862a4ebb5c09 +DIST tinyxml2-9.0.0.tar.gz 619734 BLAKE2B 9a7bb8b8158417aa505e3d9fcc246b0bede52d6d4d5ff1b5cee891c2b72d1ee43d00ccea001ac24500f52c36320994b3446f3898ab2be1997940dbff526bc78e SHA512 9c5ce8131984690df302ca3e32314573b137180ed522c92fd631692979c942372a28f697fdb3d5e56bcf2d3dc596262b724d088153f3e1d721c9536f2a883367 diff --git a/dev-libs/tinyxml2/tinyxml2-8.1.0.ebuild b/dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild similarity index 74% rename from dev-libs/tinyxml2/tinyxml2-8.1.0.ebuild rename to dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild index 22f470d1b85..7c0082ac47a 100644 --- a/dev-libs/tinyxml2/tinyxml2-8.1.0.ebuild +++ b/dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild @@ -3,26 +3,20 @@ EAPI=7 -inherit meson-multilib +CMAKE_ECLASS=cmake +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/8" +SLOT="0/9" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}"/${P}-meson-typo.patch -) - multilib_src_configure() { - local emesonargs=( - $(meson_native_use_bool test tests) - ) - - meson_src_configure + local mycmakeargs=( -DBUILD_TESTING=$(usex test) ) + cmake_src_configure } diff --git a/profiles/package.mask b/profiles/package.mask index 427d93f6196..5ad63957987 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -271,11 +271,6 @@ dev-java/sun-jimi # see bug: https://bugs.gentoo.org/786828 dev-java/squareness-jlf -# Sam James <[email protected]> (2021-05-20) -# Need to ditch Meson or investigate consumers. -# https://bugs.gentoo.org/791163 -=dev-libs/tinyxml2-8.1.0 - # Miroslav Šulc <[email protected]> (2021-05-19) # no consumer, removal in 30 days # see bug: https://bugs.gentoo.org/784065
