diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-03-19 11:51:07 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-03-19 11:51:07 +0000 |
| commit | bbf334e5c06d8676968eb2327d560d97c76a4523 (patch) | |
| tree | e2be7c9800aa6fed357f9dda0d7c5f9d20357b13 /sys-freebsd/freebsd-rescue | |
| parent | Fix bug 293374 and sync with fedora to solve other issues (diff) | |
| download | gentoo-2-bbf334e5c06d8676968eb2327d560d97c76a4523.tar.gz gentoo-2-bbf334e5c06d8676968eb2327d560d97c76a4523.tar.bz2 gentoo-2-bbf334e5c06d8676968eb2327d560d97c76a4523.zip | |
bump to 8.0 from the bsd overlay
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd/freebsd-rescue')
4 files changed, 71 insertions, 1 deletions
diff --git a/sys-freebsd/freebsd-rescue/ChangeLog b/sys-freebsd/freebsd-rescue/ChangeLog index 598c9d7ecf15..4c2ad1cca2c7 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.21 2010/03/11 11:09:04 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.22 2010/03/19 11:50:47 aballier Exp $ + +*freebsd-rescue-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> + +freebsd-rescue-8.0.ebuild, + +files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch, metadata.xml: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> freebsd-rescue-7.2.ebuild: 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 new file mode 100644 index 000000000000..7d12621cec80 --- /dev/null +++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch @@ -0,0 +1,11 @@ +--- 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/freebsd-rescue-8.0.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-8.0.ebuild new file mode 100644 index 000000000000..2155745d4184 --- /dev/null +++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-8.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-8.0.ebuild,v 1.1 2010/03/19 11:50:47 aballier Exp $ + +EAPI=2 + +inherit bsdmk freebsd + +DESCRIPTION="FreeBSD's rescue binaries" +SLOT="0" +KEYWORDS="~x86-fbsd" +LICENSE="BSD zfs? ( CDDL )" + +IUSE="atm 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-2.7.1[static-libs] + dev-util/pkgconfig + =sys-freebsd/freebsd-lib-${RV}*[atm?] + =sys-freebsd/freebsd-sources-${RV}* + =sys-freebsd/freebsd-mk-defs-${RV}*" + +S="${WORKDIR}/rescue" + +pkg_setup() { + use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " + 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 +} diff --git a/sys-freebsd/freebsd-rescue/metadata.xml b/sys-freebsd/freebsd-rescue/metadata.xml index ecedda4aa2cc..6a5b4ea9ea0b 100644 --- a/sys-freebsd/freebsd-rescue/metadata.xml +++ b/sys-freebsd/freebsd-rescue/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>bsd</herd> + <use> + <flag name='zfs'>Enable ZFS support.</flag> + </use> </pkgmetadata> |