[gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-rescue: ChangeLog freebsd-rescue-9.2_rc1.ebuild

[gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-rescue: ChangeLog freebsd-rescue-9.2_rc1.ebuild

[Alexis Ballier (aballier)]

aballier    13/08/11 19:45:47

  Modified:             ChangeLog
  Added:                freebsd-rescue-9.2_rc1.ebuild
  Log:
  Version bump, based on work of Yuta Satoh, simplified by me: Build our own static libarchive. It is good to use system shared libraries but here it is a statically linked rescue shell, trying use system libarchive.a made us carry a lot of patches and pkg-config started to fail on us. Not counting libarchive.pc not correctly declaring its private libs.
  
  (Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.38                 sys-freebsd/freebsd-rescue/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog?r1=1.37&r2=1.38

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog	9 Aug 2013 15:02:25 -0000	1.37
+++ ChangeLog	11 Aug 2013 19:45:47 -0000	1.38
@@ -1,6 +1,16 @@
 # ChangeLog for sys-freebsd/freebsd-rescue
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.37 2013/08/09 15:02:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.38 2013/08/11 19:45:47 aballier Exp $
+
+*freebsd-rescue-9.2_rc1 (11 Aug 2013)
+
+  11 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  +freebsd-rescue-9.2_rc1.ebuild:
+  Version bump, based on work of Yuta Satoh, simplified by me: Build our own
+  static libarchive. It is good to use system shared libraries but here it is a
+  statically linked rescue shell, trying use system libarchive.a made us carry
+  a lot of patches and pkg-config started to fail on us. Not counting
+  libarchive.pc not correctly declaring its private libs.
 
   09 Aug 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-rescue-9.0.ebuild:
   remove old



1.1                  sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-9.2_rc1.ebuild?rev=1.1&content-type=text/plain

Index: freebsd-rescue-9.2_rc1.ebuild
===================================================================
# Copyright 1999-2013 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.2_rc1.ebuild,v 1.1 2013/08/11 19:45:47 aballier Exp $

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"
	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 )"
fi

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[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() {
	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}"
	epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
	epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
}

src_compile() {
	tc-export CC
	# crunchgen is now checks env MAKE.
	# Use to force BSD's make
	export MAKE=/usr/bin/make

	cd "${WORKDIR}/lib/libarchive"
	echo "#include <expat.h>" > bsdxml.h
	freebsd_src_compile
	export CC="${CC} -L${WORKDIR}/lib/libarchive"

	cd "${S}"
	freebsd_src_compile
}