bump to 9.1_rc1 from bsd overlay by Yuta SATOH, bug #426838

(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)

4 files changed, 103 insertions, 1 deletions

diff --git a/sys-freebsd/freebsd-rescue/ChangeLog b/sys-freebsd/freebsd-rescue/ChangeLog
index 733bbcb8ab61..0e8b10556f20 100644
--- a/sys-freebsd/freebsd-rescue/ChangeLog
+++ b/sys-freebsd/freebsd-rescue/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-rescue
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.30 2012/05/02 21:41:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.31 2012/09/11 20:04:19 aballier Exp $
+
+*freebsd-rescue-9.1_rc1 (11 Sep 2012)
+
+  11 Sep 2012; Alexis Ballier <aballier@gentoo.org>
+  +freebsd-rescue-9.1_rc1.ebuild, +files/freebsd-rescue-9.1-bsdtar.patch,
+  +files/freebsd-rescue-9.1-libcleverlink.patch:
+  bump to 9.1_rc1 from bsd overlay by Yuta SATOH, bug #426838
 
   02 May 2012; Jeff Horelick <jdhore@gentoo.org> freebsd-rescue-8.0.ebuild,
   freebsd-rescue-8.2.ebuild, freebsd-rescue-9.0.ebuild:
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
new file mode 100644
index 000000000000..d4d23d73f11c
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..a194397b1311
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch
@@ -0,0 +1,21 @@
+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/freebsd-rescue-9.1_rc1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1_rc1.ebuild
new file mode 100644
index 000000000000..408f85da7843
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1_rc1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1_rc1.ebuild,v 1.1 2012/09/11 20:04:19 aballier Exp $
+
+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"
+}