mgorny 15/05/24 08:43:02 Modified: ChangeLog freebsd.eclass Log: Support fetching upstream patches, https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/121 by nigoro.
Revision Changes Path 1.1619 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1619&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1619&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1618&r2=1.1619 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1618 retrieving revision 1.1619 diff -u -r1.1618 -r1.1619 --- ChangeLog 21 May 2015 01:37:25 -0000 1.1618 +++ ChangeLog 24 May 2015 08:43:02 -0000 1.1619 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1618 2015/05/21 01:37:25 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1619 2015/05/24 08:43:02 mgorny Exp $ + + 24 May 2015; Michał Górny <[email protected]> freebsd.eclass: + Support fetching upstream patches, + https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/121 by nigoro. 21 May 2015; Mike Gilbert <[email protected]> chromium.eclass: Add kernel Check for USER_NS, bug 545078. 1.37 eclass/freebsd.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.37&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.37&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?r1=1.36&r2=1.37 Index: freebsd.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- freebsd.eclass 22 Feb 2015 14:16:03 -0000 1.36 +++ freebsd.eclass 24 May 2015 08:43:02 -0000 1.37 @@ -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.36 2015/02/22 14:16:03 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.37 2015/05/24 08:43:02 mgorny Exp $ # # Diego Pettenò <[email protected]> @@ -95,6 +95,22 @@ echo "${bmake}" } +# Generates a patch SRC_URI or DISTDIR of upstream. +freebsd_upstream_patches() { + local opt=$1 + [[ ${#UPSTREAM_PATCHES[@]} -eq 0 ]] && return 1 + for x in "${UPSTREAM_PATCHES[@]}" + do + local out=${PN}-${x/\//-} + out=${out/:/} + if [[ ${opt} == -s ]] ; then + echo "${DISTDIR}/${out}" + else + echo "https://security.freebsd.org/patches/${x} -> ${out}" + fi + done +} + freebsd_do_patches() { if [[ ${#PATCHES[@]} -gt 1 ]] ; then for x in "${PATCHES[@]}"; do @@ -105,6 +121,7 @@ epatch "${x}" done fi + [[ ${#UPSTREAM_PATCHES[@]} -gt 0 ]] && epatch $(freebsd_upstream_patches -s) epatch_user } @@ -136,7 +153,9 @@ [[ -e "${WORKDIR}"/share/mk ]] && rm -rf "${WORKDIR}"/share/mk/*.mk fi else - unpack ${A} + for f in ${A} ; do + [[ ${f} == *.tar.* ]] && unpack ${f} + done fi cd "${S}"
