[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-rescue/, sys-freebsd/freebsd-rescue/files/

[Aaron Bauman]

commit:     3ee36efb2947047e16b1710d23c78176e0a9f7dd
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 19:31:56 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat May 26 20:31:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee36efb

sys-freebsd/freebsd-rescue: drop EAPI=2

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-freebsd/freebsd-rescue/Manifest                | 11 ----
 .../files/freebsd-rescue-7.1-zlib.patch            | 21 --------
 ...sd-rescue-8.0-pkgconfig_static_libarchive.patch | 11 ----
 .../files/freebsd-rescue-9.1-bsdtar.patch          | 12 -----
 .../files/freebsd-rescue-9.1-libcleverlink.patch   | 21 --------
 .../files/freebsd-sbin-bsdxml2expat.patch          | 13 -----
 .../freebsd-rescue/freebsd-rescue-9.1.ebuild       | 61 ----------------------
 7 files changed, 150 deletions(-)

diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
index 4189c2c89aa..f3dcd89d595 100644
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -1,12 +1 @@
-DIST freebsd-bin-9.1.tar.bz2 385664 BLAKE2B f890e37393186ae2cddf8868d47ca8a7a5767240f02aa0d353561fd746da3c0ca57461871906481b75c8c52c9f6d45f7ea5b3c9b30f27fe81a3a64fba3085e8b SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8
-DIST freebsd-cddl-9.1.tar.bz2 899348 BLAKE2B 419e475b4c3debacd0d0fbbad4d1b13685c1c5ac741cc8cfb53dadce9d30cf9ddd7132ef8ab897787be538028d34bb9603eb76caf7650f4f50bb3295f19bf035 SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd
-DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
-DIST freebsd-rescue-9.1.tar.bz2 3939 BLAKE2B f2756276c6018ded0e9b0f73bff25a606193c9da3e5348aefda3866308c3fb2ce046e35de6020dd0b28e0457b61a4864600ae40fa51042a64d93c712f9d85858 SHA512 93015a725cea428fd6f4813370eab460979bbae3aac2e6688319a06012b4e0fe1f7b847f9e0d4da423835e59ba5a3842057b61d110d24f79109a50133e5e23bb
-DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
-DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
-DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca

diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch
deleted file mode 100644
index 22fb2ec62d4..00000000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur sbin/savecore/savecore.c sbin-zlib/savecore/savecore.c
---- sbin/savecore/savecore.c	2005-02-26 01:21:50 +0000
-+++ sbin-zlib/savecore/savecore.c	2005-05-06 12:00:06 +0000
-@@ -95,7 +95,7 @@
- static int checkfor, compress, clear, force, keep, verbose;	/* flags */
- static int nfound, nsaved, nerr;			/* statistics */
- 
--extern FILE *zopen(const char *, const char *);
-+extern FILE *gzopen(const char *, const char *);
- 
- static void
- printheader(FILE *f, const struct kerneldumpheader *h, const char *device,
-@@ -553,7 +553,7 @@
- 	if (compress) {
- 		sprintf(filename, "%s.%d.gz", istextdump ? "textdump.tar" :
- 		    "vmcore", bounds);
--		fp = zopen(filename, "w");
-+		fp = gzopen(filename, "w");
- 	} else {
- 		sprintf(filename, "%s.%d", istextdump ? "textdump.tar" :
- 		    "vmcore", bounds);

diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch
deleted file mode 100644
index 7d12621cec8..00000000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rescue/rescue/Makefile.old	2010-03-12 12:14:17 +0100
-+++ rescue/rescue/Makefile	2010-03-12 12:14:47 +0100
-@@ -209,7 +209,7 @@
- CRUNCH_LIBS+= -lbz2
- 
- CRUNCH_PROGS_usr.bin+= tar
--CRUNCH_LIBS+= -larchive -lmd
-+CRUNCH_LIBS+= `pkg-config --static --libs libarchive` -lmd
- .if ${MK_OPENSSL} != "no"
- CRUNCH_LIBS+= -lcrypto
- .endif

diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch
deleted file mode 100644
index d4d23d73f11..00000000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur work.orig/contrib/libarchive/tar/bsdtar.c work/contrib/libarchive/tar/bsdtar.c
---- work.orig/contrib/libarchive/tar/bsdtar.c	2012-07-12 13:44:29.000000000 +0900
-+++ work/contrib/libarchive/tar/bsdtar.c	2012-07-29 00:57:25.000000000 +0900
-@@ -691,7 +691,7 @@
- {
- 	printf("bsdtar %s - %s\n",
- 	    BSDTAR_VERSION_STRING,
--	    archive_version());
-+	    archive_version_string());
- 	exit(0);
- }
- 

diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch
deleted file mode 100644
index a194397b131..00000000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur work.orig/rescue/rescue/Makefile work/rescue/rescue/Makefile
---- work.orig/rescue/rescue/Makefile	2012-07-29 00:50:20.000000000 +0900
-+++ work/rescue/rescue/Makefile	2012-07-29 00:56:01.000000000 +0900
-@@ -125,7 +125,7 @@
- .if ${MK_ZFS} != "no"
- CRUNCH_LIBS+= -lavl -lnvpair -lpthread -lzfs -luutil -lumem
- .endif
--CRUNCH_LIBS+= -lgeom -lexpat -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz
-+CRUNCH_LIBS+= -lgeom -lexpat -ljail -lkiconv -lreadline -lsbuf -lufs
- 
- .if ${MACHINE_CPUARCH} == "i386"
- CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
-@@ -216,7 +216,7 @@
- CRUNCH_PROGS_usr.sbin+= chown
- CRUNCH_ALIAS_chown= chgrp
- ##################################################################
--CRUNCH_LIBS+= -lm
-+CRUNCH_LIBS+= -lmd -lz -lm
- 
- .include <bsd.crunchgen.mk>
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch b/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch
deleted file mode 100644
index bdda99b8c0d..00000000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -uNr sbin/ifconfig.old/regdomain.c sbin/ifconfig/regdomain.c
---- sbin/ifconfig.old/regdomain.c	2010-12-21 17:09:25.000000000 +0000
-+++ sbin/ifconfig/regdomain.c	2011-07-10 15:56:27.000000000 +0000
-@@ -39,7 +39,7 @@
- #include <err.h>
- #include <unistd.h>
- 
--#include <bsdxml.h>
-+#include <expat.h>
- 
- #include "regdomain.h"
- 
-Los ficheros binarios sbin/ifconfig.old/regdomain.o y sbin/ifconfig/regdomain.o son distintos

diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.ebuild
deleted file mode 100644
index 6220bcfdfa0..00000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="atm netware nis zfs"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		mirror://gentoo/${SYS}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${RESCUE}.tar.bz2
-		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
-	>=app-arch/libarchive-3.0.3[static-libs]
-	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[static-libs]
-	sys-libs/zlib[static-libs]
-	sys-libs/readline[static-libs]
-	virtual/pkgconfig
-	=sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-}
-
-src_prepare() {
-	# As they are patches from ${WORKDIR} apply them by hand
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}"-8.0-pkgconfig_static_libarchive.patch
-	epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
-	epatch "${FILESDIR}/${PN}"-9.1-libcleverlink.patch
-	epatch "${FILESDIR}/${PN}"-9.1-bsdtar.patch
-	epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
-}