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 8F7DD15808B for ; Sat, 2 Apr 2022 03:44:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3DC7E0843; Sat, 2 Apr 2022 03:44:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 336D5E0843 for ; Sat, 2 Apr 2022 03:44:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 0C1C6341886 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 6D31D35F 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: <1648871074.5b873c16ac1a8b20aab6d6d18c07ea046d369713.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libxslt/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libxslt/libxslt-1.1.35.ebuild dev-libs/libxslt/libxslt-9999.ebuild X-VCS-Directories: dev-libs/libxslt/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5b873c16ac1a8b20aab6d6d18c07ea046d369713 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: 60162158-aa8d-4ac0-b0b9-a04a074da3b1 X-Archives-Hash: ff03e381e32865b47dfec2376e821020 commit: 5b873c16ac1a8b20aab6d6d18c07ea046d369713 Author: Sam James gentoo org> AuthorDate: Sat Apr 2 03:41:52 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Apr 2 03:44:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b873c16 dev-libs/libxslt: add 9999 Signed-off-by: Sam James gentoo.org> dev-libs/libxslt/libxslt-1.1.35.ebuild | 22 ++++++++++++++------ .../{libxslt-1.1.35.ebuild => libxslt-9999.ebuild} | 24 ++++++++++++++-------- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/dev-libs/libxslt/libxslt-1.1.35.ebuild b/dev-libs/libxslt/libxslt-1.1.35.ebuild index 3dac6a1a7af9..a00cec50a10c 100644 --- a/dev-libs/libxslt/libxslt-1.1.35.ebuild +++ b/dev-libs/libxslt/libxslt-1.1.35.ebuild @@ -3,15 +3,21 @@ EAPI=7 -inherit gnome.org libtool multilib-minimal +inherit libtool multilib-minimal # Note: Please bump this in sync with dev-libs/libxml2. DESCRIPTION="XSLT libraries and tools" HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt" + inherit autotools 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 LICENSE="MIT" SLOT="0" -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" IUSE="crypt debug examples static-libs" BDEPEND=">=virtual/pkgconfig-1" @@ -29,13 +35,17 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libxslt/xsltconfig.h ) +DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) + src_prepare() { default - DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) - - # Prefix always needs elibtoolize if not eautoreconf'd. - elibtoolize + if [[ ${PV} == 9999 ]] ; then + eautoreconf + else + # Prefix always needs elibtoolize if not eautoreconf'd. + elibtoolize + fi } multilib_src_configure() { diff --git a/dev-libs/libxslt/libxslt-1.1.35.ebuild b/dev-libs/libxslt/libxslt-9999.ebuild similarity index 69% copy from dev-libs/libxslt/libxslt-1.1.35.ebuild copy to dev-libs/libxslt/libxslt-9999.ebuild index 3dac6a1a7af9..c3ea46adc4e8 100644 --- a/dev-libs/libxslt/libxslt-1.1.35.ebuild +++ b/dev-libs/libxslt/libxslt-9999.ebuild @@ -3,15 +3,21 @@ EAPI=7 -inherit gnome.org libtool multilib-minimal +inherit libtool multilib-minimal # Note: Please bump this in sync with dev-libs/libxml2. DESCRIPTION="XSLT libraries and tools" HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt" + inherit autotools 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 LICENSE="MIT" SLOT="0" -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" IUSE="crypt debug examples static-libs" BDEPEND=">=virtual/pkgconfig-1" @@ -29,13 +35,17 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libxslt/xsltconfig.h ) +DOCS=( AUTHORS FEATURES NEWS README TODO ) + src_prepare() { default - DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) - - # Prefix always needs elibtoolize if not eautoreconf'd. - elibtoolize + if [[ ${PV} == 9999 ]] ; then + eautoreconf + else + # Prefix always needs elibtoolize if not eautoreconf'd. + elibtoolize + fi } multilib_src_configure() { @@ -43,8 +53,6 @@ multilib_src_configure() { # Work in 1.1.35+ is occurring to add prelim. Python 3 support, so could # restore if something needs them. ECONF_SOURCE="${S}" econf \ - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ - --with-html-subdir=html \ --without-python \ $(use_with crypt crypto) \ $(use_with debug) \