Merge remote-tracking branch 'remotes/github/pr/1206'

7 files changed, 109 insertions, 0 deletions

diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index e1e3f79f8487..bb0e5545b674 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -174,11 +174,14 @@ x86		default/linux/x86/13.0/systemd			stable
 # Gentoo/FreeBSD Profiles
 amd64-fbsd	default/bsd/fbsd/amd64/9.1			dev
 amd64-fbsd	default/bsd/fbsd/amd64/10.2			dev
+amd64-fbsd	default/bsd/fbsd/amd64/10.3			dev
 amd64-fbsd	default/bsd/fbsd/amd64/9.1/clang		exp
 amd64-fbsd	default/bsd/fbsd/amd64/10.2/clang		exp
+amd64-fbsd	default/bsd/fbsd/amd64/10.3/clang		exp
 sparc-fbsd      default/bsd/fbsd/sparc/8.2                      exp
 x86-fbsd	default/bsd/fbsd/x86/9.1			dev
 x86-fbsd	default/bsd/fbsd/x86/10.2			dev
+x86-fbsd	default/bsd/fbsd/x86/10.3			dev
 
 # Hardened Profiles
 amd64		hardened/linux/amd64					stable
diff --git a/profiles/releases/freebsd-10.3/package.mask b/profiles/releases/freebsd-10.3/package.mask
new file mode 100644
index 000000000000..7e457b958a62
--- /dev/null
+++ b/profiles/releases/freebsd-10.3/package.mask
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Id$
+
+# Make sure we don't get wrong versions
+<sys-freebsd/freebsd-pam-modules-10.3_alpha
+>sys-freebsd/freebsd-pam-modules-10.3.99
+<sys-freebsd/freebsd-rescue-10.3_alpha
+>sys-freebsd/freebsd-rescue-10.3.99
+<sys-freebsd/freebsd-pf-10.3_alpha
+>sys-freebsd/freebsd-pf-10.3.99
+<sys-freebsd/freebsd-mk-defs-10.3_alpha
+>sys-freebsd/freebsd-mk-defs-10.3.99
+<sys-freebsd/freebsd-lib-10.3_alpha
+>sys-freebsd/freebsd-lib-10.3.99
+<sys-freebsd/freebsd-libexec-10.3_alpha
+>sys-freebsd/freebsd-libexec-10.3.99
+<sys-freebsd/freebsd-bin-10.3_alpha
+>sys-freebsd/freebsd-bin-10.3.99
+<sys-freebsd/freebsd-sbin-10.3_alpha
+>sys-freebsd/freebsd-sbin-10.3.99
+<sys-freebsd/freebsd-ubin-10.3_alpha
+>sys-freebsd/freebsd-ubin-10.3.99
+>sys-freebsd/freebsd-usbin-10.3.99
+<sys-freebsd/freebsd-share-10.3_alpha
+>sys-freebsd/freebsd-share-10.3.99
+<sys-freebsd/freebsd-contrib-10.3_alpha
+>sys-freebsd/freebsd-contrib-10.3.99
+>sys-freebsd/freebsd-cddl-10.3.99
+<sys-freebsd/boot0-10.3_alpha
+>sys-freebsd/boot0-10.3.99
+<sys-freebsd/freebsd-sources-10.3_alpha
+>sys-freebsd/freebsd-sources-10.3.99
+
+# Mask version of -cddl and -usbin is different for ease of upgrade. bug #491774
+# Please keep <freebsd-cddl-9.2_alpha and <freebsd-usbin-9.1_alpha.
+<sys-freebsd/freebsd-cddl-9.2_alpha
+<sys-freebsd/freebsd-usbin-9.1_alpha
+
+# Alexis Ballier <aballier@gentoo.org> (07 Nov 2011)
+# It is in freebsd-ubin starting from FreeBSD 9.0
+sys-process/fuser-bsd
+
+# Alexis Ballier <aballier@gentoo.org> (11 May 2012)
+# freebsd-lib provides a utempter compatible interface starting from FreeBSD 9.0
+# via libulog.
+# this package does not build anymore as it requires utmp
+sys-libs/libutempter
diff --git a/profiles/releases/freebsd-10.3/package.use.force b/profiles/releases/freebsd-10.3/package.use.force
new file mode 100644
index 000000000000..88079d4a33d8
--- /dev/null
+++ b/profiles/releases/freebsd-10.3/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 1999-2016 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Id$
+
+# freebsd-sources[build-generic] requires clang
+sys-devel/llvm clang
diff --git a/profiles/releases/freebsd-10.3/packages b/profiles/releases/freebsd-10.3/packages
new file mode 100644
index 000000000000..bb97d59550b4
--- /dev/null
+++ b/profiles/releases/freebsd-10.3/packages
@@ -0,0 +1,10 @@
+# Copyright 1999-2016 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Id$
+
+*>=sys-apps/baselayout-2.0.0
+*>=sys-apps/openrc-0.2.5
+
+# Not necessary dev-libs/libiconv and freebsd-contrib in 10.0 and later.
+-*dev-libs/libiconv
+-*sys-freebsd/freebsd-contrib
diff --git a/profiles/releases/freebsd-10.3/packages.build b/profiles/releases/freebsd-10.3/packages.build
new file mode 100644
index 000000000000..4609b991a749
--- /dev/null
+++ b/profiles/releases/freebsd-10.3/packages.build
@@ -0,0 +1,7 @@
+# Copyright 1999-2016 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+-dev-libs/libiconv
+-sys-freebsd/freebsd-contrib
+sys-freebsd/freebsd-share
diff --git a/profiles/releases/freebsd-10.3/parent b/profiles/releases/freebsd-10.3/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/releases/freebsd-10.3/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/releases/freebsd-10.3/profile.bashrc b/profiles/releases/freebsd-10.3/profile.bashrc
new file mode 100644
index 000000000000..24394f91a35e
--- /dev/null
+++ b/profiles/releases/freebsd-10.3/profile.bashrc
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Id$
+
+bsd-fbsd10fix(){
+	# http://svnweb.freebsd.org/ports/head/Mk/bsd.port.mk
+	
+	for f in `find ${WORKDIR} -type f \( -name config.libpath -o \
+		-name config.rpath -o -name configure -o -name libtool.m4 -o \
+		-name ltconfig -o -name libtool -o -name aclocal.m4 -o \
+		-name acinclude.m4 \)` ; do \
+			sed -i.fbsd10bak \
+				-e 's|freebsd1\*)|freebsd1.\*)|g' \
+				-e 's|freebsd\[12\]\*)|freebsd[12].*)|g' \
+				-e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \
+				-e 's|freebsd\[\[12\]\]\*)|freebsd[[12]].*)|g' \
+				-e 's|freebsd\[\[123\]\]\*)|freebsd[[123]].*)|g' \
+					${f} ; \
+			touch -mr ${f}.fbsd10bak ${f} ; \
+			rm -f ${f}.fbsd10bak ; \
+			einfo "===>   FreeBSD 10 autotools fix applied to ${f}"; \
+	done
+}
+
+if [[ -n $EAPI ]] ; then
+	case "$EAPI" in
+		0|1)
+			post_src_unpack() { bsd-patch_install-sh ; bsd-fbsd10fix ; }
+			;;
+		*)
+			post_src_prepare() { bsd-patch_install-sh ; bsd-fbsd10fix ; }
+			;;
+	esac
+fi