Introduce support for FreeBSD 10.1, https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/46 by nigoro.

18 files changed, 170 insertions, 2 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 7ae23591f2af..dcdbc67e6be0 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 .# ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9835 2015/03/01 15:44:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9836 2015/03/01 18:25:32 mgorny Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  01 Mar 2015; Michał Górny <mgorny@gentoo.org> profiles.desc:
+  Introduce support for FreeBSD 10.1,
+  https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/46 by nigoro.
+
   01 Mar 2015; Markos Chandras <hwoarang@gentoo.org> package.mask:
   net-im/{amsn,emesene} have been removed
 
diff --git a/profiles/default/bsd/ChangeLog b/profiles/default/bsd/ChangeLog
index 987291abeec2..2c136d456c1b 100644
--- a/profiles/default/bsd/ChangeLog
+++ b/profiles/default/bsd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.173 2015/02/08 16:29:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.174 2015/03/01 18:25:17 mgorny Exp $
+
+  01 Mar 2015; Michał Górny <mgorny@gentoo.org>
+  +fbsd/amd64/10.1/clang/parent, +fbsd/amd64/10.1/eapi,
+  +fbsd/amd64/10.1/make.defaults, +fbsd/amd64/10.1/package.use.force,
+  +fbsd/amd64/10.1/parent, +fbsd/x86/10.1/eapi, +fbsd/x86/10.1/make.defaults,
+  +fbsd/x86/10.1/parent:
+  Introduce support for FreeBSD 10.1,
+  https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/46 by nigoro.
 
   08 Feb 2015; Michał Górny <mgorny@gentoo.org> -fbsd/amd64/9.1/clang/eapi,
   -fbsd/amd64/9.1/clang/make.defaults, -fbsd/amd64/9.1/clang/package.use.force,
diff --git a/profiles/default/bsd/fbsd/amd64/10.1/clang/parent b/profiles/default/bsd/fbsd/amd64/10.1/clang/parent
new file mode 100644
index 000000000000..7dbda405f0ab
--- /dev/null
+++ b/profiles/default/bsd/fbsd/amd64/10.1/clang/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/amd64-fbsd/clang
diff --git a/profiles/default/bsd/fbsd/amd64/10.1/eapi b/profiles/default/bsd/fbsd/amd64/10.1/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/bsd/fbsd/amd64/10.1/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/bsd/fbsd/amd64/10.1/make.defaults b/profiles/default/bsd/fbsd/amd64/10.1/make.defaults
new file mode 100644
index 000000000000..e072d9b9445e
--- /dev/null
+++ b/profiles/default/bsd/fbsd/amd64/10.1/make.defaults
@@ -0,0 +1,11 @@
+# Copyright 1999-2015 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/10.1/make.defaults,v 1.1 2015/03/01 18:25:17 mgorny Exp $
+
+CHOST="x86_64-gentoo-freebsd10.1"
+CHOST_amd64_fbsd="x86_64-gentoo-freebsd10.1"
+CHOST_x86_fbsd="i686-gentoo-freebsd10.1"
+
+# Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
+# Turn this on by default as we don't have Java 1.4 and 1.5 at all
+USE="java6"
diff --git a/profiles/default/bsd/fbsd/amd64/10.1/package.use.force b/profiles/default/bsd/fbsd/amd64/10.1/package.use.force
new file mode 100644
index 000000000000..4229a8f0d9e1
--- /dev/null
+++ b/profiles/default/bsd/fbsd/amd64/10.1/package.use.force
@@ -0,0 +1,4 @@
+# >=dev-lang/python-3.2 requires threads, #494744
+=dev-lang/python-3.2* threads
+=dev-lang/python-3.3* threads
+
diff --git a/profiles/default/bsd/fbsd/amd64/10.1/parent b/profiles/default/bsd/fbsd/amd64/10.1/parent
new file mode 100644
index 000000000000..ab6b4ed66e05
--- /dev/null
+++ b/profiles/default/bsd/fbsd/amd64/10.1/parent
@@ -0,0 +1,2 @@
+..
+../../../../../releases/freebsd-10.1
diff --git a/profiles/default/bsd/fbsd/x86/10.1/eapi b/profiles/default/bsd/fbsd/x86/10.1/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/bsd/fbsd/x86/10.1/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/bsd/fbsd/x86/10.1/make.defaults b/profiles/default/bsd/fbsd/x86/10.1/make.defaults
new file mode 100644
index 000000000000..21050e578e0b
--- /dev/null
+++ b/profiles/default/bsd/fbsd/x86/10.1/make.defaults
@@ -0,0 +1,9 @@
+# Copyright 1999-2015 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/x86/10.1/make.defaults,v 1.1 2015/03/01 18:25:17 mgorny Exp $
+
+CHOST="i486-gentoo-freebsd10.1"
+
+# Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
+# Turn this on by default as we don't have Java 1.4 and 1.5 at all
+USE="java6"
diff --git a/profiles/default/bsd/fbsd/x86/10.1/parent b/profiles/default/bsd/fbsd/x86/10.1/parent
new file mode 100644
index 000000000000..ab6b4ed66e05
--- /dev/null
+++ b/profiles/default/bsd/fbsd/x86/10.1/parent
@@ -0,0 +1,2 @@
+..
+../../../../../releases/freebsd-10.1
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index ebb6a722b411..45f8b8b1e7cb 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -167,11 +167,14 @@ x86             default/linux/x86/13.0/developer                stable
 # Gentoo/FreeBSD Profiles
 amd64-fbsd	default/bsd/fbsd/amd64/9.1			dev
 amd64-fbsd	default/bsd/fbsd/amd64/9.2			dev
