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 93547158090 for ; Tue, 3 May 2022 18:41:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83EBCE069C; Tue, 3 May 2022 18:41:12 +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 D289AE0101 for ; Tue, 3 May 2022 18:41:11 +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 BD06B3417EB for ; Tue, 3 May 2022 18:41:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 357D934C for ; Tue, 3 May 2022 18:41:09 +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: <1651603247.e56156ff6b5bb4c6d78661151aa44dfa6a0f2271.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/scdoc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/scdoc/scdoc-1.11.2.ebuild app-text/scdoc/scdoc-9999.ebuild X-VCS-Directories: app-text/scdoc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e56156ff6b5bb4c6d78661151aa44dfa6a0f2271 X-VCS-Branch: master Date: Tue, 3 May 2022 18:41:09 +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: 787f1573-aae9-47eb-8004-cf4faf9d237c X-Archives-Hash: 856081b57dab71288ba13461992ff75e commit: e56156ff6b5bb4c6d78661151aa44dfa6a0f2271 Author: Sam James gentoo org> AuthorDate: Tue May 3 18:39:40 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue May 3 18:40:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e56156ff app-text/scdoc: sync live, drop 1.11.2 Signed-off-by: Sam James gentoo.org> app-text/scdoc/scdoc-1.11.2.ebuild | 45 -------------------------------------- app-text/scdoc/scdoc-9999.ebuild | 4 ++-- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/app-text/scdoc/scdoc-1.11.2.ebuild b/app-text/scdoc/scdoc-1.11.2.ebuild deleted file mode 100644 index b2ab9d346396..000000000000 --- a/app-text/scdoc/scdoc-1.11.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Standalone tool for generating man pages with a simple syntax" -HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc" - inherit git-r3 -else - SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -fi - -LICENSE="MIT" -SLOT="0" - -src_prepare() { - default - - sed -e 's/-Werror//' \ - -i Makefile || die 'Failed to patch Makefile' -} - -src_compile() { - local MY_HS="./scdoc" - if tc-is-cross-compiler; then - tc-export_build_env - MY_HS="./hostscdoc" - emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \ - CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}" - mv scdoc hostscdoc || die 'Failed to rename host scdoc' - fi - - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" HOST_SCDOC="${MY_HS}" -} - -src_install() { - emake DESTDIR="${ED}" PREFIX="/usr" HOST_SCDOC="${MY_HS}" \ - PCDIR="/usr/$(get_libdir)/pkgconfig" install -} diff --git a/app-text/scdoc/scdoc-9999.ebuild b/app-text/scdoc/scdoc-9999.ebuild index b2ab9d346396..c40dcd50d0fa 100644 --- a/app-text/scdoc/scdoc-9999.ebuild +++ b/app-text/scdoc/scdoc-9999.ebuild @@ -36,10 +36,10 @@ src_compile() { mv scdoc hostscdoc || die 'Failed to rename host scdoc' fi - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" HOST_SCDOC="${MY_HS}" + emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" } src_install() { - emake DESTDIR="${ED}" PREFIX="/usr" HOST_SCDOC="${MY_HS}" \ + emake DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \ PCDIR="/usr/$(get_libdir)/pkgconfig" install }