commit: b26113ad39debb2246de484a787196697a47c192 Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com> AuthorDate: Mon Nov 24 18:48:10 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Nov 26 03:09:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26113ad
app-text/lowdown: bmake compatibility fix, drop old versions GNU Make has many valid short ops and long ops, most of which are incompatible with bmake. We can either chase sanitization or do the sane thing, unset MAKEOPTS and MAKEFLAGS and pass just jobs Closes: https://bugs.gentoo.org/966238 Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com> Part-of: https://github.com/gentoo/gentoo/pull/44764 Closes: https://github.com/gentoo/gentoo/pull/44764 Signed-off-by: Sam James <sam <AT> gentoo.org> app-text/lowdown/Manifest | 4 -- app-text/lowdown/lowdown-1.1.1.ebuild | 67 --------------------- app-text/lowdown/lowdown-1.3.2.ebuild | 69 ---------------------- app-text/lowdown/lowdown-1.4.0.ebuild | 69 ---------------------- ...owdown-2.0.0.ebuild => lowdown-2.0.2-r1.ebuild} | 14 ++++- app-text/lowdown/lowdown-2.0.4.ebuild | 18 +++--- 6 files changed, 19 insertions(+), 222 deletions(-) diff --git a/app-text/lowdown/Manifest b/app-text/lowdown/Manifest index c9ed9e52784e..58d5eef13145 100644 --- a/app-text/lowdown/Manifest +++ b/app-text/lowdown/Manifest @@ -1,6 +1,2 @@ -DIST lowdown-1.1.1.tar.gz 600635 BLAKE2B 39c0a2472ff6b9b3fa2b6d72c1f2d482592976f7b50c1bbaf1965bfbb6d28f22e0a7498bb54087bb83070bd74ea673409be97815f51a0a5a67e980bbfc4e01b2 SHA512 2a69da945a83696480651e8221d73bcb18bac9bc38bb88126ddf73520d2a4ff396dde08a7abf6f550669ec9ba34abdaa186b0980f312fa157371ee754576bb6a -DIST lowdown-1.3.2.tar.gz 670610 BLAKE2B 80238e7c6a27c45d6b3f65fbb9435639db5f424aad28c05a94093c5fab3982b1b05b5c3d779e5f74d8b2e71046301c2e3c0ee83496f44f6b8597cd0b3797eb14 SHA512 9592fd270c61d7e827a0e7885ce5faef545a33e61afa0d4cf4549cf5866d82873b042a9cb4465d7b504c686a7b89c748257c470c3b3ccb1ec6f1203a7e6bf392 -DIST lowdown-1.4.0.tar.gz 675327 BLAKE2B 1e734acefe3d293dd6e60f27ff943b484ac99a9e393fd118df09be6dd9671294a91de306393817af9422fec67ed9eda22e2515538b490ac07bdd93ac2e5617e4 SHA512 61b88fc24c9c69a324536bc5cc3edbd453f59945cda264df8751cf361992487081911d3ba6cb04346d5ef451d96a4b56e69a76985849349ef049eca0a098b7ee -DIST lowdown-2.0.0.tar.gz 675824 BLAKE2B 01df89f7703f3c313b373b0eee2eee86d409a06fe298be6f90cd0198fb84a3eedf8e5ea9c03082797bfa0ff76b28f6c4d032e28f6b1d233af2a988bef46cf689 SHA512 520741453556710ebdd379de2f1b6444c0019ed556e5c9852b1bb8b2cbd5853cf5edb80e65dc9e1d4fabfb028b96af0adf776642ba07aa3af436d4c57e7d7811 DIST lowdown-2.0.2.tar.gz 676246 BLAKE2B 35ca947673d7582b64687200429f8e806703cc0ad43b019a0302f35da4e1d579253ec199f2abd4eadcb30b81d2feb34c0baad41dbcc601533729049c7d7cc74d SHA512 ebd927776f13e78c26e1c001e8586dc43fe1e64d1c537a18cd71bd6a8936c93a9fefcb58c53e94a7c0727b525f6c6a21ab70b924db8c7c105161a6a92d9c96fa DIST lowdown-2.0.4.tar.gz 697300 BLAKE2B 07afe0f0a5e4d7f258bed5fc7a4a2e052384f852b12cf285cf3546cbe92bc05dd8d38ca3553cb0314a2823b22526f1a97be042dbdb472397afa10eb9c638a8d7 SHA512 db396f738c3effdd55f112f2f71183b32b45ae2f8ba999e03df5162612e26a313d7b3ca1c5840cb71805f4429a4a3b67fe61a731aadc5cc989b74ff2da2d5b7e diff --git a/app-text/lowdown/lowdown-1.1.1.ebuild b/app-text/lowdown/lowdown-1.1.1.ebuild deleted file mode 100644 index edac6aa6e811..000000000000 --- a/app-text/lowdown/lowdown-1.1.1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2021-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs flag-o-matic - -MY_PV="VERSION_${PV//./_}" -DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats" -HOMEPAGE="https://kristaps.bsd.lv/lowdown/"; -SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="ISC" -SLOT="0/2" -KEYWORDS="amd64 arm64 ~ppc64 x86" - -DEPEND=" - virtual/libcrypt:= -" -RDEPEND=" - ${DEPEND} -" - -# configure tests for a bunch of BSD functions on Linux -QA_CONFIG_IMPL_DECL_SKIP=( - crypt_newhash - crypt_checkpass - warnc - errc - getexecname - getprogname - memset_s - pledge - recallocarray - strlcat - strlcpy - strtonum - TAILQ_FOREACH_SAFE - unveil -) - -PATCHES=( - "${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch" - "${FILESDIR}/lowdown-1.1.0-shared-linking.patch" -) - -src_configure() { - append-flags -fPIC - tc-export CC AR - - ./configure \ - PREFIX="/usr" \ - MANDIR="/usr/share/man" \ - LDFLAGS="${LDFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" \ - LIBDIR="/usr/$(get_libdir)" \ - || die "./configure failed" -} - -src_compile() { - emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '') -} - -src_test() { - LD_LIBRARY_PATH="${S}" emake regress -} diff --git a/app-text/lowdown/lowdown-1.3.2.ebuild b/app-text/lowdown/lowdown-1.3.2.ebuild deleted file mode 100644 index 5439d2e6de7c..000000000000 --- a/app-text/lowdown/lowdown-1.3.2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2021-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs flag-o-matic - -MY_PV="VERSION_${PV//./_}" -DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats" -HOMEPAGE="https://kristaps.bsd.lv/lowdown/"; -SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="ISC" -SLOT="0/2" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86" - -DEPEND=" - virtual/libcrypt:= -" -RDEPEND=" - ${DEPEND} -" - -# configure tests for a bunch of BSD functions on Linux -QA_CONFIG_IMPL_DECL_SKIP=( - crypt_newhash - crypt_checkpass - warnc - errc - getexecname - getprogname - memset_s - pledge - recallocarray - strlcat - strlcpy - strtonum - TAILQ_FOREACH_SAFE - unveil - arc4random - b64_ntop -) - -PATCHES=( - "${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch" - "${FILESDIR}/lowdown-1.3.0-shared-linking.patch" -) - -src_configure() { - append-flags -fPIC - tc-export CC AR - - ./configure \ - PREFIX="${EPREFIX}/usr" \ - MANDIR="${EPREFIX}/usr/share/man" \ - LDFLAGS="${LDFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - || die "./configure failed" -} - -src_compile() { - emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '') -} - -src_test() { - LD_LIBRARY_PATH="${S}" emake regress -} diff --git a/app-text/lowdown/lowdown-1.4.0.ebuild b/app-text/lowdown/lowdown-1.4.0.ebuild deleted file mode 100644 index 5439d2e6de7c..000000000000 --- a/app-text/lowdown/lowdown-1.4.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2021-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs flag-o-matic - -MY_PV="VERSION_${PV//./_}" -DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats" -HOMEPAGE="https://kristaps.bsd.lv/lowdown/"; -SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="ISC" -SLOT="0/2" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86" - -DEPEND=" - virtual/libcrypt:= -" -RDEPEND=" - ${DEPEND} -" - -# configure tests for a bunch of BSD functions on Linux -QA_CONFIG_IMPL_DECL_SKIP=( - crypt_newhash - crypt_checkpass - warnc - errc - getexecname - getprogname - memset_s - pledge - recallocarray - strlcat - strlcpy - strtonum - TAILQ_FOREACH_SAFE - unveil - arc4random - b64_ntop -) - -PATCHES=( - "${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch" - "${FILESDIR}/lowdown-1.3.0-shared-linking.patch" -) - -src_configure() { - append-flags -fPIC - tc-export CC AR - - ./configure \ - PREFIX="${EPREFIX}/usr" \ - MANDIR="${EPREFIX}/usr/share/man" \ - LDFLAGS="${LDFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - || die "./configure failed" -} - -src_compile() { - emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '') -} - -src_test() { - LD_LIBRARY_PATH="${S}" emake regress -} diff --git a/app-text/lowdown/lowdown-2.0.0.ebuild b/app-text/lowdown/lowdown-2.0.2-r1.ebuild similarity index 86% rename from app-text/lowdown/lowdown-2.0.0.ebuild rename to app-text/lowdown/lowdown-2.0.2-r1.ebuild index b7265610ed8c..2e568dc1ac15 100644 --- a/app-text/lowdown/lowdown-2.0.0.ebuild +++ b/app-text/lowdown/lowdown-2.0.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit toolchain-funcs flag-o-matic +inherit flag-o-matic multiprocessing toolchain-funcs MY_PV="VERSION_${PV//./_}" DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats" @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="ISC" SLOT="0/3" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" DEPEND=" virtual/libcrypt:= @@ -21,6 +21,9 @@ DEPEND=" RDEPEND=" ${DEPEND} " +BDEPEND=" + dev-build/bmake +" # configure tests for a bunch of BSD functions on Linux QA_CONFIG_IMPL_DECL_SKIP=( @@ -51,6 +54,13 @@ src_configure() { append-flags -fPIC tc-export CC AR + local jobs="$(makeopts_jobs)" + unset MAKEOPTS + unset MAKEFLAGS + + export MAKEOPTS="-j${jobs}" + export MAKE=bmake + ./configure \ PREFIX="${EPREFIX}/usr" \ MANDIR="${EPREFIX}/usr/share/man" \ diff --git a/app-text/lowdown/lowdown-2.0.4.ebuild b/app-text/lowdown/lowdown-2.0.4.ebuild index db3821b66321..9f9ae7cb868f 100644 --- a/app-text/lowdown/lowdown-2.0.4.ebuild +++ b/app-text/lowdown/lowdown-2.0.4.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit toolchain-funcs flag-o-matic +inherit flag-o-matic multiprocessing toolchain-funcs MY_PV="VERSION_${PV//./_}" DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats" @@ -54,17 +54,13 @@ PATCHES=( src_configure() { append-flags -fPIC tc-export CC AR - export MAKE=bmake - local flag makeopts - for flag in ${MAKEOPTS}; do - case "${flag}" in - -l*) ;; - -O) ;; - *) makeopts+=" ${flag}";; - esac - done - export MAKEOPTS="${makeopts}" + local jobs="$(makeopts_jobs)" + unset MAKEOPTS + unset MAKEFLAGS + + export MAKEOPTS="-j${jobs}" + export MAKE=bmake ./configure \ PREFIX="${EPREFIX}/usr" \
