mgorny 15/02/22 14:16:03 Modified: ChangeLog freebsd.eclass Log: Fix support for FreeBSD 10.0. Force /usr/share/mk there, and fix version comparison for install commands. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/36 by nigoro.
Revision Changes Path 1.1549 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1549&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1549&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1548&r2=1.1549 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1548 retrieving revision 1.1549 diff -u -r1.1548 -r1.1549 --- ChangeLog 21 Feb 2015 13:51:34 -0000 1.1548 +++ ChangeLog 22 Feb 2015 14:16:03 -0000 1.1549 @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1548 2015/02/21 13:51:34 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1549 2015/02/22 14:16:03 mgorny Exp $ + + 22 Feb 2015; Michał Górny <[email protected]> freebsd.eclass: + Fix support for FreeBSD 10.0. Force /usr/share/mk there, and fix version + comparison for install commands. + https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/36 by nigoro. 21 Feb 2015; Michael Palimaka <[email protected]> kde4-base.eclass: Add new and remove old SRC_URI. Update live ebuild branching. 1.36 eclass/freebsd.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.36&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.36&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?r1=1.35&r2=1.36 Index: freebsd.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- freebsd.eclass 28 Aug 2013 15:56:11 -0000 1.35 +++ freebsd.eclass 22 Feb 2015 14:16:03 -0000 1.36 @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.35 2013/08/28 15:56:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.36 2015/02/22 14:16:03 mgorny Exp $ # # Diego Pettenò <[email protected]> @@ -129,6 +129,12 @@ freebsd_src_unpack() { if [[ ${MY_PV} == *9999* ]]; then S="${WORKDIR}" subversion_src_unpack + + # When share/mk exists in ${WORKDIR}, it is used on FreeBSD 10.0 + # Removed "${WORKDIR}"/share/mk/*.mk, use to force /usr/share/mk. + if [[ ${PN} != freebsd-mk-defs ]] ; then + [[ -e "${WORKDIR}"/share/mk ]] && rm -rf "${WORKDIR}"/share/mk/*.mk + fi else unpack ${A} fi @@ -141,7 +147,7 @@ # Starting from FreeBSD 9.2, its install command supports the -l option and # they now use it. Emulate it if we are on a system that does not have it. - if [[ ${RV} > 9.1 ]] && ! has_version '>=sys-freebsd/freebsd-ubin-9.2_beta1' ; then + if version_is_at_least 9.2 ${RV} && ! has_version '>=sys-freebsd/freebsd-ubin-9.2_beta1' ; then export INSTALL_LINK="ln -f" export INSTALL_SYMLINK="ln -fs" fi
