diff options
Diffstat (limited to 'dev-libs/xerces-c')
| -rw-r--r-- | dev-libs/xerces-c/Manifest | 8 | ||||
| -rw-r--r-- | dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild (renamed from dev-libs/xerces-c/xerces-c-3.2.3.ebuild) | 6 | ||||
| -rw-r--r-- | dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild (renamed from dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild) | 35 | ||||
| -rw-r--r-- | dev-libs/xerces-c/xerces-c-9999.ebuild | 23 |
4 files changed, 37 insertions, 35 deletions
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest index 699b2047e1be..6e33d2953e93 100644 --- a/dev-libs/xerces-c/Manifest +++ b/dev-libs/xerces-c/Manifest @@ -1,9 +1,7 @@ AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aaf6c637ba04761c12c5d8b227d466575b056d64846bced57651c70926a78403da16fd0e86ba4b267dfe70a144bcf3cced3d1536 SHA512 c5c0e753d22b61fa5047cef3748cf3baaf30f4c6ba4d89152d856f2f65fe311841ea590ec0c9291347b5b7f96047f3e9c7b524798ac2ac96bcfbc8b40d634596 -DIST xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5 -DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80 DIST xerces-c-3.2.3.tar.gz 7120270 BLAKE2B d622621657f33ada75a9ef330e77772b8f9cff717d8efc06f2a1fffea77360596e5192b48a6a015403a1045aa2492c626ba05f1de15eb5b997a80ca19b032db8 SHA512 206c5c31510224b8f6963b051f27968e4fe70374a0adb2c2990ac1f865b3bac41f63e6bfb7279faa21477f8878a3b9671ba70726fc75a84e51f037ef158639ad -EBUILD xerces-c-3.2.2-r1.ebuild 3059 BLAKE2B d7f4ea69e1dbb36ab4d974c3218131ba5eef86945b5e7d869ff3a0c69dc0141845c4afca5e39468f6960a729a7e90fb3f7d4ff2c6eddb70831f7e3560f392639 SHA512 5823e3135ce771049f6d89fa746d347a16e2cefa48dd8756313a59efbd181775802fe49fd269a5b9e5a389b0818e2c815999f69db2167dce831025e06e52815f -EBUILD xerces-c-3.2.3.ebuild 2935 BLAKE2B 3fa694164e0c60346116670b1d93305c975b9cb383928e004e6daa2caa6a4a623eaf14bdf1d6bce2b6e4e304710efa74eed06117c43d5a170f5c938a07983eac SHA512 28f98b041d03624c23b21ae6bf8d483cb53318bd657d3e571c6a5d4ee72d0c87460a4306b68090db177a3a25a0abba4eb28b5092fce6ca3f3facb1500bd95981 -EBUILD xerces-c-9999.ebuild 2942 BLAKE2B c4fbaebdc301f12035ecca49b3b25308f647652cf84cb24e6b8eeb8e69db205ac53ba20d7460af12f9c44a571a86351526f2785c0cf6489665560d9b96f811ec SHA512 89c5ca69e61d4ac7e5984e5ae502a3265dbbab9d098501adfaecf6d21c1c24df7deabd419e3b2a8fb772c6d4f5aeae5416f9cbfd03f3daaa5ed9248e2a1e27eb +EBUILD xerces-c-3.2.3-r1.ebuild 3001 BLAKE2B 738dedddf7d7083a0222773ce6bdc428e71b30530aa95e8a19de1871c1e5bcd8f393103deab8653743eb09b45027542b95834348540b027e2809e393187e6a7c SHA512 16c48fa20b2f7f24c168d3c8a79fff300c12e35b1a3eb9c05d643a59c1d7ddcd7f5c3702393410e03080b06f43676c1089eb7dbb356c872197a6b4ae0d7591ad +EBUILD xerces-c-3.2.3-r2.ebuild 2944 BLAKE2B f2a91197c33a2847a3439a30995a9442af066887ae77af43ddc243e1ed0972a5041be70c592a1e35f9dc42c90a6266a087838cedbd5455cf16ee4fcb12d1ef0c SHA512 b69d04b067adfabde81dce0f2da175f5fd9647f3f6213a220770837a3a87109febfcc9072bc802bdce281a4ff6f88331b4416e714734305ce40b56f502e8fb41 +EBUILD xerces-c-9999.ebuild 2882 BLAKE2B 1d5efc807b278179b221b88e050fff78b6c275d1a3554b2aec829296060a0c9309a19dac79a48e06d3c2efe259a945352eb6a9c848c58242e63be0515be97673 SHA512 25c01f394f9043e0952f55d38fe8590d3cb7f1546cffd6c23b59c7cd5ec80a104627fd7d991c512797876ea1e4c63efe956a1b6ee2c6e51631afd4476579d1ee MISC metadata.xml 638 BLAKE2B ae192f7a87ce73aed62967b02b1cda8535ac655b4e8763e7b75697c816f30b93b6bfb0b807d573f3ed82a9238bcb5234a1532151d98f9a30877884432916b816 SHA512 db2089786b68371bca8dd6e51ff820ac63245eefc5080e5d6f05b434bb2ee1a6831d439221f71b4d088e7d7cb22c9a68f6e67cee253923f13850afe6f7f021bd diff --git a/dev-libs/xerces-c/xerces-c-3.2.3.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild index 9c89e65548c1..b6a53f71d1b0 100644 --- a/dev-libs/xerces-c/xerces-c-3.2.3.ebuild +++ b/dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -32,6 +32,10 @@ DEPEND="${RDEPEND} DOCS=( CREDITS KEYS NOTICE README ) +PATCHES=( + "${FILESDIR}"/xerces-c-3.2.2-fix-XERCESC-2163.patch +) + pkg_setup() { export ICUROOT="${EPREFIX}/usr" diff --git a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild index 9671a52d453a..4c29af461e29 100644 --- a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild +++ b/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} +EAPI=7 -inherit cmake-utils prefix +inherit cmake prefix DESCRIPTION="A validating XML parser written in a portable subset of C++" HOMEPAGE="https://xerces.apache.org/xerces-c/" @@ -13,29 +12,28 @@ if [[ ${PV} == *9999 ]] ; then ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk" inherit subversion else - SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz - https://dev.gentoo.org/~juippis/distfiles/tmp/xerces-c-3.2.2-fix-XERCESC-2161.patch" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" fi LICENSE="Apache-2.0" SLOT="0" - IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads" + RESTRICT="!test? ( test )" -RDEPEND="icu? ( dev-libs/icu:0= ) +RDEPEND=" curl? ( net-misc/curl ) + icu? ( dev-libs/icu:0= ) virtual/libiconv" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" doc? ( app-doc/doxygen ) test? ( dev-lang/perl )" DOCS=( CREDITS KEYS NOTICE README ) -PATCHES=( - "${DISTDIR}/${P}-fix-XERCESC-2161.patch" - "${FILESDIR}/${P}-fix-XERCESC-2163.patch" -) + +PATCHES=( "${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch ) pkg_setup() { export ICUROOT="${EPREFIX}/usr" @@ -80,6 +78,7 @@ src_configure() { # for interix maybe: transcoder="windows" local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" -Dnetwork-accessor="${netaccessor}" -Dmessage-loader="${msgloader}" -Dtranscoder="${transcoder}" @@ -87,17 +86,17 @@ src_configure() { -Dsse2:BOOL="$(usex cpu_flags_x86_sse2)" ) - cmake-utils_src_configure + cmake_src_configure } src_compile() { - cmake-utils_src_compile + cmake_src_compile - use doc && cmake-utils_src_compile doc-style createapidocs doc-xml + use doc && cmake_build doc-style createapidocs doc-xml } src_install() { - cmake-utils_src_install + cmake_src_install # package provides .pc files find "${D}" -name '*.la' -delete || die diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild index 627bdbc2f2f9..995f942a4379 100644 --- a/dev-libs/xerces-c/xerces-c-9999.ebuild +++ b/dev-libs/xerces-c/xerces-c-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} +EAPI=7 -inherit cmake-utils prefix +inherit cmake prefix DESCRIPTION="A validating XML parser written in a portable subset of C++" HOMEPAGE="https://xerces.apache.org/xerces-c/" @@ -19,14 +18,16 @@ fi LICENSE="Apache-2.0" SLOT="0" - IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads" + RESTRICT="!test? ( test )" -RDEPEND="icu? ( dev-libs/icu:0= ) +RDEPEND=" curl? ( net-misc/curl ) + icu? ( dev-libs/icu:0= ) virtual/libiconv" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" doc? ( app-doc/doxygen ) test? ( dev-lang/perl )" @@ -83,17 +84,17 @@ src_configure() { -Dsse2:BOOL="$(usex cpu_flags_x86_sse2)" ) - cmake-utils_src_configure + cmake_src_configure } src_compile() { - cmake-utils_src_compile + cmake_src_compile - use doc && cmake-utils_src_compile doc-style createapidocs doc-xml + use doc && cmake_build doc-style createapidocs doc-xml } src_install() { - cmake-utils_src_install + cmake_src_install # package provides .pc files find "${D}" -name '*.la' -delete || die |