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 EF943158094 for ; Sat, 16 Jul 2022 19:57:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D0C8E1001; Sat, 16 Jul 2022 19:57:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 68C2FE1001 for ; Sat, 16 Jul 2022 19:57:23 +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 4A2123410C5 for ; Sat, 16 Jul 2022 19:57:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81A3E53A for ; Sat, 16 Jul 2022 19:57:20 +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: <1658001419.9e2c1b2c21827fefc11cde8e31a6a3c65bd105af.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/eclass-manpages/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/eclass-manpages/eclass-manpages-20220716.ebuild app-doc/eclass-manpages/eclass-manpages-99999999.ebuild X-VCS-Directories: app-doc/eclass-manpages/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9e2c1b2c21827fefc11cde8e31a6a3c65bd105af X-VCS-Branch: master Date: Sat, 16 Jul 2022 19:57:20 +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: 33d244f9-bac9-4dca-af70-9f17c286c48e X-Archives-Hash: f8dd255c0482d6f58691c1f37b5ad41a commit: 9e2c1b2c21827fefc11cde8e31a6a3c65bd105af Author: Sam James gentoo org> AuthorDate: Sat Jul 16 19:56:59 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jul 16 19:56:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e2c1b2c app-doc/eclass-manpages: use live template Signed-off-by: Sam James gentoo.org> .../eclass-manpages-20220716.ebuild | 42 ++++++++++++++++++---- .../eclass-manpages-99999999.ebuild | 42 +++++++++++++++------- 2 files changed, 65 insertions(+), 19 deletions(-) diff --git a/app-doc/eclass-manpages/eclass-manpages-20220716.ebuild b/app-doc/eclass-manpages/eclass-manpages-20220716.ebuild index 3f301df02e67..4bbfc72582a4 100644 --- a/app-doc/eclass-manpages/eclass-manpages-20220716.ebuild +++ b/app-doc/eclass-manpages/eclass-manpages-20220716.ebuild @@ -3,19 +3,49 @@ EAPI=8 +# Instructions to make a dist tarball: +# git clone https://github.com/mgorny/eclass-to-manpage && cd eclass-to-manpage +# make dist ECLASSDIR=~/g/eclass/ + DESCRIPTION="Collection of Gentoo eclass manpages" HOMEPAGE="https://github.com/mgorny/eclass-to-manpage" -SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/repo/gentoo.git + https://github.com/gentoo/gentoo.git" + inherit git-r3 + + MY_ECLASSDIR="eclass" +else + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" + + # Keep the keywords stable. No need to change to ~arch. + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" + + MY_ECLASSDIR="." +fi LICENSE="GPL-2" SLOT="0" -# Keep the keywords stable. No need to change to ~arch. -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -BDEPEND="app-arch/xz-utils - sys-apps/gawk +BDEPEND="sys-apps/gawk sys-apps/groff" +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_fetch + git-r3_fetch "https://github.com/mgorny/eclass-to-manpage" + + git-r3_checkout '' '' '' eclass + git-r3_checkout "https://github.com/mgorny/eclass-to-manpage" + else + default + fi +} + +src_compile() { + emake ECLASSDIR=${MY_ECLASSDIR} +} + src_install() { - emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" + emake install ECLASSDIR=${MY_ECLASSDIR} DESTDIR="${D}" PREFIX="${EPREFIX}/usr" } diff --git a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild index 2339dc038f41..4bbfc72582a4 100644 --- a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild +++ b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild @@ -1,35 +1,51 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit git-r3 +# Instructions to make a dist tarball: +# git clone https://github.com/mgorny/eclass-to-manpage && cd eclass-to-manpage +# make dist ECLASSDIR=~/g/eclass/ DESCRIPTION="Collection of Gentoo eclass manpages" HOMEPAGE="https://github.com/mgorny/eclass-to-manpage" -SRC_URI="" -EGIT_REPO_URI="https://anongit.gentoo.org/git/repo/gentoo.git - https://github.com/gentoo/gentoo.git" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/repo/gentoo.git + https://github.com/gentoo/gentoo.git" + inherit git-r3 + + MY_ECLASSDIR="eclass" +else + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" + + # Keep the keywords stable. No need to change to ~arch. + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" + + MY_ECLASSDIR="." +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="" BDEPEND="sys-apps/gawk sys-apps/groff" src_unpack() { - git-r3_fetch - git-r3_fetch "https://github.com/mgorny/eclass-to-manpage" - - git-r3_checkout '' '' '' eclass - git-r3_checkout "https://github.com/mgorny/eclass-to-manpage" + if [[ ${PV} == *9999* ]] ; then + git-r3_fetch + git-r3_fetch "https://github.com/mgorny/eclass-to-manpage" + + git-r3_checkout '' '' '' eclass + git-r3_checkout "https://github.com/mgorny/eclass-to-manpage" + else + default + fi } src_compile() { - emake ECLASSDIR=eclass + emake ECLASSDIR=${MY_ECLASSDIR} } src_install() { - emake install ECLASSDIR=eclass DESTDIR="${D}" PREFIX="${EPREFIX}/usr" + emake install ECLASSDIR=${MY_ECLASSDIR} DESTDIR="${D}" PREFIX="${EPREFIX}/usr" }