[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     bf01dfe1530b4298201bca966634595867044ccc
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Mon Dec 31 08:09:20 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Mon Dec 31 08:09:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=bf01dfe1

freebsd.eclass: add support live svn ebuild

-9.1.9999: releng/9.1
-9.9999: stable/9
-9999: head

---
 eclass/freebsd.eclass |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 53a0b8a..0c6b444 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -29,6 +29,20 @@ CDDL="freebsd-cddl-${PV}"
 # Release version (5.3, 5.4, 6.0, etc)
 RV="$(get_version_component_range 1-2)"
 
+if [ "${PV%.9999}" != "${PV}" ]; then
+	inherit subversion
+	if [[ "${PV%.9999}" == *\.* ]]; then
+		ESVN_REPO_URI="svn://svn.freebsd.org/base/releng/${PV%.9999}"
+		ESVN_PROJECT="freebsd-releng"
+	else
+		ESVN_REPO_URI="svn://svn.freebsd.org/base/stable/${PV%.9999}"
+		ESVN_PROJECT="freebsd-stable"
+	fi
+else
+	ESVN_REPO_URI="svn://svn.freebsd.org/base/head"
+	ESVN_PROJECT="freebsd-head"
+fi
+
 if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then
 	IUSE="profile"
 fi
@@ -90,8 +104,13 @@ freebsd_rename_libraries() {
 }
 
 freebsd_src_unpack() {
-	unpack ${A}
-	cd "${S}"
+	if [[ ${PV} == *9999* ]]; then
+		S="${WORKDIR}" subversion_src_unpack
+		cd "${S}"
+	else
+		unpack ${A}
+		cd "${S}"
+	fi
 
 	dummy_mk ${REMOVE_SUBDIRS}
 

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     c5e72ef28177f81ea25648b3c7e50fc5285a1b74
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Mon Dec 31 07:04:09 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Mon Dec 31 07:04:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=c5e72ef2

freebsd.eclass: import from latest tree

---
 eclass/freebsd.eclass |  131 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 131 insertions(+), 0 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
new file mode 100644
index 0000000..53a0b8a
--- /dev/null
+++ b/eclass/freebsd.eclass
@@ -0,0 +1,131 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+#
+# Diego Pettenò <flameeyes@gentoo.org>
+
+inherit versionator eutils flag-o-matic bsdmk
+
+LICENSE="BSD"
+HOMEPAGE="http://www.freebsd.org/"
+
+# Define global package names
+LIB="freebsd-lib-${PV}"
+BIN="freebsd-bin-${PV}"
+CONTRIB="freebsd-contrib-${PV}"
+SHARE="freebsd-share-${PV}"
+UBIN="freebsd-ubin-${PV}"
+USBIN="freebsd-usbin-${PV}"
+CRYPTO="freebsd-crypto-${PV}"
+LIBEXEC="freebsd-libexec-${PV}"
+SBIN="freebsd-sbin-${PV}"
+GNU="freebsd-gnu-${PV}"
+ETC="freebsd-etc-${PV}"
+SYS="freebsd-sys-${PV}"
+INCLUDE="freebsd-include-${PV}"
+RESCUE="freebsd-rescue-${PV}"
+CDDL="freebsd-cddl-${PV}"
+
+# Release version (5.3, 5.4, 6.0, etc)
+RV="$(get_version_component_range 1-2)"
+
+if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then
+	IUSE="profile"
+fi
+
+#unalias -a
+alias install-info='/usr/bin/bsdinstall-info'
+
+EXPORT_FUNCTIONS src_compile src_install src_unpack
+
+# doperiodic <kind> <file> ...
+doperiodic() {
+	local kind=$1
+	shift
+
+	( # dont want to pollute calling env
+		insinto /etc/periodic/${kind}
+		insopts -m 0755
+		doins "$@"
+	)
+}
+
+freebsd_get_bmake() {
+	local bmake
+	bmake=$(get_bmake)
+	[[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m /usr/share/mk/freebsd"
+
+	echo "${bmake}"
+}
+
+freebsd_do_patches() {
+	if [[ ${#PATCHES[@]} -gt 1 ]] ; then
+		for x in "${PATCHES[@]}"; do
+			epatch "${x}"
+		done
+	else
+		for x in ${PATCHES} ; do
+			epatch "${x}"
+		done
+	fi
+	epatch_user
+}
+
+freebsd_rename_libraries() {
+	ebegin "Renaming libraries"
+	# We don't use libtermcap, we use libncurses
+	find "${S}" -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-ltermcap:-lncurses:g; s:{LIBTERMCAP}:{LIBNCURSES}:g'
+	# flex provides libfl, not libl
+	find "${S}" -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-ll$:-lfl:g; s:-ll :-lfl :g; s:{LIBL}:{LIBFL}:g'
+	# ncurses provides libncursesw not libcursesw
+	find "${S}" -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-lcursesw:-lncursesw:g'
+	# we use expat instead of bsdxml
+	find "${S}" -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-lbsdxml:-lexpat:g'
+
+	eend $?
+}
+
+freebsd_src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	dummy_mk ${REMOVE_SUBDIRS}
+
+	freebsd_do_patches
+	freebsd_rename_libraries
+}
+
+freebsd_src_compile() {
+	use profile && filter-flags "-fomit-frame-pointer"
+	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+
+	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
+
+	# Many things breaks when using ricer flags here
+	[[ -z "${NOFLAGSTRIP}" ]] && strip-flags
+
+	# Make sure to use FreeBSD definitions while crosscompiling
+	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
+
+	# Create objdir if MAKEOBJDIRPREFIX is defined, so that we can make out of
+	# tree builds easily.
+	if [[ -n "${MAKEOBJDIRPREFIX}" ]] ; then
+		mkmake obj || die
+	fi
+
+	bsdmk_src_compile
+}
+
+freebsd_src_install() {
+	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+
+	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
+
+	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
+
+	bsdmk_src_install
+}

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     b7f8fccbbd9ed486e3044f57df544289a22bc386
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Mon Dec 31 10:04:00 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Mon Dec 31 10:04:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=b7f8fccb

freebsd.eclass: fixed a conditional branch, support -head

---
 eclass/freebsd.eclass |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 0c6b444..8603712 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -29,18 +29,20 @@ CDDL="freebsd-cddl-${PV}"
 # Release version (5.3, 5.4, 6.0, etc)
 RV="$(get_version_component_range 1-2)"
 
-if [ "${PV%.9999}" != "${PV}" ]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit subversion
-	if [[ "${PV%.9999}" == *\.* ]]; then
-		ESVN_REPO_URI="svn://svn.freebsd.org/base/releng/${PV%.9999}"
-		ESVN_PROJECT="freebsd-releng"
+	if [ "${PV%.9999}" != "${PV}" ]; then
+		if [[ "${PV%.9999}" == *\.* ]]; then
+			ESVN_REPO_URI="svn://svn.freebsd.org/base/releng/${PV%.9999}"
+			ESVN_PROJECT="freebsd-releng"
+		else
+			ESVN_REPO_URI="svn://svn.freebsd.org/base/stable/${PV%.9999}"
+			ESVN_PROJECT="freebsd-stable"
+		fi
 	else
-		ESVN_REPO_URI="svn://svn.freebsd.org/base/stable/${PV%.9999}"
-		ESVN_PROJECT="freebsd-stable"
+		ESVN_REPO_URI="svn://svn.freebsd.org/base/head"
+		ESVN_PROJECT="freebsd-head"
 	fi
-else
-	ESVN_REPO_URI="svn://svn.freebsd.org/base/head"
-	ESVN_PROJECT="freebsd-head"
 fi
 
 if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     0509d7d4b5b207f946576469a2798d5a27dda366
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Jan  1 13:11:27 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Jan  1 13:11:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=0509d7d4

freebsd.eclass: missing ""

---
 eclass/freebsd.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 8603712..c9a433e 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -29,7 +29,7 @@ CDDL="freebsd-cddl-${PV}"
 # Release version (5.3, 5.4, 6.0, etc)
 RV="$(get_version_component_range 1-2)"
 
-if [[ ${PV} == *9999* ]]; then
+if [[ "${PV}" == *9999* ]]; then
 	inherit subversion
 	if [ "${PV%.9999}" != "${PV}" ]; then
 		if [[ "${PV%.9999}" == *\.* ]]; then

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     e4ff9f0653225e14443d8ced71b4a7fc5f8864fc
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Jan  4 10:58:48 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Jan  4 10:58:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=e4ff9f06

freebsd.eclass: Changed from if to case, conditional branching

---
 eclass/freebsd.eclass |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index c9a433e..c709f91 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -31,18 +31,24 @@ RV="$(get_version_component_range 1-2)"
 
 if [[ "${PV}" == *9999* ]]; then
 	inherit subversion
-	if [ "${PV%.9999}" != "${PV}" ]; then
-		if [[ "${PV%.9999}" == *\.* ]]; then
+	case ${PV%.9999} in
+		*.*.*)
+			ESVN_REPO_URI="svn://svn.freebsd.org/base/release/${PV%.9999}"
+			ESVN_PROJECT="freebsd-release"
+			;;
+		*.*)
 			ESVN_REPO_URI="svn://svn.freebsd.org/base/releng/${PV%.9999}"
 			ESVN_PROJECT="freebsd-releng"
-		else
+			;;
+		9999)
+			ESVN_REPO_URI="svn://svn.freebsd.org/base/head"
+			ESVN_PROJECT="freebsd-head"
+			;;
+		*)
 			ESVN_REPO_URI="svn://svn.freebsd.org/base/stable/${PV%.9999}"
 			ESVN_PROJECT="freebsd-stable"
-		fi
-	else
-		ESVN_REPO_URI="svn://svn.freebsd.org/base/head"
-		ESVN_PROJECT="freebsd-head"
-	fi
+			;;
+	esac
 fi
 
 if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then
@@ -108,11 +114,10 @@ freebsd_rename_libraries() {
 freebsd_src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
 		S="${WORKDIR}" subversion_src_unpack
-		cd "${S}"
 	else
 		unpack ${A}
-		cd "${S}"
 	fi
+	cd "${S}"
 
 	dummy_mk ${REMOVE_SUBDIRS}
 

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     303b789a85827ba6d27c58d5f8cf61252d3c62ac
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Jan  6 11:19:08 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sun Jan  6 11:19:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=303b789a

freebsd.eclass: clean up

---
 eclass/freebsd.eclass |   24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index c709f91..93e2e88 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -32,23 +32,15 @@ RV="$(get_version_component_range 1-2)"
 if [[ "${PV}" == *9999* ]]; then
 	inherit subversion
 	case ${PV%.9999} in
-		*.*.*)
-			ESVN_REPO_URI="svn://svn.freebsd.org/base/release/${PV%.9999}"
-			ESVN_PROJECT="freebsd-release"
-			;;
-		*.*)
-			ESVN_REPO_URI="svn://svn.freebsd.org/base/releng/${PV%.9999}"
-			ESVN_PROJECT="freebsd-releng"
-			;;
-		9999)
-			ESVN_REPO_URI="svn://svn.freebsd.org/base/head"
-			ESVN_PROJECT="freebsd-head"
-			;;
-		*)
-			ESVN_REPO_URI="svn://svn.freebsd.org/base/stable/${PV%.9999}"
-			ESVN_PROJECT="freebsd-stable"
-			;;
+		*.*.*)	branch="release";;
+		*.*)	branch="releng"	;;
+		9999)	branch="head"	;;
+		*)	branch="stable"	;;
 	esac
