From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1355283-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 ECC6B158087 for <garchives@archives.gentoo.org>; Tue, 4 Jan 2022 16:13:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB6EF2BC009; Tue, 4 Jan 2022 16:13:50 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB6AB2BC009 for <gentoo-commits@lists.gentoo.org>; Tue, 4 Jan 2022 16:13:50 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 764FF342C9C for <gentoo-commits@lists.gentoo.org>; Tue, 4 Jan 2022 16:13:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 102A626F for <gentoo-commits@lists.gentoo.org>; Tue, 4 Jan 2022 16:13:48 +0000 (UTC) From: "Ben Kohler" <bkohler@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, "Ben Kohler" <bkohler@gentoo.org> Message-ID: <1641312810.e31b337e39136bb119ac45d63e1dcbb99ba55790.bkohler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild X-VCS-Directories: sys-apps/memtest86+/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: e31b337e39136bb119ac45d63e1dcbb99ba55790 X-VCS-Branch: master Date: Tue, 4 Jan 2022 16:13:48 +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: bf18a819-e5be-477f-8da9-9ad3d6a84962 X-Archives-Hash: 38b4e1d241c0a09dd422ae402faedffa commit: e31b337e39136bb119ac45d63e1dcbb99ba55790 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Tue Jan 4 15:48:36 2022 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Tue Jan 4 16:13:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31b337e sys-apps/memtest86+: drop old Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild | 114 ------------------------ sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild | 116 ------------------------- 2 files changed, 230 deletions(-) diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild deleted file mode 100644 index f1d2ec759176..000000000000 --- a/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit mount-boot toolchain-funcs - -DESCRIPTION="Memory tester based on memtest86" -HOMEPAGE="http://www.memtest.org/" -SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="+boot floppy iso serial" - -BOOTDIR="/boot/memtest86plus" -QA_PRESTRIPPED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest" -QA_FLAGS_IGNORED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest" - -RDEPEND="floppy? ( sys-fs/mtools )" -DEPEND="${RDEPEND}" -BDEPEND="iso? ( app-cdr/cdrtools )" - -PATCHES=( - "${FILESDIR}/${P}-gcc-473.patch" - "${FILESDIR}/${P}-hardcoded_cc.patch" - "${FILESDIR}/${P}-no-clean.patch" #557890 - "${FILESDIR}/${P}-objcopy.patch" - "${FILESDIR}/${P}-test-random-cflags.patch" #590974 - "${FILESDIR}/${P}-fix-gcc8-freeze-crash.patch" -) - -pkg_pretend() { - use boot && mount-boot_pkg_pretend -} - -src_prepare() { - sed -i -e 's,0x10000,0x100000,' memtest.lds || die - sed -i 's:genisoimage:mkisofs:' makeiso.sh || die - - if use serial ; then - sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ - config.h || die "sed failed" - fi - default -} - -src_configure() { - tc-ld-disable-gold #580212 - tc-export AS CC LD -} - -src_compile() { - emake OBJCOPY="$(tc-getOBJCOPY)" - if use iso ; then - ./makeiso.sh || die - fi -} - -src_test() { :; } - -src_install() { - if use boot ; then - insinto "${BOOTDIR}" - doins memtest memtest.bin - fi - - insinto /usr/share/${PN} - use iso && newins mt*.iso memtest.iso - doins memtest memtest.bin - - exeinto /etc/grub.d - newexe "${FILESDIR}"/39_${PN}-r1 39_${PN} - - dodoc README README.build-process FAQ changelog - - if use floppy ; then - dobin "${FILESDIR}"/make-memtest86+-boot-floppy - doman "${FILESDIR}"/make-memtest86+-boot-floppy.1 - fi -} - -pkg_preinst() { - use boot && mount-boot_pkg_preinst -} - -pkg_postinst() { - if use boot; then - mount-boot_pkg_postinst - - elog "memtest86+ has been installed in ${BOOTDIR}/" - elog "You may wish to update your bootloader configs:" - elog " - For grub2 just re-run grub-mkconfig -o /boot/grub/grub.cfg, since a" - elog " config generator has been installed at /etc/grub.d/39_${PN}" - elog " - For lilo, add the following to /etc/lilo.conf and re-run lilo:" - elog " > image = ${BOOTDIR}/memtest.bin" - elog " > label = ${PN}" - elog "" - elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'." - fi - - if use boot && [ -e /sys/firmware/efi ]; then - ewarn "WARNING: You appear to be booted in EFI mode but ${PN} is a BIOS-only tool." - fi -} - -pkg_prerm() { - use boot && mount-boot_pkg_prerm -} - -pkg_postrm() { - use boot && mount-boot_pkg_postrm -} diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild deleted file mode 100644 index 3962c3e9f986..000000000000 --- a/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit mount-boot toolchain-funcs - -DESCRIPTION="Memory tester based on memtest86" -HOMEPAGE="http://www.memtest.org/" -SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="+boot floppy iso serial" - -BOOTDIR="/boot/memtest86plus" -QA_PRESTRIPPED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest" -QA_FLAGS_IGNORED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest" - -RDEPEND="floppy? ( sys-fs/mtools )" -DEPEND="${RDEPEND}" -BDEPEND="iso? ( app-cdr/cdrtools )" - -PATCHES=( - "${FILESDIR}/${P}-gcc-473.patch" - "${FILESDIR}/${P}-hardcoded_cc.patch" - "${FILESDIR}/${P}-no-clean.patch" #557890 - "${FILESDIR}/${P}-objcopy.patch" - "${FILESDIR}/${P}-test-random-cflags.patch" #590974 - "${FILESDIR}/${P}-fix-gcc8-freeze-crash.patch" -) - -pkg_pretend() { - use boot && mount-boot_pkg_pretend -} - -src_prepare() { - sed -i -e 's,0x10000,0x100000,' memtest.lds || die - sed -i 's:genisoimage:mkisofs:' makeiso.sh || die - - if use serial ; then - sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ - config.h || die "sed failed" - fi - #613196 - use amd64 && sed -i -e's,$(LD) -s -T memtest.lds,$(LD) -s -T memtest.lds -z max-page-size=0x1000,' Makefile - default -} - -src_configure() { - tc-ld-disable-gold #580212 - tc-export AS CC LD -} - -src_compile() { - emake OBJCOPY="$(tc-getOBJCOPY)" - if use iso ; then - ./makeiso.sh || die - fi -} - -src_test() { :; } - -src_install() { - if use boot ; then - insinto "${BOOTDIR}" - doins memtest memtest.bin - fi - - insinto /usr/share/${PN} - use iso && newins mt*.iso memtest.iso - doins memtest memtest.bin - - exeinto /etc/grub.d - newexe "${FILESDIR}"/39_${PN}-r1 39_${PN} - - dodoc README README.build-process FAQ changelog - - if use floppy ; then - dobin "${FILESDIR}"/make-memtest86+-boot-floppy - doman "${FILESDIR}"/make-memtest86+-boot-floppy.1 - fi -} - -pkg_preinst() { - use boot && mount-boot_pkg_preinst -} - -pkg_postinst() { - if use boot; then - mount-boot_pkg_postinst - - elog "memtest86+ has been installed in ${BOOTDIR}/" - elog "You may wish to update your bootloader configs:" - elog " - For grub2 just re-run grub-mkconfig -o /boot/grub/grub.cfg, since a" - elog " config generator has been installed at /etc/grub.d/39_${PN}" - elog " - For lilo, add the following to /etc/lilo.conf and re-run lilo:" - elog " > image = ${BOOTDIR}/memtest.bin" - elog " > label = ${PN}" - elog "" - elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'." - fi - - if use boot && [ -e /sys/firmware/efi ]; then - ewarn "WARNING: You appear to be booted in EFI mode but ${PN} is a BIOS-only tool." - fi -} - -pkg_prerm() { - use boot && mount-boot_pkg_prerm -} - -pkg_postrm() { - use boot && mount-boot_pkg_postrm -}