[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