+	[[ "${branch}" == "head" ]] || sub_uri="${branch}/${PV%.9999}"
+	[[ "${branch}" == "head" ]] && sub_uri="${branch}"
+	ESVN_REPO_URI="svn://svn.freebsd.org/base/${sub_uri}"
+	ESVN_PROJECT="freebsd-${branch}"
 fi
 
 if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     ec09909d087c0c703ff0b6eefa6a8fa43178e25c
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Jan  8 11:56:40 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Jan  8 11:56:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=ec09909d

freebsd.eclass: added ESVN_OFFLINE=1 packages other than freebsd-mk-defs

---
 eclass/freebsd.eclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 93e2e88..3785a7d 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -41,6 +41,7 @@ if [[ "${PV}" == *9999* ]]; then
 	[[ "${branch}" == "head" ]] && sub_uri="${branch}"
 	ESVN_REPO_URI="svn://svn.freebsd.org/base/${sub_uri}"
 	ESVN_PROJECT="freebsd-${branch}"
+	[[ ${PN} == "freebsd-mk-defs" ]] || ESVN_OFFLINE="1"
 fi
 
 if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then
@@ -104,7 +105,7 @@ freebsd_rename_libraries() {
 }
 
 freebsd_src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
+	if [[ "${PV}" == *9999* ]]; then
 		S="${WORKDIR}" subversion_src_unpack
 	else
 		unpack ${A}

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     1c8cfb3ae48ab078626810be8b0e3f96ecf05963
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Jan  8 13:55:14 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Jan  8 13:55:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=1c8cfb3a

freebsd.eclass: added a new variable REQUIRED_SRC

---
 eclass/freebsd.eclass |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 3785a7d..4d22bcc 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -42,6 +42,12 @@ if [[ "${PV}" == *9999* ]]; then
 	ESVN_REPO_URI="svn://svn.freebsd.org/base/${sub_uri}"
 	ESVN_PROJECT="freebsd-${branch}"
 	[[ ${PN} == "freebsd-mk-defs" ]] || ESVN_OFFLINE="1"
+else
+	if [ -z "${SRC_URI}" ] && [ -n "${REQUIRED_SRC}" ]; then
+		for src in ${REQUIRED_SRC}; do
+			SRC_URI="${SRC_URI} mirror://gentoo/$(eval echo \"\${${src}}\").tar.bz2"
+		done
+	fi
 fi
 
 if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     528abeaa85126746c87b336f925199cabe2c280d
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Jan 10 11:57:54 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Jan 10 11:57:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=528abeaa

freebsd.eclass: Revert to the previous version.

---
 eclass/freebsd.eclass |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 4d22bcc..3785a7d 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -42,12 +42,6 @@ if [[ "${PV}" == *9999* ]]; then
 	ESVN_REPO_URI="svn://svn.freebsd.org/base/${sub_uri}"
 	ESVN_PROJECT="freebsd-${branch}"
 	[[ ${PN} == "freebsd-mk-defs" ]] || ESVN_OFFLINE="1"
-else
-	if [ -z "${SRC_URI}" ] && [ -n "${REQUIRED_SRC}" ]; then
-		for src in ${REQUIRED_SRC}; do
-			SRC_URI="${SRC_URI} mirror://gentoo/$(eval echo \"\${${src}}\").tar.bz2"
-		done
-	fi
 fi
 
 if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     e119079aa78c460c20757a8c95d711a4be30fbcf
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Feb  1 11:24:55 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Feb  1 11:24:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=e119079a

freebsd.eclass: added support svn revision

---
 eclass/freebsd.eclass |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 3785a7d..bfc757a 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -31,17 +31,20 @@ RV="$(get_version_component_range 1-2)"
 
 if [[ "${PV}" == *9999* ]]; then
 	inherit subversion
+	MY_PR=${PR/r/}
+	[[ -n ${MY_PR} ]] && [[ ${MY_PR} -gt 10000 ]] && ESVN_REVISION="${MY_PR}"
+	[[ ${PN} == "freebsd-mk-defs" ]] || ESVN_OFFLINE="1"
+
 	case ${PV%.9999} in
-		*.*.*)	branch="release";;
-		*.*)	branch="releng"	;;
-		9999)	branch="head"	;;
-		*)	branch="stable"	;;
+		*.*.*)	BRANCH="release";;
+		*.*)	BRANCH="releng"	;;
+		9999)	BRANCH="head"	;;
+		*)	BRANCH="stable"	;;
 	esac
-	[[ "${branch}" == "head" ]] || sub_uri="${branch}/${PV%.9999}"
-	[[ "${branch}" == "head" ]] && sub_uri="${branch}"
-	ESVN_REPO_URI="svn://svn.freebsd.org/base/${sub_uri}"
-	ESVN_PROJECT="freebsd-${branch}"
-	[[ ${PN} == "freebsd-mk-defs" ]] || ESVN_OFFLINE="1"
+	[[ "${BRANCH}" == "head" ]] || SVN_SUB_URI="${BRANCH}/${PV%.9999}"
+	[[ "${BRANCH}" == "head" ]] && SVN_SUB_URI="${BRANCH}"
+	ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}"
+	ESVN_PROJECT="freebsd-${BRANCH}"
 fi
 
 if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     5b39241499b12af1877bfd9b857709defcd2eab0
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Feb  7 15:47:56 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Feb  7 15:47:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=5b392414

changed to use _p instead of -r. added comments. thanks aballier.

---
 eclass/freebsd.eclass |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index bfc757a..f705cf1 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -29,19 +29,25 @@ CDDL="freebsd-cddl-${PV}"
 # Release version (5.3, 5.4, 6.0, etc)
 RV="$(get_version_component_range 1-2)"
 
-if [[ "${PV}" == *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit subversion
-	MY_PR=${PR/r/}
-	[[ -n ${MY_PR} ]] && [[ ${MY_PR} -gt 10000 ]] && ESVN_REVISION="${MY_PR}"
+	MY_PV=${PV/_p*}
+
+	# Set SVN revision using patch level.
+	PLEVEL=${PV##*_p}
+	[[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}"
+
+	# freebsd-mk-defs is always run svn checkout/update.
+	# Other packages use sources that it checked out.
 	[[ ${PN} == "freebsd-mk-defs" ]] || ESVN_OFFLINE="1"
 
-	case ${PV%.9999} in
+	case ${MY_PV%.9999} in
 		*.*.*)	BRANCH="release";;
 		*.*)	BRANCH="releng"	;;
 		9999)	BRANCH="head"	;;
 		*)	BRANCH="stable"	;;
 	esac
-	[[ "${BRANCH}" == "head" ]] || SVN_SUB_URI="${BRANCH}/${PV%.9999}"
+	[[ "${BRANCH}" == "head" ]] || SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}"
 	[[ "${BRANCH}" == "head" ]] && SVN_SUB_URI="${BRANCH}"
 	ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}"
 	ESVN_PROJECT="freebsd-${BRANCH}"

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     42e46a3ba0d75d23e37650d2cb75113342e3a12c
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Feb  7 15:56:08 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Feb  7 15:56:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=42e46a3b

freebsd.eclass: remove double quotes more

