commit: 6a0a168f9422e8ec5e6043c46da9c355d703e2a9 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Thu May 27 21:12:00 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu May 27 21:12:00 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a0a168f
sys-devel/bmake: Remove old 20210314-r1 Closes: https://github.com/gentoo/gentoo/pull/20723 Closes: https://github.com/gentoo/gentoo/pull/21008 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> sys-devel/bmake/Manifest | 1 - sys-devel/bmake/bmake-20210314-r1.ebuild | 55 ----------------------- sys-devel/bmake/files/bmake-20210206-lib-mk.patch | 11 ----- 3 files changed, 67 deletions(-) diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest index 134345967b9..4872b6c45fe 100644 --- a/sys-devel/bmake/Manifest +++ b/sys-devel/bmake/Manifest @@ -1,3 +1,2 @@ -DIST bmake-20210314.tar.gz 749343 BLAKE2B 765b06577d8b06924627de7c2551e4fa25bdf533f2ce96db09a63af01d965e2bc29001e2c07df98a15d72b3c57a11e99974df82b9ec12257c9340baf563c3faf SHA512 d27c3787102d32ccd541909aaf76083ff9d2f704b938ba64d234c5d29d2e7dea320e99bbee53d3594aa830ced59d512d8701487ec5b0c277339e705d6e64f97d DIST bmake-20210420.tar.gz 755281 BLAKE2B fe98dc5d0c5a11aecf45b160cfe5b69ef49e56a973823e84ec1f607023aa94d66cd87bc3f31fc340dc86eae0a6e87ca2a71b8367f3e9bb1a9eae8626d13a80ea SHA512 3bb603965c149e4f6bee4afff9710921e943bd1faaf5d142418a5f7a0752416e094b6a0f0dfc998bf6bedc391f668162856a51167e34b6f2ad2a0a498c96ed35 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b diff --git a/sys-devel/bmake/bmake-20210314-r1.ebuild b/sys-devel/bmake/bmake-20210314-r1.ebuild deleted file mode 100644 index d8e7d457313..00000000000 --- a/sys-devel/bmake/bmake-20210314-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MK_VER=20210330 - -DESCRIPTION="NetBSD's portable make" -HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"; -SRC_URI=" - http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz - http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"; -S="${WORKDIR}/${PN}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" - -# Skip failing test (sandbox and csh) -PATCHES=( "${FILESDIR}"/${PN}-20210206-tests.patch ) - -src_prepare() { - default - cd "${WORKDIR}" || die - eapply "${FILESDIR}"/${P}-mk-fixes.patch -} - -src_configure() { - econf \ - --with-mksrc=../mk \ - --with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \ - --with-machine_arch=${ARCH} -} - -src_compile() { - sh make-bootstrap.sh || die "bootstrap failed" -} - -src_test() { - cd unit-tests || die - - # the 'ternary' test uses ${A} internally, which - # conflicts with Gentoo's ${A}, hence unset it for - # the tests temporarily. - env -u A MAKEFLAGS= \ - "${S}"/bmake -r -m / TEST_MAKE="${S}"/bmake test || die "tests compilation failed" -} - -src_install() { - dobin ${PN} - doman ${PN}.1 - FORCE_BSD_MK=1 SYS_MK_DIR=. \ - sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \ - || die "failed to install mk files" -} diff --git a/sys-devel/bmake/files/bmake-20210206-lib-mk.patch b/sys-devel/bmake/files/bmake-20210206-lib-mk.patch deleted file mode 100644 index 5f860b6f15a..00000000000 --- a/sys-devel/bmake/files/bmake-20210206-lib-mk.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/mk/lib.mk -+++ b/mk/lib.mk -@@ -170,7 +170,7 @@ LD_solib= lib${LIB}_pic.a - .elif ${TARGET_OSNAME} == "Linux" - SHLIB_LD = ${CC} - # this is ambiguous of course --LD_shared=-shared -Wl,"-soname lib${LIB}.so.${SHLIB_MAJOR}" -+LD_shared=-shared -Wl,-soname,lib${LIB}.so.${SHLIB_MAJOR} - LD_solib= -Wl,--whole-archive lib${LIB}_pic.a -Wl,--no-whole-archive - .if ${COMPILER_TYPE} == "gcc" - # Linux uses GNU ld, which is a multi-pass linker
