summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2019-10-11 17:13:48 +0200
committerMichał Górny <mgorny@gentoo.org>2019-10-11 17:16:37 +0200
commit5beffe67c4c46e344db7274be516e39ddc7c98a9 (patch)
tree5c783c398e5ddf14c99f022a939a89a7320b1d59
parentsys-freebsd/freebsd-share: Remove last-rited pkg (diff)
downloadgentoo-5beffe67c4c46e344db7274be516e39ddc7c98a9.tar.gz
gentoo-5beffe67c4c46e344db7274be516e39ddc7c98a9.tar.bz2
gentoo-5beffe67c4c46e344db7274be516e39ddc7c98a9.zip
sys-freebsd/freebsd-rescue: Remove last-rited pkg
Closes: https://bugs.gentoo.org/683284 Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--profiles/package.mask1
-rw-r--r--sys-freebsd/freebsd-rescue/Manifest1
-rw-r--r--sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch22
-rw-r--r--sys-freebsd/freebsd-rescue/files/freebsd-rescue-11.0-rename-libs.patch22
-rw-r--r--sys-freebsd/freebsd-rescue/files/freebsd-ubin-10.2-bsdxml.patch13
-rw-r--r--sys-freebsd/freebsd-rescue/freebsd-rescue-11.1.ebuild83
-rw-r--r--sys-freebsd/freebsd-rescue/metadata.xml12
7 files changed, 0 insertions, 154 deletions
diff --git a/profiles/package.mask b/profiles/package.mask
index b906cfdb6d9..d6d415bd668 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -755,7 +755,6 @@ sys-freebsd/freebsd-libexec
sys-freebsd/freebsd-mk-defs
sys-freebsd/freebsd-pam-modules
sys-freebsd/freebsd-pf
-sys-freebsd/freebsd-rescue
# Lars Wendler <polynomial-c@gentoo.org> (2019-09-04)
# Unofficial build. Superseded by official 2.49.5 release.
diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
deleted file mode 100644
index f3dcd89d595..00000000000
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch
deleted file mode 100644
index 42165c4249e..00000000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
-index 13c0d43..1f258f3 100644
---- a/sbin/savecore/savecore.c
-+++ b/sbin/savecore/savecore.c
-@@ -92,7 +92,7 @@ static int checkfor, compress, clear, force, keep, verbose; /* flags */
- static int nfound, nsaved, nerr; /* statistics */
- static int maxdumps;
-
--extern FILE *zopen(const char *, const char *);
-+extern FILE *gzopen(const char *, const char *);
-
- static sig_atomic_t got_siginfo;
- static void infohandler(int);
-@@ -626,7 +626,7 @@ DoFile(const char *savedir, const char *device)
- if (compress) {
- snprintf(corename, sizeof(corename), "%s.%d.gz",
- istextdump ? "textdump.tar" : "vmcore", bounds);
-- fp = zopen(corename, "w");
-+ fp = gzopen(corename, "w");
- } else {
- snprintf(corename, sizeof(corename), "%s.%d",
- istextdump ? "textdump.tar" : "vmcore", bounds);
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-11.0-rename-libs.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-11.0-rename-libs.patch
deleted file mode 100644
index 31035747a43..00000000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-11.0-rename-libs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
-index e747c02..a061436 100644
---- a/rescue/rescue/Makefile
-+++ b/rescue/rescue/Makefile
-@@ -54,7 +54,7 @@ CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \
- ed expr getfacl hostname kenv kill ln ls mkdir mv \
- pkill ps pwd realpath rm rmdir setfacl sh sleep stty \
- sync test
--CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -lelf -ll -ltermcapw -lutil -lxo
-+CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -lelf -lfl -lncursesw -lutil -lxo
- CRUNCH_BUILDTOOLS+= bin/sh
-
- # Additional options for specific programs
-@@ -128,7 +128,7 @@ CRUNCH_LIBS+= -lavl -lzpool -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
- # liblzma needs pthread
- CRUNCH_LIBS+= -lpthread
- .endif
--CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv
-+CRUNCH_LIBS+= -lgeom -lexpat -lkiconv
- .if ${MK_OPENSSL} == "no"
- CRUNCH_LIBS+= -lmd
- .endif
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-ubin-10.2-bsdxml.patch b/sys-freebsd/freebsd-rescue/files/freebsd-ubin-10.2-bsdxml.patch
deleted file mode 100644
index 606471713fb..00000000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-ubin-10.2-bsdxml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
-index af6562b..3121c81 100644
---- a/usr.bin/mt/mt.c
-+++ b/usr.bin/mt/mt.c
-@@ -92,7 +92,7 @@ __FBSDID("$FreeBSD: stable/10/usr.bin/mt/mt.c 280438 2015-03-24 14:36:10Z ken $"
- #include <unistd.h>
- #include <stdint.h>
- #include <errno.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <mtlib.h>
-
- #include <cam/cam.h>
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-11.1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-11.1.ebuild
deleted file mode 100644
index 9cecae29df9..00000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-11.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd toolchain-funcs
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="atm netware nis zfs"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
- usr.bin/
- contrib/
- lib/
- bin/
- sbin/
- usr.sbin/
- gnu/
- sys/
- libexec/
- rescue/
-"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
- app-arch/xz-utils[static-libs]
- sys-libs/ncurses[static-libs]
- dev-libs/expat[static-libs]
- app-arch/bzip2[static-libs]
- dev-libs/libedit[static-libs]
- dev-libs/libxml2:2[static-libs]
- dev-libs/openssl:0=[static-libs]
- sys-libs/zlib[static-libs]
- sys-libs/readline[static-libs]
- =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
- =sys-freebsd/freebsd-sources-${RV}*
- =sys-freebsd/freebsd-mk-defs-${RV}*
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
- # Add the required source files.
- use zfs && EXTRACTONLY+="cddl/ "
-
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
- mymakeopts="${mymakeopts} NO_PIC= "
-}
-
-src_prepare() {
- # As they are patches from ${WORKDIR} apply them by hand
- cd "${WORKDIR}" || die
- epatch "${FILESDIR}/${PN}-10.0-zlib.patch"
- epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch"
- epatch "${FILESDIR}/freebsd-ubin-10.2-bsdxml.patch"
-}
-
-src_compile() {
- export ESED=/usr/bin/sed
- unalias sed
-
- tc-export CC
- # crunchgen requires BSD's make to compile successfully.
- export MAKE=/usr/bin/make
-
- cd "${WORKDIR}/lib/libarchive" || die
- echo "#include <expat.h>" > bsdxml.h
- freebsd_src_compile
- export CC="${CC} -L${WORKDIR}/lib/libarchive"
-
- cd "${S}" || die
- freebsd_src_compile
-}
diff --git a/sys-freebsd/freebsd-rescue/metadata.xml b/sys-freebsd/freebsd-rescue/metadata.xml
deleted file mode 100644
index 8703f7b26e6..00000000000
--- a/sys-freebsd/freebsd-rescue/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>bsd@gentoo.org</email>
- <name>BSD Project</name>
- </maintainer>
- <use>
- <flag name="zfs">Enable ZFS support.</flag>
- <flag name="netware"> Build tools to work with NetWare protocols (IPX and NCP).</flag>
- </use>
-</pkgmetadata>