public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/scdoc/
Date: Tue,  3 May 2022 18:41:09 +0000 (UTC)	[thread overview]
Message-ID: <1651603247.e56156ff6b5bb4c6d78661151aa44dfa6a0f2271.sam@gentoo> (raw)

commit:     e56156ff6b5bb4c6d78661151aa44dfa6a0f2271
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 18:39:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
 }


             reply	other threads:[~2022-05-03 18:41 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-03 18:41 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-08 13:51 [gentoo-commits] repo/gentoo:master commit in: app-text/scdoc/ Arthur Zamarin
2024-03-08 13:48 Arthur Zamarin
2024-03-08 12:15 Arthur Zamarin
2024-03-08 12:11 Arthur Zamarin
2024-03-08 12:10 Arthur Zamarin
2024-03-08 12:09 Arthur Zamarin
2024-02-18  5:37 Arthur Zamarin
2023-09-24 22:26 Sam James
2023-03-19 17:36 Arthur Zamarin
2022-09-28 21:27 Sam James
2022-09-28 19:05 Arthur Zamarin
2022-09-28 16:29 Arthur Zamarin
2022-08-16 17:34 Arthur Zamarin
2022-08-16 17:34 Arthur Zamarin
2022-08-15  7:41 Agostino Sarubbo
2022-08-15  7:40 Agostino Sarubbo
2022-08-14 19:25 Arthur Zamarin
2022-08-14 19:25 Arthur Zamarin
2022-08-14 19:24 Arthur Zamarin
2022-08-14 19:24 Arthur Zamarin
2022-05-17  8:37 WANG Xuerui
2022-05-17  8:37 WANG Xuerui
2022-05-03 18:41 Sam James
2022-05-03  1:21 Sam James
2022-05-03  1:21 Sam James
2022-04-30 12:06 Arthur Zamarin
2022-04-30 12:00 Arthur Zamarin
2022-04-30 12:00 Arthur Zamarin
2022-04-30 12:00 Arthur Zamarin
2022-04-30 12:00 Arthur Zamarin
2021-03-17  4:31 Sam James
2021-01-25 14:16 Sam James
2020-12-15  3:58 Sam James
2020-12-15  3:58 Sam James
2020-10-28  0:04 Sam James
2020-07-25 21:04 Matthew Thode
2020-06-28 22:19 Aaron Bauman
2020-06-11 22:21 Aaron Bauman
2020-06-11 22:21 Aaron Bauman
2020-02-14 16:46 Matthew Thode
2020-02-14 16:46 Matthew Thode
2019-11-21 23:11 Georgy Yakovlev
2019-08-17  2:06 Georgy Yakovlev
2019-08-17  2:06 Georgy Yakovlev
2019-06-10 14:54 Matthew Thode
2019-05-29 20:45 Aaron Bauman
2019-04-24 23:11 Thomas Deutschmann
2019-04-10  5:03 Aaron Bauman
2019-04-10  3:46 Aaron Bauman
2019-04-10  3:01 Aaron Bauman
2019-03-07  0:37 Aaron Bauman
2019-03-01 20:25 Matthew Thode
2019-02-28 15:51 Matthew Thode
2019-02-09  2:23 Matthew Thode
2018-10-22 20:24 Michał Górny
2018-10-22 20:24 Michał Górny
2018-10-22 20:24 Michał Górny
2018-10-22 20:24 Michał Górny
2018-05-16 10:49 Lars Wendler
2018-02-06  9:57 David Seifert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1651603247.e56156ff6b5bb4c6d78661151aa44dfa6a0f2271.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox