do not build nor install libbsdxml which is a pale copy of libexpat; symlink the .so so that -lbsdxml still works

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

5 files changed, 482 insertions, 9 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 28dd19edd4ab..6dd910472821 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.93 2011/07/06 05:45:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.94 2011/07/10 17:47:59 aballier Exp $
+
+*freebsd-lib-8.2-r1 (10 Jul 2011)
+
+  10 Jul 2011; Alexis Ballier <aballier@gentoo.org>
+  +files/freebsd-lib-bsdxml2expat.patch, +freebsd-lib-8.2-r1.ebuild:
+  do not build nor install libbsdxml which is a pale copy of libexpat; symlink
+  the .so so that -lbsdxml still works
 
 *freebsd-lib-8.2 (06 Jul 2011)
 
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 786e89c672c3..1881a71e18e4 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -14,6 +14,7 @@ AUX freebsd-lib-8.0-log2.patch 667 RMD160 63f115ff4262cbcb46377f7bfb2fc7a01167e5
 AUX freebsd-lib-8.0-rpcsec_gss.patch 298 RMD160 155eeb638eedb291ea739ad64993817e5d985f7b SHA1 005d80f43b2558d1c8ecc41192b28e1dff53b39a SHA256 170d07c44d02a6b4dde1d0d209c57f3bbab567a5c4a592a82b270140a2a1d7f1
 AUX freebsd-lib-8.2-liblink.patch 510 RMD160 99364b405782a3cd7d7c4f84db9c74e976c0c8ba SHA1 54810b4414733691020ffd8db648fe46a8beef9f SHA256 38f967683e9d335ff7860150b2e6ae4d749266937ba195c6747d42d64c8e31ee
 AUX freebsd-lib-bsdxml.patch 339 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 SHA1 3b456d272de5d0c56bc650fe60f38524857f8b31 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9
+AUX freebsd-lib-bsdxml2expat.patch 708 RMD160 4a973e39a5860bd7b0fbba438302c65ec2b66e33 SHA1 95ed47baf5e189865d3989fad625a2160d2abe13 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85
 AUX freebsd-lib-includes.patch 316 RMD160 655d20a7a86715983469dbda678bca0ae726c069 SHA1 65cd796b0f8747d8d063b1f6e3ea53f82cdcdbe1 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06
 AUX freebsd-lib-new_as.patch 1494 RMD160 36ac871434f9994d5a0d7e1b73765c055d49948a SHA1 10e2e6b7b27459548a17809ada287520e3ffeeea SHA256 6021f34246dcf768a94ffe7273ea2f5590adf6d82ce7fb555234f8012bdbd982
 AUX libmap.conf 201 RMD160 ad0ab6c08b5c541e0e45636dcbbaa468bbae2f95 SHA1 df81db07a94d988f1c41b4696b4d3b0058e73f83 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742
@@ -46,13 +47,14 @@ DIST freebsd-usbin-8.0.tar.bz2 2411151 RMD160 f162437ab2e3c89c6635e5c567e39b6097
 DIST freebsd-usbin-8.2.tar.bz2 2443024 RMD160 972723becd1ab16615bc45f9beab8483533cbf81 SHA1 16bcb5528f14cfeccb9f4c913a629b01d9873ebf SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603
 EBUILD freebsd-lib-7.2-r1.ebuild 12021 RMD160 83fc0d2ee7e5ff037ae27358d0b345fc28938158 SHA1 d91c9328cfbe8e614bda3b93d782a8452dff0c8e SHA256 4cfd26e8299670f33e6fa20094b66e464ed3bd113c899b3374b55678ac4a4dd0
 EBUILD freebsd-lib-8.0.ebuild 14623 RMD160 3194aa0ab5fda28db1db05b4449d5889251cedc1 SHA1 bbddaa53f36296b2a635c459868cd56fd965de81 SHA256 ba8328339f7c487617d8e1c8754d91ccae38a15073a92b847299aa5e8dfe68da
+EBUILD freebsd-lib-8.2-r1.ebuild 15480 RMD160 ced49f826423a859d80446986eef9d9b93c51da8 SHA1 f887b161a50ea43693d2a290e9c3b3d957889060 SHA256 06d810b9e3b3cb7e1713dd4593181205fd722b112d991943a0472808b15346da
 EBUILD freebsd-lib-8.2.ebuild 15283 RMD160 e3635dd51b96c56114a52cc1ab593a22b4467573 SHA1 25b0cc1f115fbbac93b521baa742442cf5cfec51 SHA256 96a44aeb3ad0db6f9d37e0483f97313d995de566dd7c85895b51bd1617e74092
-MISC ChangeLog 21771 RMD160 6c4fb32d929fb1ab020c21a601b83fe4ac2fbfc4 SHA1 ec7a505929b78cca55ca2f3b40cec6e1e29623d5 SHA256 14088654902561be3c0c29e003ed4545d219714c6887a08eebdea580b900e41f
+MISC ChangeLog 22046 RMD160 bc1cc05e6be6a80cb46c2220f996d45e8e0666fc SHA1 7573221c7e9d82faba346d79e5461a944753e52d SHA256 e2dd3ee7532416a515946c21504ae2c7b13879d51894e9292b81e6528817b838
 MISC metadata.xml 362 RMD160 535ffb5cb1305012df32a444f602d4ec20a10700 SHA1 fc9fdf3b5fc6d37cf573998d76905bd911c60e07 SHA256 244399668bb611eb11a3b063d11424cbecc2363443d6f78f3f042a566980bbb1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4T9owACgkQvFcC4BYPU0rP0wCguGO1OrZCWtMVsxTlNWCcH3YA
-7pUAn0Glm9a79sL8DsxxQxR7A3OMqKjB
-=VAZs
+iEYEARECAAYFAk4aEAUACgkQvFcC4BYPU0o4yACgnO1GSeYpWqOD2tOplcSO5a0x
+v7gAnjaPeYkg9VncuNS9t3J7gRiK00Gi
+=5Res
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
new file mode 100644
index 000000000000..1b4e79129bfc
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
@@ -0,0 +1,26 @@
+diff -ur lib/libgeom.old/Makefile lib/libgeom/Makefile
+--- lib/libgeom.old/Makefile	2011-07-10 14:23:51.000000000 +0000
++++ lib/libgeom/Makefile	2011-07-10 15:12:39.000000000 +0000
+@@ -13,8 +13,8 @@
+ 
+ WARNS?=	3
+ 
+-DPADD=	${LIBBSDXML} ${LIBSBUF}
+-LDADD=	-lbsdxml -lsbuf
++DPADD=	${LIBSBUF}
++LDADD=	-lexpat -lsbuf
+ 
+ MAN=	libgeom.3
+ 
+diff -ur lib/libgeom.old/geom_xml2tree.c lib/libgeom/geom_xml2tree.c
+--- lib/libgeom.old/geom_xml2tree.c	2010-12-21 17:09:25.000000000 +0000
++++ lib/libgeom/geom_xml2tree.c	2011-07-10 15:12:52.000000000 +0000
+@@ -43,7 +43,7 @@
+ #include <sys/sbuf.h>
+ #include <sys/sysctl.h>
+ #include <err.h>
+-#include <bsdxml.h>
++#include <expat.h>
+ #include <libgeom.h>
+ 
+ struct mystate {
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
new file mode 100644
index 000000000000..cefdbce7d8c4
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
@@ -0,0 +1,436 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild,v 1.1 2011/07/10 17:47:59 aballier Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="FreeBSD's base system libraries"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+# Crypto is needed to have an internal OpenSSL header
+# sys is needed for libalias, probably we can just extract that instead of
+# extracting the whole tarball
+SRC_URI="mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${CRYPTO}.tar.bz2
+		mirror://gentoo/${LIBEXEC}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		mirror://gentoo/${INCLUDE}.tar.bz2
+		mirror://gentoo/${USBIN}.tar.bz2
+		mirror://gentoo/${GNU}.tar.bz2
+		build? (
+			mirror://gentoo/${SYS}.tar.bz2 )"
+
+if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
+	RDEPEND="ssl? ( dev-libs/openssl )
+		hesiod? ( net-dns/hesiod )
+		kerberos? ( virtual/krb5 )
+		usb? ( !dev-libs/libusb )
+		>=dev-libs/expat-2.0.1
+		!sys-freebsd/freebsd-headers"
+	DEPEND="${RDEPEND}
+		>=sys-devel/flex-2.5.31-r2
+		=sys-freebsd/freebsd-sources-${RV}*
+		!bootstrap? ( app-arch/bzip2 )"
+else
+	SRC_URI="${SRC_URI}
+			mirror://gentoo/${SYS}.tar.bz2"
+fi
+
+DEPEND="${DEPEND}
+		=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/lib"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
+	export CTARGET=${CATEGORY/cross-}
+fi
+
+IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
+	build bootstrap crosscompile_opts_headers-only"
+
+pkg_setup() {
+	[ -c /dev/zero ] || \
+		die "You forgot to mount /dev; the compiled libc would break."
+
+	if ! use ssl && use kerberos; then
+		eerror "If you want kerberos support you need to enable ssl support, too."
+	fi
+
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
+	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
+	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+
+	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL="
+
+	if [ "${CTARGET}" != "${CHOST}" ]; then
+		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
+		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
+	fi
+}
+
+PATCHES=( 
+	"${FILESDIR}/${PN}-6.0-pmc.patch"
+	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
+	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	"${FILESDIR}/${PN}-6.1-csu.patch"
+	"${FILESDIR}/${PN}-6.2-bluetooth.patch"
+	"${FILESDIR}/${PN}-8.0-log2.patch"
+	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
+	"${FILESDIR}/${PN}-8.2-liblink.patch"
+	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
+
+# Here we disable and remove source which we don't need or want
+# In order:
+# - ncurses stuff
+# - libexpat creates a bsdxml library which is the same as expat
+# - archiving libraries (have their own ebuild)
+# - sendmail libraries (they are installed by sendmail)
+# - SNMP library and dependency (have their own ebuilds)
+#
+# The rest are libraries we already have somewhere else because
+# they are contribution.
+# Note: libtelnet is an internal lib used by telnet and telnetd programs
+# as it's not used in freebsd-lib package itself, it's pointless building
+# it here.
+REMOVE_SUBDIRS="ncurses \
+	libexpat \
+	libz libbz2 libarchive liblzma \
+	libsm libsmdb libsmutil \
+	libbegemot libbsnmp \
+	libpam libpcap bind libwrap libmagic \
+	libcom_err libtelnet
+	libedit libelf"
+
+src_prepare() {
+	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
+	sed -i.bak -e 's:histedit.h::' "${WORKDIR}/include/Makefile"
+
+	# Upstream Display Managers default to using VT7
+	# We should make FreeBSD allow this by default
+	local x=
+	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
+		sed -i.bak \
+			-e '/ttyv5[[:space:]]/ a\
+# Display Managers default to VT7.\
+# If you use the xdm init script, keep ttyv6 commented out\
+# unless you force a different VT for the DM being used.' \
+			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
+			|| die "Failed to sed ${x}"
+		rm "${x}".bak
+	done
+
+	# This one is here because it also
+	# patches "${WORKDIR}/include"
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${PN}-includes.patch"
+	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
+
+	# Don't install the hesiod man page or header
+	rm "${WORKDIR}"/include/hesiod.h || die
+	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
+	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
+	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
+
+	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
+	cd "${S}"
+	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
+		libsmb; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
+		die "Problem fixing \"${dir}/Makefile"
+	done
+	if use build; then
+		cd "${WORKDIR}"
+		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
+		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
+		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
+		# Preinstall includes so we don't use the system's ones.
+		mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper"
+		install_includes "/include_proper"
+		return 0
+	fi
+
+	if [ "${CTARGET}" = "${CHOST}" ]; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
+	else
+		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
+			"${S}/libc/rpc/Makefile.inc" \
+			"${S}/libc/yp/Makefile.inc"
+	fi
+
+	if install --version 2> /dev/null | grep -q GNU; then
+		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
+	fi
+
+	# Preinstall includes so we don't use the system's ones.
+	mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper"
+	install_includes "/include_proper"
+
+	# Let arch-specific includes to be found
+	local machine
+	machine=$(tc-arch-kernel ${CTARGET})
+	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
+		die "Couldn't make ${machine}/include symlink."
+
+	cd "${S}"
+	use bootstrap && dummy_mk libstand
+	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
+	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
+		-i "${S}/csu/i386-elf/Makefile" \
+		-i "${S}/csu/ia64/Makefile" || die
+}
+
+src_compile() {
+	cd "${WORKDIR}/include"
+	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
+
+	use crosscompile_opts_headers-only && return 0
+
+	# Bug #270098
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	strip-flags
+	if [ "${CTARGET}" != "${CHOST}" ]; then
+		export YACC='yacc -by'
+		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
+		mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NLS="
+
+		local machine
+		machine=$(tc-arch-kernel ${CTARGET})
+
+		local csudir
+		if [ -d "${S}/csu/${machine}-elf" ]; then
+			csudir="${S}/csu/${machine}-elf"
+		else
+			csudir="${S}/csu/${machine}"
+		fi
+		export RAW_LDFLAGS=$(raw-ldflags)
+		cd "${csudir}"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
+
+		append-flags "-isystem /usr/${CTARGET}/usr/include"
+		append-flags "-isystem ${WORKDIR}/lib/libutil"
+		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
+		append-flags "-B ${csudir}"
+		append-ldflags "-B ${csudir}"
+
+		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
+		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
+		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+
+		export RAW_LDFLAGS=$(raw-ldflags)
+		cd "${S}/libc"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
+		cd "${S}/msun"
+		LDADD="-lssp_nonshared" $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
+	else
+		# Forces to use the local copy of headers as they might be outdated in
+		# the system
+		append-flags "-isystem '${WORKDIR}/include_proper'"
+
+		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
+		einfo "Compiling libssp in \"${WORKDIR}/gnu/lib/libssp/\"."
+		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
+		NOFLAGSTRIP=yes freebsd_src_compile
+		# Hack libssp_nonshared.a into libc & others since we don't have
+		# the linker script in place yet.
+		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+		einfo "Compiling libc."
+		cd "${S}"
+		export RAW_LDFLAGS=$(raw-ldflags)
+		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
+	fi
+}
+
+src_install() {
+	[ "${CTARGET}" = "${CHOST}" ] \
+		&& INCLUDEDIR="/usr/include" \
+		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
+	dodir ${INCLUDEDIR}
+	einfo "Installing for ${CTARGET} in ${CHOST}.."
+	install_includes ${INCLUDEDIR}
+
+	# Install math.h when crosscompiling, at this point
+	if [ "${CHOST}" != "${CTARGET}" ]; then
+		insinto "/usr/${CTARGET}/usr/include"
+		doins "${S}/msun/src/math.h"
+	fi
+
+	use crosscompile_opts_headers-only && return 0
+	local mylibdir=$(get_libdir)
+
+	if [ "${CTARGET}" != "${CHOST}" ]; then
+		local csudir
+		if [ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]; then
+			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf"
+		else
+			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})"
+		fi
+		cd "${csudir}"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \
+			FILESDIR="/usr/${CTARGET}/usr/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install csu failed"
+
+		cd "${S}/libc"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install libc failed"
+
+		cd "${S}/msun"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install msun failed"
+
+		cd "${WORKDIR}/gnu/lib/libssp/"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install ssp failed"
+
+		dosym "usr/include" "/usr/${CTARGET}/sys-include"
+	else
+		# Set SHLIBDIR and LIBDIR for multilib
+		cd "${WORKDIR}/gnu/lib/libssp"
+		SHLIBDIR="/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install ssp failed."
+		cd "${S}"
+		SHLIBDIR="/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install failed"
+	fi
+
+	# Don't install the rest of the configuration files if crosscompiling
+	if [ "${CTARGET}" != "${CHOST}" ] ; then
+		# This is to get it stripped with the correct tools, otherwise it gets
+		# stripped with the host strip.
+		export CHOST=${CTARGET}
+		return 0
+	fi
+
+	# Add symlinks (-> libthr) for legacy threading libraries, since these are
+	# not built by us (they are disabled in FreeBSD-7 anyway).
+	dosym libthr.a /usr/${mylibdir}/libpthread.a
+	dosym libthr.so /usr/${mylibdir}/libpthread.so
+	dosym libthr.a /usr/${mylibdir}/libc_r.a
+	dosym libthr.so /usr/${mylibdir}/libc_r.so
+	# Symlink libbsdxml to libexpat
+	dosym libexpat.so /usr/${mylibdir}/libbsdxml.so
+
+	# install libstand files
+	dodir /usr/include/libstand
+	insinto /usr/include/libstand
+	doins "${S}"/libstand/*.h
+
+	cd "${WORKDIR}/etc/"
+	insinto /etc
+	doins auth.conf nls.alias mac.conf netconfig
+
+	# Install ttys file
+	if [[ $(tc-arch-kernel) == "x86_64" ]]; then
+		local MACHINE="amd64"
+	else
+		local MACHINE="$(tc-arch-kernel)"
+	fi
+	doins "etc.${MACHINE}"/*
+
+	# Generate ldscripts, otherwise bad thigs are supposed to happen
+	gen_usr_ldscript libalias_cuseeme.so libalias_dummy.so libalias_ftp.so \
+		libalias_irc.so libalias_nbt.so libalias_pptp.so libalias_skinny.so \
+		libalias_smedia.so libssp.so
+	# These show on QA warnings too, however they're pretty much bsd only,
+	# aka, no autotools for them.
+	#	libbsdxml.so libcam.so libcrypt.so libdevstat.so libgeom.so \
+	#	libipsec.so libipx.so libkiconv.so libkvm.so libmd.so libsbuf.so libufs.so \
+	#	libutil.so
+
+	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
+	# this is done to avoid having to touch gcc spec file as it is currently
+	# done on FreeBSD upstream, mostly because their binutils aren't able to
+	# cope with linker scripts yet.
+	# Taken from toolchain-funcs.eclass:
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+	# Clear the symlink.
+	rm -f "${D}/usr/${mylibdir}/libc.so"
+	cat > "${D}/usr/${mylibdir}/libc.so" <<-END_LDSCRIPT
+/* GNU ld script
+   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
+   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
+   this symbol was provided by a shared libc. So we link in
+   libssp_nonshared.a from here.
+ */
+${output_format}
+GROUP ( /${mylibdir}/libc.so.7 /usr/${mylibdir}/libssp_nonshared.a )
+END_LDSCRIPT
+
+	dodir /etc/sandbox.d
+	cat - > "${D}"/etc/sandbox.d/00freebsd <<EOF
+# /dev/crypto is used mostly by OpenSSL on *BSD platforms
+# leave it available as packages might use OpenSSL commands
+# during compile or install phase.
+SANDBOX_PREDICT="/dev/crypto"
+EOF
+
+	# Install a libusb.pc for better compat with Linux's libusb
+	if use usb ; then
+		dodir /usr/$(get_libdir)/pkgconfig
+		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
+	fi
+}
+
+install_includes()
+{
+	local INCLUDEDIR="$1"
+
+	# The idea is to be called from either install or unpack.
+	# During unpack it's required to install them as portage's user.
+	if [[ "${EBUILD_PHASE}" == "install" ]]; then
+		local DESTDIR="${D}"
+		BINOWN="root"
+		BINGRP="wheel"
+	else
+		local DESTDIR="${WORKDIR}"
+		[[ -z "${USER}" ]] && USER="portage"
+		BINOWN="${USER}"
+		[[ -z "${GROUPS}" ]] && GROUPS="portage"
+		BINGRP="${GROUPS}"
+	fi
+
+	# This is for ssp/ssp.h.
+	einfo "Building ssp.h"
+	cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp"
+	$(freebsd_get_bmake) ssp.h || die "problem building ssp.h"
+
+	# Must exist before we use it.
+	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
+	cd "${WORKDIR}/include"
+
+	if [[ $(tc-arch-kernel) == "x86_64" ]]; then
+		local MACHINE="amd64"
+	else
+		local MACHINE="$(tc-arch-kernel)"
+	fi
+
+	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
+	$(freebsd_get_bmake) installincludes \
+		MACHINE=${MACHINE} DESTDIR="${DESTDIR}" \
+		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
+		BINGRP="${BINGRP}" || die "install_includes() failed"
+	einfo "includes installed ok."
+	einfo "Installing ssp includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
+	cd "${WORKDIR}/gnu/lib/libssp"
+	$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
+		MACHINE=${MACHINE} INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
+		BINGRP="${BINGRP}" || die "problem installing ssp includes."
+	einfo "ssp includes installed ok."
+	einfo "Installing librtld_db includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
+	cd "${S}/librtld_db" || die "missing librtld_db"
+	$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
+		MACHINE=${MACHINE} INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
+		BINGRP="${BINGRP}" || die "problem installing librtld_db includes."
+	einfo "librtld_db includes installed ok."
+}
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index f26b66970729..ca432cf34894 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -8,6 +8,7 @@ AUX devd_queue 853 RMD160 e966736ceccecc9b1376695644dc57ab46958194 SHA1 b64f4391
 AUX freebsd-sbin-6.1-pr102701.patch 548 RMD160 ccaac521cdbb9b5449329cf98fc77be340c59cd1 SHA1 a1469860a620a9cdad07e3c22331b68fd95a71f7 SHA256 dccf32386359a2cfd80272c86085467d612c8f4d7924a6a223cd1259a8b7a176
 AUX freebsd-sbin-6.2-ldconfig.patch 389 RMD160 856f6d3479ee927850f84380de6ee4109b41d236 SHA1 8af511190f4005b4a3de5159f86d9c23d8dc52f1 SHA256 b3fd47a733d39dea3400bee180d156ed09ff4c19dd47fbf5df52af33bdc5dc2b
 AUX freebsd-sbin-7.1-zlib.patch 800 RMD160 c0fe2406b5e6d5ab294f66a1c693e171787d2534 SHA1 8f45cf788e44d33af50e7e01b3b3685d17975374 SHA256 18c028bf1b51cf7c57d5517d8fe6f3221c8a4d00d1ae436e40af0d1cd095bc4f
+AUX freebsd-sbin-bsdxml2expat.patch 424 RMD160 a17cdeb5f6b663f369aa9bbf3857c903502f87f4 SHA1 fe5910e8319b2c5a5c623934381b298398370290 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287
 AUX freebsd-sbin-setXid.patch 541 RMD160 003ee4530218c609a4a443d2c2d2c8c05d1f4ae6 SHA1 fdc01c623893d5819d37d2ed47b7272e50172b89 SHA256 2d8158df7af52f9ce15f1513d16ed08ea6244f310aea3f271b12184a6a4c4267
 AUX idmapd.initd 440 RMD160 694ae6deef0d7cac312611e377b89326d02a2198 SHA1 1fd322f37b1dd143cf37049e3742cdcc1d5296d8 SHA256 e89050097731f658825b4a7215023e1c5070f0e31cfdf79eaf299ede9c9f9e39
 AUX ipfw.confd 364 RMD160 3dd11070d6e8936ac5fff02693aeb501255a8019 SHA1 f4dcaee7a10d29c002b95527ff85409ac61f9a89 SHA256 97911a2f003e2108c1f5da04b84a3b73fbccbde48fe58af0f056d8a9effbb3d3
@@ -36,13 +37,14 @@ DIST freebsd-usbin-8.0.tar.bz2 2411151 RMD160 f162437ab2e3c89c6635e5c567e39b6097
 DIST freebsd-usbin-8.2.tar.bz2 2443024 RMD160 972723becd1ab16615bc45f9beab8483533cbf81 SHA1 16bcb5528f14cfeccb9f4c913a629b01d9873ebf SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603
 EBUILD freebsd-sbin-7.2.ebuild 2827 RMD160 7a6ef2dce1cec6328118515130223062a559ed6f SHA1 ca47f09fb4cdbcefa8c61462198684600d8e3ea4 SHA256 471ea50da9c5fc94b2216acc637dbd3b6df718001664c1e7c8933b094025f5b8
 EBUILD freebsd-sbin-8.0.ebuild 2579 RMD160 567c974057bcde703a13e8c6244ff4c66425791d SHA1 6dd32d652690a9c93e42364732883d5be55d2229 SHA256 660894697add00d2a184ac3f8b381965ad3a6485726eecde988d7f1e0e70f30f
+EBUILD freebsd-sbin-8.2-r1.ebuild 2651 RMD160 346426cbcbaaf5ea4ebc32e87c5e5cd0113166cd SHA1 4ee44dda36dea7bd88d033dbe7484030af758ddb SHA256 dd6a81493a4513b65f4e77a3fa74d4df67869d012dd3aaa1e9ce3543e4dbf084
 EBUILD freebsd-sbin-8.2.ebuild 2584 RMD160 4bd12b4fffad1c6eee3d810c93bae55279841a92 SHA1 b55e2cc2a9aae3cf142b32385c3e6f46e32daa48 SHA256 d97635b8e54124c626414b2c38c136cf9af7ce089f52a6be2d1825ce5792bff2
-MISC ChangeLog 12020 RMD160 3d5d7634c360510bdb69df5bf17c2a20e6b6a17f SHA1 6c3337390bbfb96c639a3183f83a667763dbb57b SHA256 be21200e383bc9ba1de2f9af517f3ef316028a90c76a81d49aa05b8e2ee95803
+MISC ChangeLog 12211 RMD160 df728ba11ba0164ccb207ac199f9bdf75995ac43 SHA1 b039a732d49ce20ebac29fd8c815fa484bd8a795 SHA256 3ada91a935b08a101a0876d93dad9300f347a575b1e243578b2b0ac2d4ff6a65
 MISC metadata.xml 473 RMD160 cf0df1d17fe908e9c72520b9a025a5af81a4a219 SHA1 12fede88be52a34d8e079a1a609db210cfa34cbb SHA256 b13f1868fdc53bc53952bb41f6b68a5f320d36c493329ddf1b940f0fd5bafa8e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4T+30ACgkQvFcC4BYPU0rH7gCgkc3sRmTT/fQAVrkysap80oQC
-tQsAn1GVJgD4jUECUgo9QV/0fyUgw7/R
-=M3Ja
+iEYEARECAAYFAk4aEHIACgkQvFcC4BYPU0q0owCfQ7PKCbe/ih4c/OoJB8p0SId5
+o3cAoL1d9+26P/WDY0oJ/Np1KwC+ZZ99
+=S7/5
 -----END PGP SIGNATURE-----