mgorny 15/06/05 16:38:21 Modified: ChangeLog freebsd.eclass Log: Enable IUSE=profile globally. Use upstream tarball for FreeBSD > 10.0.
Revision Changes Path 1.1641 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1641&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1641&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1640&r2=1.1641 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1640 retrieving revision 1.1641 diff -u -r1.1640 -r1.1641 --- ChangeLog 4 Jun 2015 18:49:42 -0000 1.1640 +++ ChangeLog 5 Jun 2015 16:38:21 -0000 1.1641 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1640 2015/06/04 18:49:42 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1641 2015/06/05 16:38:21 mgorny Exp $ + + 05 Jun 2015; Michał Górny <[email protected]> freebsd.eclass: + Enable IUSE=profile globally. Use upstream tarball for FreeBSD > 10.0. 04 Jun 2015; Michael Palimaka <[email protected]> chromium.eclass, kde4-base.eclass: 1.38 eclass/freebsd.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.38&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.38&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?r1=1.37&r2=1.38 Index: freebsd.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- freebsd.eclass 24 May 2015 08:43:02 -0000 1.37 +++ freebsd.eclass 5 Jun 2015 16:38:21 -0000 1.38 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.37 2015/05/24 08:43:02 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.38 2015/06/05 16:38:21 mgorny Exp $ # # Diego Pettenò <[email protected]> @@ -66,10 +66,19 @@ ESVN_PROJECT="freebsd-${BRANCH}" fi -if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then - IUSE="profile" +# use the original source code. +if [[ ${MY_PV} != *9999* ]] && version_is_at_least 10.0 ${RV} ; then + DL_PV=${MY_PV/_rc/-RC} + DL_PV=${DL_PV/_beta/-BETA} + DL_PV=${DL_PV/_alpha/-ALPHA} + if [[ ${DL_PV} == ${MY_PV} ]]; then + DL_PV="${DL_PV}-RELEASE" + fi + SRC_URI="mirror://freebsd/releases/i386/${DL_PV}/src.txz -> freebsd-src-${MY_PV}.tar.xz" fi +IUSE="profile" + #unalias -a alias install-info='/usr/bin/bsdinstall-info' @@ -153,9 +162,22 @@ [[ -e "${WORKDIR}"/share/mk ]] && rm -rf "${WORKDIR}"/share/mk/*.mk fi else - for f in ${A} ; do - [[ ${f} == *.tar.* ]] && unpack ${f} - done + if version_is_at_least 10.0 ${RV} ; then + local tarball="freebsd-src-${MY_PV}.tar.xz" + local topdir="usr/src/" + local extractlist=() + for i in ${EXTRACTONLY} ; do + extractlist+=( ${topdir}${i} ) + done + ebegin "Unpacking parts of ${tarball} to ${WORKDIR}" + cd "${WORKDIR}" || die + tar -xJpf "${DISTDIR}/${tarball}" --strip-components=2 "${extractlist[@]}" 2> /dev/null || die "tar extract command failed" + cd - || die + else + for f in ${A} ; do + [[ ${f} == *.tar.* ]] && unpack ${f} + done + fi fi cd "${S}"