---
 eclass/freebsd.eclass |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index f705cf1..fd5b0b9 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -47,8 +47,8 @@ if [[ ${PV} == *9999* ]]; then
 		9999)	BRANCH="head"	;;
 		*)	BRANCH="stable"	;;
 	esac
-	[[ "${BRANCH}" == "head" ]] || SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}"
-	[[ "${BRANCH}" == "head" ]] && SVN_SUB_URI="${BRANCH}"
+	[[ ${BRANCH} == "head" ]] || SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}"
+	[[ ${BRANCH} == "head" ]] && SVN_SUB_URI="${BRANCH}"
 	ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}"
 	ESVN_PROJECT="freebsd-${BRANCH}"
 fi
@@ -114,7 +114,7 @@ freebsd_rename_libraries() {
 }
 
 freebsd_src_unpack() {
-	if [[ "${PV}" == *9999* ]]; then
+	if [[ ${PV} == *9999* ]]; then
 		S="${WORKDIR}" subversion_src_unpack
 	else
 		unpack ${A}

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     ba85dce8ea14371dc6daf70f668ec9e112387cd3
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Mon Feb 11 11:26:09 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Mon Feb 11 11:26:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=ba85dce8

freebsd.eclass: Drop patch level from RV, -9999 (head) ebuild is required.

---
 eclass/freebsd.eclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index fd5b0b9..8f94128 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -36,6 +36,8 @@ if [[ ${PV} == *9999* ]]; then
 	# Set SVN revision using patch level.
 	PLEVEL=${PV##*_p}
 	[[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}"
+	# Drop patch level from RV, -9999 (head) ebuild is required.
+	[[ ${MY_PV} == 9999 ]] && RV="9999"
 
 	# freebsd-mk-defs is always run svn checkout/update.
 	# Other packages use sources that it checked out.

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     59a53df52c86b08f02201de2039db2cd8e5549e7
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Feb 16 15:05:03 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sat Feb 16 15:05:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=59a53df5

freebsd.eclass: define ${MY_PV} and ${PLEVEL} in all case.

---
 eclass/freebsd.eclass |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 8f94128..04ac641 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -6,6 +6,9 @@
 
 inherit versionator eutils flag-o-matic bsdmk
 
+MY_PV=${PV/_p*}
+PLEVEL=${PV##*_p}
+
 LICENSE="BSD"
 HOMEPAGE="http://www.freebsd.org/"
 
@@ -27,17 +30,14 @@ RESCUE="freebsd-rescue-${PV}"
 CDDL="freebsd-cddl-${PV}"
 
 # Release version (5.3, 5.4, 6.0, etc)
-RV="$(get_version_component_range 1-2)"
+# Drop patch level from RV using ${MY_PV}.
+RV="$(get_version_component_range 1-2 ${MY_PV})"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit subversion
-	MY_PV=${PV/_p*}
 
 	# Set SVN revision using patch level.
-	PLEVEL=${PV##*_p}
 	[[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}"
-	# Drop patch level from RV, -9999 (head) ebuild is required.
-	[[ ${MY_PV} == 9999 ]] && RV="9999"
 
 	# freebsd-mk-defs is always run svn checkout/update.
 	# Other packages use sources that it checked out.
@@ -49,8 +49,8 @@ if [[ ${PV} == *9999* ]]; then
 		9999)	BRANCH="head"	;;
 		*)	BRANCH="stable"	;;
 	esac
-	[[ ${BRANCH} == "head" ]] || SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}"
-	[[ ${BRANCH} == "head" ]] && SVN_SUB_URI="${BRANCH}"
+	[[ ${BRANCH} == head ]] || SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}"
+	[[ ${BRANCH} == head ]] && SVN_SUB_URI="${BRANCH}"
 	ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}"
 	ESVN_PROJECT="freebsd-${BRANCH}"
 fi

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     0b66a93ccb2be4bbde9c88c43443a56eb8f13031
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Jun 18 12:54:20 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Jun 18 12:54:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=0b66a93c

freebsd.eclass: sync to latest tree

---
 eclass/freebsd.eclass | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 04ac641..fc45b4c 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -150,6 +150,51 @@ freebsd_src_compile() {
 	bsdmk_src_compile
 }
 
+# Helper function to make a multilib build with FreeBSD Makefiles.
+# Usage: 
+# MULTIBUILD_VARIANTS=( $(get_all_abis) )
+# multibuild_foreach_variant freebsd_multilib_multibuild_wrapper my_function
+#
+# Important note: To use this function you _have_ to:
+# - inherit multilib.eclass and multibuild.eclass
+# - set MULTILIB_VARIANTS
+# - have a multilib useflag in IUSE
+
+freebsd_multilib_multibuild_wrapper() {
+	# Get the ABI from multibuild.eclass
+	# This assumes MULTILIB_VARIANTS contains only valid ABIs.
+	local ABI=${MULTIBUILD_VARIANT}
+
+	# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS, LDADD and mymakeopts.
+	for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do
+		export ${i}_SAVE="${!i}"
+	done
+
+	# Setup the variables specific to this ABI.
+	multilib_toolchain_setup "${ABI}"
+
+	local target="$(tc-arch-kernel ${CHOST})"
+	mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
+	if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		mymakeopts="${mymakeopts} COMPAT_32BIT="
+	fi
+
+	einfo "Building for ABI=${ABI} and TARGET=${target}"
+
+	export MAKEOBJDIRPREFIX="${BUILD_DIR}"
+	if [ ! -d "${MAKEOBJDIRPREFIX}" ] ; then
+		mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
+	fi
+	
+	CTARGET="${CHOST}" "$@"
+	
+	# Restore the variables now.
+	for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do
+		ii="${i}_SAVE"
+		export ${i}="${!ii}"
+	done
+}
+
 freebsd_src_install() {
 	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
 

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     8a6a7284f1e48b23a02e3758477bd89463d1b4d6
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Jun 20 11:01:50 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Jun 20 11:01:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=8a6a7284

freebsd.eclass: sync to latest tree

---
 eclass/freebsd.eclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index fc45b4c..43a3334 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -135,9 +135,6 @@ freebsd_src_compile() {
 
 	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
 
-	# Many things breaks when using ricer flags here
-	[[ -z "${NOFLAGSTRIP}" ]] && strip-flags
-
 	# Make sure to use FreeBSD definitions while crosscompiling
 	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
 
@@ -177,6 +174,8 @@ freebsd_multilib_multibuild_wrapper() {
 	mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
 	if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
 		mymakeopts="${mymakeopts} COMPAT_32BIT="
+		# Teach gcc where to find crt* files.
+		export LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir) -B/usr/$(get_libdir)"
 	fi
 
 	einfo "Building for ABI=${ABI} and TARGET=${target}"

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     06d09851bc2899263b7e0cde278be626674e750e
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Jul 11 15:11:19 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Jul 11 15:11:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=06d09851

freebsd.eclass: syncd Revision 1.29

---
 eclass/freebsd.eclass | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 43a3334..5ca3778 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -174,8 +174,6 @@ freebsd_multilib_multibuild_wrapper() {
 	mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
 	if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
 		mymakeopts="${mymakeopts} COMPAT_32BIT="
-		# Teach gcc where to find crt* files.
-		export LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir) -B/usr/$(get_libdir)"
 	fi
 
 	einfo "Building for ABI=${ABI} and TARGET=${target}"

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     2af2a5327a98f0aaff81861a4d3adfe061980577
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Jul 23 16:13:40 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Jul 23 16:13:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=2af2a532

freebsd.eclass: Disable Upgrade Support, if set PV=*9999*

---
 eclass/freebsd.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 75305df..eecd116 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -140,7 +140,7 @@ freebsd_src_compile() {
 
 	# Support for upgrade from a previous version.
 	# If install command does not support -l option, this is necessary.
-	if [[ ${RV} > 9.1 ]] && has_version '<sys-freebsd/freebsd-ubin-9.2_beta1' ; then
+	if [[ ${RV} > 9.1 ]] && [[ ${PV} != *9999* ]] && has_version '<sys-freebsd/freebsd-ubin-9.2_beta1' ; then
 		export INSTALL_LINK="ln -f"
 		export INSTALL_SYMLINK="ln -fs"
 	fi

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     fef30479a55f1a5229907e334ce6c1f0b60a3eab
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Aug 13 10:38:56 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Aug 13 10:38:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=fef30479

freebsd.eclass: syncd Revision 1.34

---
 eclass/freebsd.eclass | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index eecd116..68d19cf 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -28,6 +28,7 @@ SYS="freebsd-sys-${PV}"
 INCLUDE="freebsd-include-${PV}"
 RESCUE="freebsd-rescue-${PV}"
 CDDL="freebsd-cddl-${PV}"
+SECURE="freebsd-secure-${PV}"
 
 # Release version (5.3, 5.4, 6.0, etc)
 # Drop patch level from RV using ${MY_PV}.
@@ -127,6 +128,13 @@ freebsd_src_unpack() {
 
 	freebsd_do_patches
 	freebsd_rename_libraries
+
+	# 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
+		export INSTALL_LINK="ln -f"
+		export INSTALL_SYMLINK="ln -fs"
+	fi
 }
 
 freebsd_src_compile() {
@@ -138,20 +146,13 @@ freebsd_src_compile() {
 	# Make sure to use FreeBSD definitions while crosscompiling
 	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
 
-	# Support for upgrade from a previous version.
-	# If install command does not support -l option, this is necessary.
-	if [[ ${RV} > 9.1 ]] && [[ ${PV} != *9999* ]] && has_version '<sys-freebsd/freebsd-ubin-9.2_beta1' ; then
-		export INSTALL_LINK="ln -f"
-		export INSTALL_SYMLINK="ln -fs"
-	fi
-
 	# Create objdir if MAKEOBJDIRPREFIX is defined, so that we can make out of
 	# tree builds easily.
 	if [[ -n "${MAKEOBJDIRPREFIX}" ]] ; then
 		mkmake obj || die
 	fi
 
-	bsdmk_src_compile
+	bsdmk_src_compile "$@"
 }
 
 # Helper function to make a multilib build with FreeBSD Makefiles.
@@ -161,12 +162,11 @@ freebsd_src_compile() {
 #
 # Important note: To use this function you _have_ to:
 # - inherit multilib.eclass and multibuild.eclass
-# - set MULTILIB_VARIANTS
-# - have a multilib useflag in IUSE
+# - set MULTIBUILD_VARIANTS
 
 freebsd_multilib_multibuild_wrapper() {
 	# Get the ABI from multibuild.eclass
-	# This assumes MULTILIB_VARIANTS contains only valid ABIs.
+	# This assumes MULTIBUILD_VARIANTS contains only valid ABIs.
 	local ABI=${MULTIBUILD_VARIANT}
 
 	# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS, LDADD and mymakeopts.
@@ -179,7 +179,7 @@ freebsd_multilib_multibuild_wrapper() {
 
 	local target="$(tc-arch-kernel ${CHOST})"
 	mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
-	if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
 		mymakeopts="${mymakeopts} COMPAT_32BIT="
 	fi
 

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     9794a7f0497a2d879b1227d50140963b037e6d13
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Aug 29 11:07:25 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Aug 29 11:07:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=9794a7f0

removed freebsd.eclass, live ebuild support merged into main tree.

---
 eclass/freebsd.eclass | 210 --------------------------------------------------
 1 file changed, 210 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
deleted file mode 100644
index 68d19cf..0000000
--- a/eclass/freebsd.eclass
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-#
-# Diego Pettenò <flameeyes@gentoo.org>
-
-inherit versionator eutils flag-o-matic bsdmk
-
-MY_PV=${PV/_p*}
-PLEVEL=${PV##*_p}
-
-LICENSE="BSD"
-HOMEPAGE="http://www.freebsd.org/"
-
-# Define global package names
-LIB="freebsd-lib-${PV}"
-BIN="freebsd-bin-${PV}"
-CONTRIB="freebsd-contrib-${PV}"
-SHARE="freebsd-share-${PV}"
-UBIN="freebsd-ubin-${PV}"
-USBIN="freebsd-usbin-${PV}"
-CRYPTO="freebsd-crypto-${PV}"
-LIBEXEC="freebsd-libexec-${PV}"
-SBIN="freebsd-sbin-${PV}"
-GNU="freebsd-gnu-${PV}"
-ETC="freebsd-etc-${PV}"
-SYS="freebsd-sys-${PV}"
-INCLUDE="freebsd-include-${PV}"
-RESCUE="freebsd-rescue-${PV}"
-CDDL="freebsd-cddl-${PV}"
-SECURE="freebsd-secure-${PV}"
-
-# Release version (5.3, 5.4, 6.0, etc)
-# Drop patch level from RV using ${MY_PV}.
-RV="$(get_version_component_range 1-2 ${MY_PV})"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit subversion
-
-	# Set SVN revision using patch level.
-	[[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}"
-
-	# freebsd-mk-defs is always run svn checkout/update.
-	# Other packages use sources that it checked out.
-	[[ ${PN} == "freebsd-mk-defs" ]] || ESVN_OFFLINE="1"
-
-	case ${MY_PV%.9999} in
-		*.*.*)	BRANCH="release";;
-		*.*)	BRANCH="releng"	;;
-		9999)	BRANCH="head"	;;
-		*)	BRANCH="stable"	;;
-	esac
-	[[ ${BRANCH} == head ]] || SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}"
-	[[ ${BRANCH} == head ]] && SVN_SUB_URI="${BRANCH}"
-	ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}"
-	ESVN_PROJECT="freebsd-${BRANCH}"
-fi
-
-if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then
-	IUSE="profile"
-fi
-
-#unalias -a
-alias install-info='/usr/bin/bsdinstall-info'
-
-EXPORT_FUNCTIONS src_compile src_install src_unpack
-
-# doperiodic <kind> <file> ...
-doperiodic() {
-	local kind=$1
-	shift
-
-	( # dont want to pollute calling env
-		insinto /etc/periodic/${kind}
-		insopts -m 0755
-		doins "$@"
-	)
-}
-
-freebsd_get_bmake() {
-	local bmake
-	bmake=$(get_bmake)
-	[[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m /usr/share/mk/freebsd"
-
-	echo "${bmake}"
-}
-
-freebsd_do_patches() {
-	if [[ ${#PATCHES[@]} -gt 1 ]] ; then
-		for x in "${PATCHES[@]}"; do
-			epatch "${x}"
-		done
-	else
-		for x in ${PATCHES} ; do
-			epatch "${x}"
-		done
-	fi
-	epatch_user
-}
-
-freebsd_rename_libraries() {
-	ebegin "Renaming libraries"
-	# We don't use libtermcap, we use libncurses
-	find "${S}" -name Makefile -print0 | xargs -0 \
-		sed -i -e 's:-ltermcap:-lncurses:g; s:{LIBTERMCAP}:{LIBNCURSES}:g'
-	# flex provides libfl, not libl
-	find "${S}" -name Makefile -print0 | xargs -0 \
-		sed -i -e 's:-ll$:-lfl:g; s:-ll :-lfl :g; s:{LIBL}:{LIBFL}:g'
-	# ncurses provides libncursesw not libcursesw
-	find "${S}" -name Makefile -print0 | xargs -0 \
-		sed -i -e 's:-lcursesw:-lncursesw:g'
-	# we use expat instead of bsdxml
-	find "${S}" -name Makefile -print0 | xargs -0 \
-		sed -i -e 's:-lbsdxml:-lexpat:g'
-
-	eend $?
-}
-
-freebsd_src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		S="${WORKDIR}" subversion_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-
-	dummy_mk ${REMOVE_SUBDIRS}
-
-	freebsd_do_patches
-	freebsd_rename_libraries
-
-	# 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
-		export INSTALL_LINK="ln -f"
-		export INSTALL_SYMLINK="ln -fs"
-	fi
-}
-
-freebsd_src_compile() {
-	use profile && filter-flags "-fomit-frame-pointer"
-	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
-
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
-
-	# Make sure to use FreeBSD definitions while crosscompiling
-	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
-
-	# Create objdir if MAKEOBJDIRPREFIX is defined, so that we can make out of
-	# tree builds easily.
-	if [[ -n "${MAKEOBJDIRPREFIX}" ]] ; then
-		mkmake obj || die
-	fi
-
-	bsdmk_src_compile "$@"
-}
-
-# Helper function to make a multilib build with FreeBSD Makefiles.
-# Usage: 
-# MULTIBUILD_VARIANTS=( $(get_all_abis) )
-# multibuild_foreach_variant freebsd_multilib_multibuild_wrapper my_function
-#
-# Important note: To use this function you _have_ to:
-# - inherit multilib.eclass and multibuild.eclass
-# - set MULTIBUILD_VARIANTS
-
-freebsd_multilib_multibuild_wrapper() {
-	# Get the ABI from multibuild.eclass
-	# This assumes MULTIBUILD_VARIANTS contains only valid ABIs.
-	local ABI=${MULTIBUILD_VARIANT}
-
-	# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS, LDADD and mymakeopts.
-	for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do
-		export ${i}_SAVE="${!i}"
-	done
-
-	# Setup the variables specific to this ABI.
-	multilib_toolchain_setup "${ABI}"
-
-	local target="$(tc-arch-kernel ${CHOST})"
-	mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		mymakeopts="${mymakeopts} COMPAT_32BIT="
-	fi
-
-	einfo "Building for ABI=${ABI} and TARGET=${target}"
-
-	export MAKEOBJDIRPREFIX="${BUILD_DIR}"
-	if [ ! -d "${MAKEOBJDIRPREFIX}" ] ; then
-		mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
-	fi
-	
-	CTARGET="${CHOST}" "$@"
-	
-	# Restore the variables now.
-	for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do
-		ii="${i}_SAVE"
-		export ${i}="${!ii}"
-	done
-}
-
-freebsd_src_install() {
-	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
-
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
-
-	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
-
-	bsdmk_src_install
-}

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     9548fbfc49ee74f16b42bd0bca763f7561c4984f
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Aug 30 17:43:48 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Aug 30 17:43:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=9548fbfc

freebsd.eclass: import from latest tree

---
 eclass/freebsd.eclass | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 220 insertions(+)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
new file mode 100644
index 0000000..ea6b21a
--- /dev/null
+++ b/eclass/freebsd.eclass
@@ -0,0 +1,220 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+#
+# Diego Pettenò <flameeyes@gentoo.org>
+
+inherit versionator eutils flag-o-matic bsdmk
+
+# Drop patch level from ${PV}
+MY_PV=${PV/_p*}
+PLEVEL=${PV##*_p}
+
+LICENSE="BSD"
+HOMEPAGE="http://www.freebsd.org/"
+
+# Define global package names
+LIB="freebsd-lib-${PV}"
+BIN="freebsd-bin-${PV}"
+CONTRIB="freebsd-contrib-${PV}"
+SHARE="freebsd-share-${PV}"
+UBIN="freebsd-ubin-${PV}"
+USBIN="freebsd-usbin-${PV}"
+CRYPTO="freebsd-crypto-${PV}"
+LIBEXEC="freebsd-libexec-${PV}"
+SBIN="freebsd-sbin-${PV}"
+GNU="freebsd-gnu-${PV}"
+ETC="freebsd-etc-${PV}"
+SYS="freebsd-sys-${PV}"
+INCLUDE="freebsd-include-${PV}"
+RESCUE="freebsd-rescue-${PV}"
+CDDL="freebsd-cddl-${PV}"
+SECURE="freebsd-secure-${PV}"
+
+# Release version (5.3, 5.4, 6.0, etc)
+RV="$(get_version_component_range 1-2 ${MY_PV})"
+
+# SVN ebuild support.
+#   9.1.0.9999 -->	release/9.1.0
+#	9.1.9999   -->	releng/9.1
+#   9.9999     -->	stable/9
+#	9999 -->	head
+# 
+# svn revision can be specified by patch level:
+#	freebsd-lib-9.9999_p247000 --> set svn -r 247000
+
+if [[ ${MY_PV} == *9999* ]]; then
+	inherit subversion
+
+	# Set SVN revision using patch level.
+	[[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}"
+
+	case ${MY_PV%.9999} in
+		*.*.*)	BRANCH="release";;
+		*.*)	BRANCH="releng"	;;
+		9999)	BRANCH="head"	;;
+		*)	    BRANCH="stable"	;;
+	esac
+
+	if [[ ${BRANCH} == head ]]  ; then
+		SVN_SUB_URI="${BRANCH}"
+	else
+		SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}"
+	fi
+
+	ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}"
+	ESVN_PROJECT="freebsd-${BRANCH}"
+fi
+
+if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then
+	IUSE="profile"
+fi
+
+#unalias -a
+alias install-info='/usr/bin/bsdinstall-info'
+
+EXPORT_FUNCTIONS src_compile src_install src_unpack
+
+# doperiodic <kind> <file> ...
+doperiodic() {
+	local kind=$1
+	shift
+
+	( # dont want to pollute calling env
+		insinto /etc/periodic/${kind}
+		insopts -m 0755
+		doins "$@"
+	)
+}
+
+freebsd_get_bmake() {
+	local bmake
+	bmake=$(get_bmake)
+	[[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m /usr/share/mk/freebsd"
+
+	echo "${bmake}"
+}
+
+freebsd_do_patches() {
+	if [[ ${#PATCHES[@]} -gt 1 ]] ; then
+		for x in "${PATCHES[@]}"; do
+			epatch "${x}"
+		done
+	else
+		for x in ${PATCHES} ; do
+			epatch "${x}"
+		done
+	fi
+	epatch_user
+}
+
+freebsd_rename_libraries() {
+	ebegin "Renaming libraries"
+	# We don't use libtermcap, we use libncurses
+	find "${S}" -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-ltermcap:-lncurses:g; s:{LIBTERMCAP}:{LIBNCURSES}:g'
+	# flex provides libfl, not libl
+	find "${S}" -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-ll$:-lfl:g; s:-ll :-lfl :g; s:{LIBL}:{LIBFL}:g'
+	# ncurses provides libncursesw not libcursesw
+	find "${S}" -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-lcursesw:-lncursesw:g'
+	# we use expat instead of bsdxml
+	find "${S}" -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-lbsdxml:-lexpat:g'
+
+	eend $?
+}
+
+freebsd_src_unpack() {
+	if [[ ${MY_PV} == *9999* ]]; then
+		S="${WORKDIR}" subversion_src_unpack
+	else
+		unpack ${A}
+	fi
+	cd "${S}"
+
+	dummy_mk ${REMOVE_SUBDIRS}
+
+	freebsd_do_patches
+	freebsd_rename_libraries
+
+	# 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
+		export INSTALL_LINK="ln -f"
+		export INSTALL_SYMLINK="ln -fs"
+	fi
+}
+
+freebsd_src_compile() {
+	use profile && filter-flags "-fomit-frame-pointer"
+	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+
+	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
+
+	# Make sure to use FreeBSD definitions while crosscompiling
+	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
+
+	# Create objdir if MAKEOBJDIRPREFIX is defined, so that we can make out of
+	# tree builds easily.
+	if [[ -n "${MAKEOBJDIRPREFIX}" ]] ; then
+		mkmake obj || die
+	fi
+
+	bsdmk_src_compile "$@"
+}
+
+# Helper function to make a multilib build with FreeBSD Makefiles.
+# Usage: 
+# MULTIBUILD_VARIANTS=( $(get_all_abis) )
+# multibuild_foreach_variant freebsd_multilib_multibuild_wrapper my_function
+#
+# Important note: To use this function you _have_ to:
+# - inherit multilib.eclass and multibuild.eclass
+# - set MULTIBUILD_VARIANTS
+
+freebsd_multilib_multibuild_wrapper() {
+	# Get the ABI from multibuild.eclass
+	# This assumes MULTIBUILD_VARIANTS contains only valid ABIs.
+	local ABI=${MULTIBUILD_VARIANT}
+
+	# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS, LDADD and mymakeopts.
+	for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do
+		export ${i}_SAVE="${!i}"
+	done
+
+	# Setup the variables specific to this ABI.
+	multilib_toolchain_setup "${ABI}"
+
+	local target="$(tc-arch-kernel ${CHOST})"
+	mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
+	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		mymakeopts="${mymakeopts} COMPAT_32BIT="
+	fi
+
+	einfo "Building for ABI=${ABI} and TARGET=${target}"
+
+	export MAKEOBJDIRPREFIX="${BUILD_DIR}"
+	if [ ! -d "${MAKEOBJDIRPREFIX}" ] ; then
+		mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
+	fi
+	
+	CTARGET="${CHOST}" "$@"
+	
+	# Restore the variables now.
+	for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do
+		ii="${i}_SAVE"
+		export ${i}="${!ii}"
+	done
+}
+
+freebsd_src_install() {
+	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+
+	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
+
+	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
+
+	bsdmk_src_install
+}

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     3f53712401f69ffc6d22dc205c4ce6b2a3db2eab
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Aug 30 18:12:26 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Aug 30 18:12:26 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=3f537124

freebsd.eclass: fix my mistake. ${PV} --> ${MY_PV}

---
 eclass/freebsd.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index aa5911d..1053bb8 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -135,7 +135,7 @@ freebsd_src_unpack() {
 
 	# When share/mk exists in ${WORKDIR}, it is used on FreeBSD 10.0.
 	# I would enable the code until I find a better solution.
-	if [[ ${PV} == 9999 ]] && [[ ${PN} != freebsd-mk-defs ]]; then
+	if [[ ${MY_PV} == 9999 ]] && [[ ${PN} != freebsd-mk-defs ]]; then
 		[[ -e "${WORKDIR}"/share/mk ]] && rm -rf "${WORKDIR}"/share/mk
 	fi
 

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     7aff4d7ada6a697ed792bff248f720d703a726a1
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Aug 30 17:52:53 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Aug 30 17:52:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=7aff4d7a

freebsd.eclass: Changed to use to force /usr/share/mk on FreeBSD 10.0.

---
 eclass/freebsd.eclass | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index ea6b21a..aa5911d 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -132,6 +132,13 @@ freebsd_src_unpack() {
 	else
 		unpack ${A}
 	fi
+
+	# When share/mk exists in ${WORKDIR}, it is used on FreeBSD 10.0.
+	# I would enable the code until I find a better solution.
+	if [[ ${PV} == 9999 ]] && [[ ${PN} != freebsd-mk-defs ]]; then
+		[[ -e "${WORKDIR}"/share/mk ]] && rm -rf "${WORKDIR}"/share/mk
+	fi
+
 	cd "${S}"
 
 	dummy_mk ${REMOVE_SUBDIRS}

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     8261c7f374db3d030b148c91b99623d44a9aed25
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Aug 31 16:00:39 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sat Aug 31 16:00:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=8261c7f3

freebsd.eclass: keep directory, only remove *.mk

---
 eclass/freebsd.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 1053bb8..0ce056a 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -136,7 +136,7 @@ freebsd_src_unpack() {
 	# When share/mk exists in ${WORKDIR}, it is used on FreeBSD 10.0.
 	# I would enable the code until I find a better solution.
 	if [[ ${MY_PV} == 9999 ]] && [[ ${PN} != freebsd-mk-defs ]]; then
-		[[ -e "${WORKDIR}"/share/mk ]] && rm -rf "${WORKDIR}"/share/mk
+		[[ -e "${WORKDIR}"/share/mk ]] && rm -rf "${WORKDIR}"/share/mk/*.mk
 	fi
 
 	cd "${S}"

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     1c3c267d81d0b90263efa3a9b0a07a9075b4c29b
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Oct 31 16:57:34 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Oct 31 16:57:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=1c3c267d

freebsd.eclass: Fixed a problem of numerical comparison in 10.0.

---
 eclass/freebsd.eclass | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 0ce056a..8ad32c8 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -129,16 +129,15 @@ freebsd_rename_libraries() {
 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
-
-	# When share/mk exists in ${WORKDIR}, it is used on FreeBSD 10.0.
-	# I would enable the code until I find a better solution.
-	if [[ ${MY_PV} == 9999 ]] && [[ ${PN} != freebsd-mk-defs ]]; then
-		[[ -e "${WORKDIR}"/share/mk ]] && rm -rf "${WORKDIR}"/share/mk/*.mk
-	fi
-
 	cd "${S}"
 
 	dummy_mk ${REMOVE_SUBDIRS}
@@ -148,7 +147,8 @@ freebsd_src_unpack() {
 
 	# 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
+	version_compare ${RV} 9.1
+	if [[ $? -eq 3 ]] && ! has_version '>=sys-freebsd/freebsd-ubin-9.2_beta1' ; then
 		export INSTALL_LINK="ln -f"
 		export INSTALL_SYMLINK="ln -fs"
 	fi

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     3c64efbebda855e90234aa07732a6494a38efaf6
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Oct 26 12:34:23 2014 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sun Oct 26 12:34:23 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=3c64efbe

freebsd.eclass: added WITH_GCC= WITH_GNUCXX= etc.

---
 eclass/freebsd.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 8ad32c8..aaeeba9 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -159,6 +159,7 @@ freebsd_src_compile() {
 	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
 
 	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
+	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_CLANG_FULL= WITHOUT_CLANG_IS_CC= WITH_GCC= WITH_GNUCXX= "
 
 	# Make sure to use FreeBSD definitions while crosscompiling
 	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
@@ -220,6 +221,7 @@ freebsd_src_install() {
 	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
 
 	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
+	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_CLANG_FULL= WITHOUT_CLANG_IS_CC= WITH_GCC= WITH_GNUCXX= "
 
 	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
 

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     43de81a212155fdaba9d1534adc1d98e3faaf76b
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Jul 11 23:09:02 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sat Jul 11 23:09:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=43de81a2

remove freebsd.eclass

 eclass/freebsd.eclass | 229 --------------------------------------------------
 1 file changed, 229 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
deleted file mode 100644
index aaeeba9..0000000
--- a/eclass/freebsd.eclass
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-#
-# Diego Pettenò <flameeyes@gentoo.org>
-
-inherit versionator eutils flag-o-matic bsdmk
-
-# Drop patch level from ${PV}
-MY_PV=${PV/_p*}
-PLEVEL=${PV##*_p}
-
-LICENSE="BSD"
-HOMEPAGE="http://www.freebsd.org/"
-
-# Define global package names
-LIB="freebsd-lib-${PV}"
-BIN="freebsd-bin-${PV}"
-CONTRIB="freebsd-contrib-${PV}"
-SHARE="freebsd-share-${PV}"
-UBIN="freebsd-ubin-${PV}"
-USBIN="freebsd-usbin-${PV}"
-CRYPTO="freebsd-crypto-${PV}"
-LIBEXEC="freebsd-libexec-${PV}"
-SBIN="freebsd-sbin-${PV}"
-GNU="freebsd-gnu-${PV}"
-ETC="freebsd-etc-${PV}"
-SYS="freebsd-sys-${PV}"
-INCLUDE="freebsd-include-${PV}"
-RESCUE="freebsd-rescue-${PV}"
-CDDL="freebsd-cddl-${PV}"
-SECURE="freebsd-secure-${PV}"
-
-# Release version (5.3, 5.4, 6.0, etc)
-RV="$(get_version_component_range 1-2 ${MY_PV})"
-
-# SVN ebuild support.
-#   9.1.0.9999 -->	release/9.1.0
-#	9.1.9999   -->	releng/9.1
-#   9.9999     -->	stable/9
-#	9999 -->	head
-# 
-# svn revision can be specified by patch level:
-#	freebsd-lib-9.9999_p247000 --> set svn -r 247000
-
-if [[ ${MY_PV} == *9999* ]]; then
-	inherit subversion
-
-	# Set SVN revision using patch level.
-	[[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}"
-
-	case ${MY_PV%.9999} in
-		*.*.*)	BRANCH="release";;
-		*.*)	BRANCH="releng"	;;
-		9999)	BRANCH="head"	;;
-		*)	    BRANCH="stable"	;;
-	esac
-
-	if [[ ${BRANCH} == head ]]  ; then
-		SVN_SUB_URI="${BRANCH}"
-	else
-		SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}"
-	fi
-
-	ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}"
-	ESVN_PROJECT="freebsd-${BRANCH}"
-fi
-
-if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then
-	IUSE="profile"
-fi
-
-#unalias -a
-alias install-info='/usr/bin/bsdinstall-info'
-
-EXPORT_FUNCTIONS src_compile src_install src_unpack
-
-# doperiodic <kind> <file> ...
-doperiodic() {
-	local kind=$1
-	shift
-
-	( # dont want to pollute calling env
-		insinto /etc/periodic/${kind}
-		insopts -m 0755
-		doins "$@"
-	)
-}
-
-freebsd_get_bmake() {
-	local bmake
-	bmake=$(get_bmake)
-	[[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m /usr/share/mk/freebsd"
-
-	echo "${bmake}"
-}
-
-freebsd_do_patches() {
-	if [[ ${#PATCHES[@]} -gt 1 ]] ; then
-		for x in "${PATCHES[@]}"; do
-			epatch "${x}"
-		done
-	else
-		for x in ${PATCHES} ; do
-			epatch "${x}"
-		done
-	fi
-	epatch_user
-}
-
-freebsd_rename_libraries() {
-	ebegin "Renaming libraries"
-	# We don't use libtermcap, we use libncurses
-	find "${S}" -name Makefile -print0 | xargs -0 \
-		sed -i -e 's:-ltermcap:-lncurses:g; s:{LIBTERMCAP}:{LIBNCURSES}:g'
-	# flex provides libfl, not libl
-	find "${S}" -name Makefile -print0 | xargs -0 \
-		sed -i -e 's:-ll$:-lfl:g; s:-ll :-lfl :g; s:{LIBL}:{LIBFL}:g'
-	# ncurses provides libncursesw not libcursesw
-	find "${S}" -name Makefile -print0 | xargs -0 \
-		sed -i -e 's:-lcursesw:-lncursesw:g'
-	# we use expat instead of bsdxml
-	find "${S}" -name Makefile -print0 | xargs -0 \
-		sed -i -e 's:-lbsdxml:-lexpat:g'
-
-	eend $?
-}
-
-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
-	cd "${S}"
-
-	dummy_mk ${REMOVE_SUBDIRS}
-
-	freebsd_do_patches
-	freebsd_rename_libraries
-
-	# 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.
-	version_compare ${RV} 9.1
-	if [[ $? -eq 3 ]] && ! has_version '>=sys-freebsd/freebsd-ubin-9.2_beta1' ; then
-		export INSTALL_LINK="ln -f"
-		export INSTALL_SYMLINK="ln -fs"
-	fi
-}
-
-freebsd_src_compile() {
-	use profile && filter-flags "-fomit-frame-pointer"
-	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
-
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
-	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_CLANG_FULL= WITHOUT_CLANG_IS_CC= WITH_GCC= WITH_GNUCXX= "
-
-	# Make sure to use FreeBSD definitions while crosscompiling
-	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
-
-	# Create objdir if MAKEOBJDIRPREFIX is defined, so that we can make out of
-	# tree builds easily.
-	if [[ -n "${MAKEOBJDIRPREFIX}" ]] ; then
-		mkmake obj || die
-	fi
-
-	bsdmk_src_compile "$@"
-}
-
-# Helper function to make a multilib build with FreeBSD Makefiles.
-# Usage: 
-# MULTIBUILD_VARIANTS=( $(get_all_abis) )
-# multibuild_foreach_variant freebsd_multilib_multibuild_wrapper my_function
-#
-# Important note: To use this function you _have_ to:
-# - inherit multilib.eclass and multibuild.eclass
-# - set MULTIBUILD_VARIANTS
-
-freebsd_multilib_multibuild_wrapper() {
-	# Get the ABI from multibuild.eclass
-	# This assumes MULTIBUILD_VARIANTS contains only valid ABIs.
-	local ABI=${MULTIBUILD_VARIANT}
-
-	# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS, LDADD and mymakeopts.
-	for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do
-		export ${i}_SAVE="${!i}"
-	done
-
-	# Setup the variables specific to this ABI.
-	multilib_toolchain_setup "${ABI}"
-
-	local target="$(tc-arch-kernel ${CHOST})"
-	mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		mymakeopts="${mymakeopts} COMPAT_32BIT="
-	fi
-
-	einfo "Building for ABI=${ABI} and TARGET=${target}"
-
-	export MAKEOBJDIRPREFIX="${BUILD_DIR}"
-	if [ ! -d "${MAKEOBJDIRPREFIX}" ] ; then
-		mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
-	fi
-	
-	CTARGET="${CHOST}" "$@"
-	
-	# Restore the variables now.
-	for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do
-		ii="${i}_SAVE"
-		export ${i}="${!ii}"
-	done
-}
-
-freebsd_src_install() {
-	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
-
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
-	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_CLANG_FULL= WITHOUT_CLANG_IS_CC= WITH_GCC= WITH_GNUCXX= "
-
-	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
-
-	bsdmk_src_install
-}

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     71c6af1834ace305d5bdc7de9baea656151e93c5
Author:     Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 12:03:36 2016 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Wed Sep 28 12:03:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=71c6af18

eclass/freebsd.eclass: add Gentoo/FreeBSD 11.0 support.

 eclass/freebsd.eclass | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 57f9d45..1e141da 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -80,7 +80,7 @@ if [[ ${MY_PV} != *9999* ]] && version_is_at_least 10.0 ${RV} ; then
 	SRC_URI="mirror://freebsd/releases/i386/${DL_PV}/src.txz -> freebsd-src-${MY_PV}.tar.xz"
 fi
 
-IUSE="profile"
+IUSE="debug profile"
 
 #unalias -a
 alias install-info='/usr/bin/bsdinstall-info'
@@ -187,7 +187,9 @@ freebsd_src_unpack() {
 	dummy_mk ${REMOVE_SUBDIRS}
 
 	freebsd_do_patches
-	freebsd_rename_libraries
+	if ! version_is_at_least 11.0 ${RV} ; then
+		freebsd_rename_libraries
+	fi
 
 	# 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.
@@ -195,11 +197,25 @@ freebsd_src_unpack() {
 		export INSTALL_LINK="ln -f"
 		export INSTALL_SYMLINK="ln -fs"
 	fi
+	if version_is_at_least 11.0 ${RV} ; then
+		export RSYMLINK=" -l s"
+	fi
 }
 
 freebsd_src_compile() {
 	use profile && filter-flags "-fomit-frame-pointer"
-	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+	if version_is_at_least 11.0 ${RV} ; then
+		if ! use profile ; then
+			mymakeopts="${mymakeopts} MK_PROFILE=no "
+		fi
+		use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no "
+		# Test does not support yet.
+		mymakeopts="${mymakeopts} MK_TESTS=no "
+		# Force set SRCTOP.
+		mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} "
+	else
+		use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+	fi
 
 	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
 
@@ -260,7 +276,18 @@ freebsd_multilib_multibuild_wrapper() {
 }
 
 freebsd_src_install() {
-	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+	if version_is_at_least 11.0 ${RV} ; then
+		if ! use profile ; then
+			mymakeopts="${mymakeopts} MK_PROFILE=no "
+		fi
+		use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no "
+		# Test does not support yet.
+		mymakeopts="${mymakeopts} MK_TESTS=no "
+		# Force set SRCTOP.
+		mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} "
+	else
+		use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+	fi
 
 	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
 

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     9c7da84db91d7a65a9904fdb251a17ea5d61724a
Author:     Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 11:59:38 2016 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Wed Sep 28 11:59:38 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=9c7da84d

eclass/freebsd.eclass: import from latest tree

 eclass/freebsd.eclass | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 270 insertions(+)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
new file mode 100644
index 0000000..57f9d45
--- /dev/null
+++ b/eclass/freebsd.eclass
@@ -0,0 +1,270 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+#
+# @MAINTAINER:
+# maintainer-needed@gentoo.org
+# @AUTHOR:
+# Diego Pettenò <flameeyes@gentoo.org>
+
+inherit versionator eutils flag-o-matic bsdmk
+
+# Drop patch level from ${PV}
+MY_PV=${PV/_p*}
+PLEVEL=${PV##*_p}
+
+LICENSE="BSD"
+HOMEPAGE="http://www.freebsd.org/"
+
+# Define global package names
+LIB="freebsd-lib-${PV}"
+BIN="freebsd-bin-${PV}"
+CONTRIB="freebsd-contrib-${PV}"
+SHARE="freebsd-share-${PV}"
+UBIN="freebsd-ubin-${PV}"
+USBIN="freebsd-usbin-${PV}"
+CRYPTO="freebsd-crypto-${PV}"
+LIBEXEC="freebsd-libexec-${PV}"
+SBIN="freebsd-sbin-${PV}"
+GNU="freebsd-gnu-${PV}"
+ETC="freebsd-etc-${PV}"
+SYS="freebsd-sys-${PV}"
+INCLUDE="freebsd-include-${PV}"
+RESCUE="freebsd-rescue-${PV}"
+CDDL="freebsd-cddl-${PV}"
+SECURE="freebsd-secure-${PV}"
+
+# Release version (5.3, 5.4, 6.0, etc)
+RV="$(get_version_component_range 1-2 ${MY_PV})"
+
+# SVN ebuild support.
+#   9.1.0.9999 -->	release/9.1.0
+#	9.1.9999   -->	releng/9.1
+#   9.9999     -->	stable/9
+#	9999 -->	head
+# 
+# svn revision can be specified by patch level:
+#	freebsd-lib-9.9999_p247000 --> set svn -r 247000
+
+if [[ ${MY_PV} == *9999* ]]; then
+	inherit subversion
+
+	# Set SVN revision using patch level.
+	[[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}"
+
+	case ${MY_PV%.9999} in
+		*.*.*)	BRANCH="release";;
+		*.*)	BRANCH="releng"	;;
+		9999)	BRANCH="head"	;;
+		*)	    BRANCH="stable"	;;
+	esac
+
+	if [[ ${BRANCH} == head ]]  ; then
+		SVN_SUB_URI="${BRANCH}"
+	else
+		SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}"
+	fi
+
+	ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}"
+	ESVN_PROJECT="freebsd-${BRANCH}"
+fi
+
+# 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'
+
+EXPORT_FUNCTIONS src_compile src_install src_unpack
+
+# doperiodic <kind> <file> ...
+doperiodic() {
+	local kind=$1
+	shift
+
+	( # dont want to pollute calling env
+		insinto /etc/periodic/${kind}
+		insopts -m 0755
+		doins "$@"
+	)
+}
+
+freebsd_get_bmake() {
+	local bmake
+	bmake=$(get_bmake)
+	[[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m /usr/share/mk/freebsd"
+
+	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
+			epatch "${x}"
+		done
+	else
+		for x in ${PATCHES} ; do
+			epatch "${x}"
+		done
+	fi
+	[[ ${#UPSTREAM_PATCHES[@]} -gt 0 ]] && epatch $(freebsd_upstream_patches -s)
+	epatch_user
+}
+
+freebsd_rename_libraries() {
+	ebegin "Renaming libraries"
+	# We don't use libtermcap, we use libncurses
+	find "${S}" -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-ltermcap:-lncurses:g; s:{LIBTERMCAP}:{LIBNCURSES}:g'
+	# flex provides libfl, not libl
+	find "${S}" -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-ll$:-lfl:g; s:-ll :-lfl :g; s:{LIBL}:{LIBFL}:g'
+	# ncurses provides libncursesw not libcursesw
+	find "${S}" -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-lcursesw:-lncursesw:g'
+	# we use expat instead of bsdxml
+	find "${S}" -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-lbsdxml:-lexpat:g'
+
+	eend $?
+}
+
+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
+		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}"
+
+	dummy_mk ${REMOVE_SUBDIRS}
+
+	freebsd_do_patches
+	freebsd_rename_libraries
+
+	# 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 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
+}
+
+freebsd_src_compile() {
+	use profile && filter-flags "-fomit-frame-pointer"
+	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+
+	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
+
+	# Make sure to use FreeBSD definitions while crosscompiling
+	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
+
+	# Create objdir if MAKEOBJDIRPREFIX is defined, so that we can make out of
+	# tree builds easily.
+	if [[ -n "${MAKEOBJDIRPREFIX}" ]] ; then
+		mkmake obj || die
+	fi
+
+	bsdmk_src_compile "$@"
+}
+
+# Helper function to make a multilib build with FreeBSD Makefiles.
+# Usage: 
+# MULTIBUILD_VARIANTS=( $(get_all_abis) )
+# multibuild_foreach_variant freebsd_multilib_multibuild_wrapper my_function
+#
+# Important note: To use this function you _have_ to:
+# - inherit multilib.eclass and multibuild.eclass
+# - set MULTIBUILD_VARIANTS
+
+freebsd_multilib_multibuild_wrapper() {
+	# Get the ABI from multibuild.eclass
+	# This assumes MULTIBUILD_VARIANTS contains only valid ABIs.
+	local ABI=${MULTIBUILD_VARIANT}
+
+	# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS, LDADD and mymakeopts.
+	for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do
+		export ${i}_SAVE="${!i}"
+	done
+
+	# Setup the variables specific to this ABI.
+	multilib_toolchain_setup "${ABI}"
+
+	local target="$(tc-arch-kernel ${CHOST})"
+	mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
+	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		mymakeopts="${mymakeopts} COMPAT_32BIT="
+	fi
+
+	einfo "Building for ABI=${ABI} and TARGET=${target}"
+
+	export MAKEOBJDIRPREFIX="${BUILD_DIR}"
+	if [ ! -d "${MAKEOBJDIRPREFIX}" ] ; then
+		mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
+	fi
+	
+	CTARGET="${CHOST}" "$@"
+	
+	# Restore the variables now.
+	for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do
+		ii="${i}_SAVE"
+		export ${i}="${!ii}"
+	done
+}
+
+freebsd_src_install() {
+	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+
+	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
+
+	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
+
+	bsdmk_src_install
+}

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     d5112aae544505078691a9099ae33c0f6aaaec2f
Author:     Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Fri Oct  7 12:12:29 2016 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Fri Oct  7 12:12:29 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=d5112aae

freebsd.eclass: sync latest tree.

 eclass/freebsd.eclass | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 0e6ad01..bedda33 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -208,6 +208,20 @@ freebsd_src_unpack() {
 	if version_is_at_least 11.0 ${RV} ; then
 		export RSYMLINK=" -l s"
 	fi
+
+	# When CC=clang, force use clang-cpp #478810, #595878
+	if [[ $(tc-getCC) == *clang* ]] ; then
+		if type -P clang-cpp > /dev/null ; then
+			export CPP=clang-cpp
+		else
+			mkdir "${WORKDIR}"/workaround_clang-cpp || die "Could not create ${WORKDIR}/workaround_clang-cpp"
+			ln -s "$(type -P clang)" "${WORKDIR}"/workaround_clang-cpp/clang-cpp || die "Could not create clang-cpp symlink."
+			export CPP="${WORKDIR}/workaround_clang-cpp/clang-cpp"
+		fi
+	fi
+
+	# Add a special CFLAGS required for multilib support.
+	use amd64-fbsd && export CFLAGS_x86_fbsd="${CFLAGS_x86_fbsd} -DCOMPAT_32BIT -B/usr/lib32 -L/usr/lib32"
 }
 
 freebsd_src_compile() {

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     04c0fbf399b92ca4713be304a14f63415b66e32d
Author:     Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Sun Oct  9 08:19:59 2016 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sun Oct  9 08:19:59 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=04c0fbf3

eclass/bsdmk.eclass: Pass all of arguments to mkinstall.

 eclass/bsdmk.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/bsdmk.eclass b/eclass/bsdmk.eclass
index 3ce3572..a92b4c0 100644
--- a/eclass/bsdmk.eclass
+++ b/eclass/bsdmk.eclass
@@ -79,5 +79,5 @@ bsdmk_src_compile() {
 # @DESCRIPTION:
 # The bsdmk src_install function, which is exported
 bsdmk_src_install() {
-	mkinstall || die "install failed"
+	mkinstall "$@" || die "install failed"
 }

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     6894d04c327ef5aa3e951d565edf04722c52262a
Author:     Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Sun Oct  9 08:18:40 2016 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sun Oct  9 08:18:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=6894d04c

freebsd.eclass: Pass all of arguments to bsdmk_src_install.

 eclass/freebsd.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index bedda33..8bab9af 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -315,5 +315,5 @@ freebsd_src_install() {
 
 	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
 
-	bsdmk_src_install
+	bsdmk_src_install "$@"
 }

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     33612af8cae165e0549873ae64e6713d4de5e004
Author:     Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Sun Oct  9 08:19:26 2016 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sun Oct  9 08:19:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=33612af8

eclass/bsdmk.eclass: import from latest tree

 eclass/bsdmk.eclass | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/eclass/bsdmk.eclass b/eclass/bsdmk.eclass
new file mode 100644
index 0000000..3ce3572
--- /dev/null
+++ b/eclass/bsdmk.eclass
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# @ECLASS: bsdmk.eclass
+# @MAINTAINER:
+# maintainer-needed@gentoo.org
+# @BLURB: Some functions for BSDmake
+
+inherit toolchain-funcs portability flag-o-matic
+
+EXPORT_FUNCTIONS src_compile src_install
+
+RDEPEND=""
+# this should actually be BDEPEND, but this works.
+DEPEND="virtual/pmake"
+
+ESED="/usr/bin/sed"
+
+# @ECLASS-VARIABLE: mymakeopts
+# @DESCRIPTION:
+# Options for bsd-make
+
+# @FUNCTION: append-opt
+# @USAGE: < options >
+# @DESCRIPTION:
+# append options to enable or disable features
+append-opt() {
+	mymakeopts="${mymakeopts} $@"
+}
+
+# @FUNCTION: mkmake
+# @USAGE: [ options ]
+# @DESCRIPTION:
+# calls bsd-make command with the given options, passing ${mymakeopts} to
+# enable ports to useflags bridge.
+mkmake() {
+	[[ -z ${BMAKE} ]] && BMAKE="$(get_bmake)"
+
+	tc-export CC CXX LD RANLIB
+
+	${BMAKE} ${MAKEOPTS} ${EXTRA_EMAKE} ${mymakeopts} NO_WERROR= STRIP= "$@"
+}
+
+# @FUNCTION: mkinstall
+# @USAGE: [ options ]
+# @DESCRIPTION:
+# Calls "bsd-make install" with the given options, passing ${mamakeopts} to
+# enable ports to useflags bridge
+mkinstall() {
+	[[ -z ${BMAKE} ]] && BMAKE="$(get_bmake)"
+
+	# STRIP= will replace the default value of -s, leaving to portage the
+	# task of stripping executables.
+	${BMAKE} ${mymakeopts} NO_WERROR= STRIP= MANSUBDIR= DESTDIR="${D}" "$@" install
+}
+
+# @FUNCTION: dummy_mk
+# @USAGE: < dirnames >
+# @DESCRIPTION:
+# removes the specified subdirectories and creates a dummy makefile in them
+# useful to remove the need for "minimal" patches
+dummy_mk() {
+	for dir in $@; do
+		[ -d ${dir} ] || ewarn "dummy_mk called on a non-existing directory: $dir"
+		[ -f ${dir}/Makefile ] || ewarn "dummy_mk called on a directory without Makefile: $dir"
+		echo ".include <bsd.lib.mk>" > ${dir}/Makefile
+	done
+}
+
+# @FUNCTION: bsdmk_src_compile
+# @DESCRIPTION:
+# The bsdmk src_compile function, which is exported
+bsdmk_src_compile() {
+	mkmake "$@" || die "make failed"
+}
+
+# @FUNCTION: bsdmk_src_install
+# @DESCRIPTION:
+# The bsdmk src_install function, which is exported
+bsdmk_src_install() {
+	mkinstall || die "install failed"
+}

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     5fdebd5d0c9b22a9e046fba384ddbd4c06587830
Author:     Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Sun Oct  9 09:15:50 2016 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sun Oct  9 09:15:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=5fdebd5d

freebsd.eclass: freebsd 11.0 does not support NO_ variable.

 eclass/freebsd.eclass | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 8bab9af..5d4562a 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -228,18 +228,21 @@ freebsd_src_compile() {
 	use profile && filter-flags "-fomit-frame-pointer"
 	if version_is_at_least 11.0 ${RV} ; then
 		if ! use profile ; then
-			mymakeopts="${mymakeopts} MK_PROFILE=no "
+			mymakeopts="${mymakeopts} WITHOUT_PROFILE= "
 		fi
-		use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no "
+		use debug || mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= "
 		# Test does not support yet.
-		mymakeopts="${mymakeopts} MK_TESTS=no "
+		mymakeopts="${mymakeopts} WITHOUT_TESTS= "
 		# Force set SRCTOP.
 		mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} "
+		# Set common option.
+		mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= "
 	else
 		use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+		mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
 	fi
 
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
+	mymakeopts="${mymakeopts} NO_FSCHG="
 
 	# Make sure to use FreeBSD definitions while crosscompiling
 	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
@@ -300,18 +303,21 @@ freebsd_multilib_multibuild_wrapper() {
 freebsd_src_install() {
 	if version_is_at_least 11.0 ${RV} ; then
 		if ! use profile ; then
-			mymakeopts="${mymakeopts} MK_PROFILE=no "
+			mymakeopts="${mymakeopts} WITHOUT_PROFILE= "
 		fi
-		use debug || mymakeopts="${mymakeopts} MK_DEBUG_FILES=no "
+		use debug || mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= "
 		# Test does not support yet.
-		mymakeopts="${mymakeopts} MK_TESTS=no "
+		mymakeopts="${mymakeopts} WITHOUT_TESTS= "
 		# Force set SRCTOP.
 		mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} "
+		# Set common option.
+		mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= "
 	else
 		use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+		mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
 	fi
 
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
+	mymakeopts="${mymakeopts} NO_FSCHG="
 
 	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
 

[gentoo-commits] proj/gentoo-bsd:master commit in: eclass/

[Yuta SATOH]

commit:     03b1fb456466b0b3440996123486d5b8cd22b4a2
Author:     Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Tue Oct 11 13:45:57 2016 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Tue Oct 11 13:45:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=03b1fb45

freebsd.eclass: Always disable DEBUG_FILES=

 eclass/freebsd.eclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 5d4562a..8f6b204 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -80,7 +80,7 @@ if [[ ${MY_PV} != *9999* ]] && version_is_at_least 10.0 ${RV} ; then
 	SRC_URI="mirror://freebsd/releases/i386/${DL_PV}/src.txz -> freebsd-src-${MY_PV}.tar.xz"
 fi
 
-IUSE="debug profile"
+IUSE="profile"
 
 #unalias -a
 alias install-info='/usr/bin/bsdinstall-info'
@@ -230,7 +230,8 @@ freebsd_src_compile() {
 		if ! use profile ; then
 			mymakeopts="${mymakeopts} WITHOUT_PROFILE= "
 		fi
-		use debug || mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= "
+		# Disable debugging info, use FEATURES=splitdebug instead.
+		mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= "
 		# Test does not support yet.
 		mymakeopts="${mymakeopts} WITHOUT_TESTS= "
 		# Force set SRCTOP.
@@ -305,7 +306,8 @@ freebsd_src_install() {
 		if ! use profile ; then
 			mymakeopts="${mymakeopts} WITHOUT_PROFILE= "
 		fi
-		use debug || mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= "
+		# Disable debugging info, use FEATURES=splitdebug instead.
+		mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= "
 		# Test does not support yet.
 		mymakeopts="${mymakeopts} WITHOUT_TESTS= "
 		# Force set SRCTOP.