+amd64-fbsd	default/bsd/fbsd/amd64/10.1			dev
 amd64-fbsd	default/bsd/fbsd/amd64/9.1/clang		exp
 amd64-fbsd	default/bsd/fbsd/amd64/9.2/clang		exp
+amd64-fbsd	default/bsd/fbsd/amd64/10.1/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/9.2			dev
+x86-fbsd	default/bsd/fbsd/x86/10.1			dev
 
 # Hardened Profiles
 amd64		hardened/linux/amd64					stable
diff --git a/profiles/releases/freebsd-10.1/ChangeLog b/profiles/releases/freebsd-10.1/ChangeLog
new file mode 100644
index 000000000000..0893b1860caf
--- /dev/null
+++ b/profiles/releases/freebsd-10.1/ChangeLog
@@ -0,0 +1,9 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/releases/freebsd-10.1/ChangeLog,v 1.1 2015/03/01 18:25:22 mgorny Exp $
+
+  01 Mar 2015; Michał Górny <mgorny@gentoo.org> +package.mask,
+  +package.use.force, +packages, +packages.build, +parent, +profile.bashrc:
+  Introduce support for FreeBSD 10.1,
+  https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/46 by nigoro.
+
diff --git a/profiles/releases/freebsd-10.1/package.mask b/profiles/releases/freebsd-10.1/package.mask
new file mode 100644
index 000000000000..5fa40e967c6b
--- /dev/null
+++ b/profiles/releases/freebsd-10.1/package.mask
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/releases/freebsd-10.1/package.mask,v 1.1 2015/03/01 18:25:22 mgorny Exp $
+
+# Make sure we don't get wrong versions
+<sys-freebsd/freebsd-pam-modules-10.1_alpha
+>sys-freebsd/freebsd-pam-modules-10.1.99
+<sys-freebsd/freebsd-rescue-10.1_alpha
+>sys-freebsd/freebsd-rescue-10.1.99
+<sys-freebsd/freebsd-pf-10.1_alpha
+>sys-freebsd/freebsd-pf-10.1.99
+<sys-freebsd/freebsd-mk-defs-10.1_alpha
+>sys-freebsd/freebsd-mk-defs-10.1.99
+<sys-freebsd/freebsd-lib-10.1_alpha
+>sys-freebsd/freebsd-lib-10.1.99
+<sys-freebsd/freebsd-libexec-10.1_alpha
+>sys-freebsd/freebsd-libexec-10.1.99
+<sys-freebsd/freebsd-bin-10.1_alpha
+>sys-freebsd/freebsd-bin-10.1.99
+<sys-freebsd/freebsd-sbin-10.1_alpha
+>sys-freebsd/freebsd-sbin-10.1.99
+<sys-freebsd/freebsd-ubin-10.1_alpha
+>sys-freebsd/freebsd-ubin-10.1.99
+>sys-freebsd/freebsd-usbin-10.1.99
+<sys-freebsd/freebsd-share-10.1_alpha
+>sys-freebsd/freebsd-share-10.1.99
+<sys-freebsd/freebsd-contrib-10.1_alpha
+>sys-freebsd/freebsd-contrib-10.1.99
+>sys-freebsd/freebsd-cddl-10.1.99
+<sys-freebsd/boot0-10.1_alpha
+>sys-freebsd/boot0-10.1.99
+<sys-freebsd/freebsd-sources-10.1_alpha
+>sys-freebsd/freebsd-sources-10.1.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> (19 Jul 2008)
+# JDK/JRE 1.5 are specific to fbsd 6 and 5
+=virtual/jdk-1.5*
+=virtual/jre-1.5*
+
+# 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.1/package.use.force b/profiles/releases/freebsd-10.1/package.use.force
new file mode 100644
index 000000000000..68861ff56698
--- /dev/null
+++ b/profiles/releases/freebsd-10.1/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 1999-2015 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/releases/freebsd-10.1/package.use.force,v 1.1 2015/03/01 18:25:22 mgorny Exp $
+
+# freebsd-sources[build-generic] requires clang
+sys-devel/llvm clang
diff --git a/profiles/releases/freebsd-10.1/packages b/profiles/releases/freebsd-10.1/packages
new file mode 100644
index 000000000000..c6b347b73e20
--- /dev/null
+++ b/profiles/releases/freebsd-10.1/packages
@@ -0,0 +1,10 @@
+# Copyright 1999-2015 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/releases/freebsd-10.1/packages,v 1.1 2015/03/01 18:25:22 mgorny Exp $
+
+*>=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.1/packages.build b/profiles/releases/freebsd-10.1/packages.build
new file mode 100644
index 000000000000..0166a9d7864d
--- /dev/null
+++ b/profiles/releases/freebsd-10.1/packages.build
@@ -0,0 +1,7 @@
+# Copyright 1999-2015 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/releases/freebsd-10.1/packages.build,v 1.1 2015/03/01 18:25:22 mgorny Exp $
+
+-dev-libs/libiconv
+-sys-freebsd/freebsd-contrib
+sys-freebsd/freebsd-share
diff --git a/profiles/releases/freebsd-10.1/parent b/profiles/releases/freebsd-10.1/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/releases/freebsd-10.1/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/releases/freebsd-10.1/profile.bashrc b/profiles/releases/freebsd-10.1/profile.bashrc
new file mode 100644
index 000000000000..957d46ef1dd8
--- /dev/null
+++ b/profiles/releases/freebsd-10.1/profile.bashrc
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/releases/freebsd-10.1/profile.bashrc,v 1.1 2015/03/01 18:25:22 mgorny Exp $
+
+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
+