From ab7b1a7283457e9ab07edf0d031d78bf19b9c05b Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 15 Dec 2020 02:12:24 +0000 Subject: dev-libs/pugixml: add upstream patch for CMake file Ensure that the compatibility target uses legal syntax. Closes: https://bugs.gentoo.org/758611 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sam James --- .../files/pugixml-1.11.1-cmake-config.patch | 23 +++++++++++++++++++++ dev-libs/pugixml/pugixml-1.11.1-r1.ebuild | 24 ++++++++++++++++++++++ dev-libs/pugixml/pugixml-1.11.1.ebuild | 20 ------------------ 3 files changed, 47 insertions(+), 20 deletions(-) create mode 100644 dev-libs/pugixml/files/pugixml-1.11.1-cmake-config.patch create mode 100644 dev-libs/pugixml/pugixml-1.11.1-r1.ebuild delete mode 100644 dev-libs/pugixml/pugixml-1.11.1.ebuild diff --git a/dev-libs/pugixml/files/pugixml-1.11.1-cmake-config.patch b/dev-libs/pugixml/files/pugixml-1.11.1-cmake-config.patch new file mode 100644 index 000000000000..2aec70d4f767 --- /dev/null +++ b/dev-libs/pugixml/files/pugixml-1.11.1-cmake-config.patch @@ -0,0 +1,23 @@ +https://github.com/zeux/pugixml/pull/389.patch +From 4feab60bb7ecced7cea18c570ca9a39a08246a57 Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Thu, 10 Dec 2020 07:52:35 -0500 +Subject: [PATCH] cmake: avoid ALIAS target + +This is not allowed on IMPORTED targets. +--- + scripts/pugixml-config.cmake.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/scripts/pugixml-config.cmake.in b/scripts/pugixml-config.cmake.in +index 5af37501..58be6391 100644 +--- a/scripts/pugixml-config.cmake.in ++++ b/scripts/pugixml-config.cmake.in +@@ -6,5 +6,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/pugixml-targets.cmake") + # version or not requesting one at all), provide the old imported target name + # for compatibility. + if (NOT DEFINED PACKAGE_FIND_VERSION OR PACKAGE_FIND_VERSION VERSION_LESS "1.11") +- add_library(pugixml ALIAS pugixml::pugixml) ++ add_library(pugixml INTERFACE IMPORTED) ++ target_link_libraries(pugixml INTERFACE pugixml::pugixml) + endif () diff --git a/dev-libs/pugixml/pugixml-1.11.1-r1.ebuild b/dev-libs/pugixml/pugixml-1.11.1-r1.ebuild new file mode 100644 index 000000000000..ebdf4d377152 --- /dev/null +++ b/dev-libs/pugixml/pugixml-1.11.1-r1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/zeux/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz" + 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" +HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/" + +LICENSE="MIT" +SLOT="0" + +PATCHES=( + "${FILESDIR}/${P}-cmake-config.patch" +) diff --git a/dev-libs/pugixml/pugixml-1.11.1.ebuild b/dev-libs/pugixml/pugixml-1.11.1.ebuild deleted file mode 100644 index 0750359ebd79..000000000000 --- a/dev-libs/pugixml/pugixml-1.11.1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/zeux/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz" - 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" -HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/" - -LICENSE="MIT" -SLOT="0" -- cgit v1.2.3-65-gdbad