From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1421665-garchives=archives.gentoo.org@lists.gentoo.org>
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 000D9158094
for <garchives@archives.gentoo.org>; Mon, 25 Jul 2022 08:56:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C9D70E1055;
Mon, 25 Jul 2022 08:56:40 +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 A3F12E1025
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jul 2022 08:56:40 +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 6C3B3340AEC
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jul 2022 08:56:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E8284543
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jul 2022 08:56:37 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1658739359.6b218a40fa9c6716e5d5d20de91b07fee20e5372.ulm@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-99999999.ebuild
X-VCS-Directories: app-doc/eclass-manpages/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 6b218a40fa9c6716e5d5d20de91b07fee20e5372
X-VCS-Branch: master
Date: Mon, 25 Jul 2022 08:56:37 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4c09ccc9-60a8-4d2b-9d2d-71dca71cf1c0
X-Archives-Hash: 9fa3dc276c6791a82a7a07ea3013205d
commit: 6b218a40fa9c6716e5d5d20de91b07fee20e5372
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 08:44:45 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 08:55:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b218a40
app-doc/eclass-manpages: Drop conditionals for live ebuild
There is no code sharing between the functions in the non-live and
live ebuilds, and it isn't expected that this will change in future.
Therefore, the conditionals have little benefit but make the code
harder to read.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../eclass-manpages-99999999.ebuild | 38 ++++++----------------
1 file changed, 10 insertions(+), 28 deletions(-)
diff --git a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
index 4bbfc72582a4..13ddd2dacb8a 100644
--- a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
@@ -3,26 +3,12 @@
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/
+inherit git-r3
DESCRIPTION="Collection of Gentoo eclass manpages"
HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
-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
+EGIT_REPO_URI="https://anongit.gentoo.org/git/repo/gentoo.git
+ https://github.com/gentoo/gentoo.git"
LICENSE="GPL-2"
SLOT="0"
@@ -31,21 +17,17 @@ 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
+ git-r3_fetch
+ git-r3_fetch "https://github.com/mgorny/eclass-to-manpage.git"
+
+ git-r3_checkout "" "" "" eclass
+ git-r3_checkout "https://github.com/mgorny/eclass-to-manpage.git"
}
src_compile() {
- emake ECLASSDIR=${MY_ECLASSDIR}
+ emake ECLASSDIR=eclass
}
src_install() {
- emake install ECLASSDIR=${MY_ECLASSDIR} DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+ emake install ECLASSDIR=eclass DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
}