commit: 84479f64f0348164e1efe0fef1327346be45bf0d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 20 02:20:17 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 20 02:21:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84479f64
dev-libs/libxml2: switch 2.9.12-r1 to compressed patchset (no functional change)
No functional changes, just switching to a tarball again to reduce the size
in the tree.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libxml2/Manifest | 1 +
dev-libs/libxml2/libxml2-2.9.12-r1.ebuild | 18 +++++++++++-------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 79c184a55d8..8aa7d9f74fc 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,5 +1,6 @@
DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B
4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede
SHA512
a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952
DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B
a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421
SHA512
0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed
+DIST libxml2-2.9.12-r1-patchset.tar.bz2 5497 BLAKE2B
fda8ad166c89209abaf8f94a5dfbff84e5a6c89cca36350a2f0b9b8db42c6f348b6cb8c7738a35aed8421ca994cc6ad76c3aa02a8a9899fa969b493ca1761b01
SHA512
469befb393430d2532e27f9ed834e0ab5473fc371c89582c3b1434ab1c370140f132d4acf315f7c2b9d1841ab3e78ef04069cca78d66917269b5112ab42127df
DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B
ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934
SHA512
df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd
DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B
48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf
SHA512
69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656
DIST xmlts20080827.tar.gz 638940 BLAKE2B
c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7
SHA512
7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r1.ebuild
b/dev-libs/libxml2/libxml2-2.9.12-r1.ebuild
index 2b005c416ec..8ae91f42ff0 100644
--- a/dev-libs/libxml2/libxml2-2.9.12-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.12-r1.ebuild
@@ -5,6 +5,8 @@ EAPI=7
# Note: Please bump in sync with dev-libs/libxslt
+PATCHSET_VERSION="2.9.12-r1-patchset"
+
PYTHON_COMPAT=( python3_{7,8,9} )
PYTHON_REQ_USE="xml"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
@@ -20,6 +22,7 @@ DESCRIPTION="XML C parser and toolkit"
HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2";
SRC_URI="
ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2
test? (
${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
@@ -59,24 +62,24 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS )
PATCHES=(
## Gentoo
# Patches needed for prefix support
- "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
+ "${WORKDIR}"/${PN}-2.7.1-catalog_path.patch
# Fix python detection, bug #567066
# https://bugzilla.gnome.org/show_bug.cgi?id=760458
- "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
+ "${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
# Fix python tests when building out of tree #565576
- "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
+ "${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch
# bug #745162
- "${FILESDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
+ "${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
# Avoid failure on missing fuzz.h when running tests
- "${FILESDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch
+ "${WORKDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch
## Upstream
# Fix lxml compatibility
- "${FILESDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch
+ "${WORKDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch
)
src_unpack() {
@@ -88,7 +91,8 @@ src_unpack() {
# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
# as they are needed as tarballs in ${S}/xstc instead and not unpacked
- unpack ${tarname}
+ unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2
+
cd "${S}" || die
if use test ; then
