From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 935BD15808B for ; Sat, 2 Apr 2022 03:45:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA332E0848; Sat, 2 Apr 2022 03:44:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5EB08E0848 for ; Sat, 2 Apr 2022 03:44:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B5D2341884 for ; Sat, 2 Apr 2022 03:44:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 594E935A for ; Sat, 2 Apr 2022 03:44:55 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1648871068.2acd2e6971c4ada4fa618474483025856a815df0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libxml2/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libxml2/libxml2-2.9.13-r1.ebuild dev-libs/libxml2/libxml2-9999.ebuild X-VCS-Directories: dev-libs/libxml2/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2acd2e6971c4ada4fa618474483025856a815df0 X-VCS-Branch: master Date: Sat, 2 Apr 2022 03:44:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 46f5756e-95d9-44ea-a06e-ed45e62e44a5 X-Archives-Hash: d919a5d223496e6e9ee4b232a2843b1a commit: 2acd2e6971c4ada4fa618474483025856a815df0 Author: Sam James gentoo org> AuthorDate: Sat Apr 2 03:37:39 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Apr 2 03:44:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2acd2e69 dev-libs/libxml2: use live template Signed-off-by: Sam James gentoo.org> dev-libs/libxml2/libxml2-2.9.13-r1.ebuild | 24 +++++++++++++++++------- dev-libs/libxml2/libxml2-9999.ebuild | 21 ++++++++++++++++++--- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild index 5d7a300bba44..4789bc568a0a 100644 --- a/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild @@ -9,7 +9,7 @@ PATCHSET_VERSION="2.9.12-r5-patchset" PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" -inherit autotools flag-o-matic gnome.org prefix python-r1 multilib-minimal +inherit autotools flag-o-matic prefix python-r1 multilib-minimal XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" XSTS_NAME_1="xmlschema2002-01-16" @@ -19,14 +19,20 @@ XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" XMLCONF_TARBALL="xmlts20130923.tar.gz" DESCRIPTION="XML C parser and toolkit" HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" + inherit git-r3 +else + inherit gnome.org + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi SRC_URI+=" 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} https://www.w3.org/XML/Test/${XMLCONF_TARBALL} - ) -" + )" S="${WORKDIR}/${PN}-${PV%_rc*}" LICENSE="MIT" @@ -75,11 +81,15 @@ PATCHES=( ) src_unpack() { - local tarname=${P/_rc/-rc}.tar.xz + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + else + local tarname=${P/_rc/-rc}.tar.xz - # ${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} ${PN}-${PATCHSET_VERSION}.tar.bz2 + # ${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} ${PN}-${PATCHSET_VERSION}.tar.bz2 + fi cd "${S}" || die diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild index 18743bea1507..3ad0604b6f1e 100644 --- a/dev-libs/libxml2/libxml2-9999.ebuild +++ b/dev-libs/libxml2/libxml2-9999.ebuild @@ -7,8 +7,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" -EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" -inherit autotools flag-o-matic python-r1 multilib-minimal git-r3 +inherit autotools flag-o-matic python-r1 multilib-minimal XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" XSTS_NAME_1="xmlschema2002-01-16" @@ -19,6 +18,14 @@ XMLCONF_TARBALL="xmlts20130923.tar.gz" DESCRIPTION="XML C parser and toolkit" HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" + inherit git-r3 +else + inherit gnome.org + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + SRC_URI+=" test? ( ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} @@ -53,7 +60,15 @@ MULTILIB_CHOST_TOOLS=( DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO ) src_unpack() { - git-r3_src_unpack + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + else + local tarname=${P/_rc/-rc}.tar.xz + + # ${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} ${PN}-${PATCHSET_VERSION}.tar.bz2 + fi cd "${S}" || die