remove unused versions

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

7 files changed, 10 insertions, 1286 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index b4eb6001408d..11b6456d25dc 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.68 2009/05/12 10:29:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.69 2009/05/15 10:40:42 aballier Exp $
+
+  15 May 2009; Alexis Ballier <aballier@gentoo.org> -freebsd-lib-7.1.ebuild,
+  -freebsd-lib-7.1-r1.ebuild, -freebsd-lib-7.1-r2.ebuild:
+  remove unused versions
 
 *freebsd-lib-7.1-r3 (12 May 2009)
 
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r1.ebuild
deleted file mode 100644
index 0a18136e98e4..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r1.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r1.ebuild,v 1.2 2009/01/30 15:30:39 mr_bones_ Exp $
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="7.0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos nis gpib build bootstrap crosscompile_opts_headers-only"
-
-# 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
-		nis? ( mirror://gentoo/${USBIN}.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 )
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*
-		!bootstrap? ( app-arch/bzip2 )"
-
-	PROVIDE="virtual/libc
-		virtual/os-headers"
-
-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
-
-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} NO_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} NO_HESIOD_LIBC= "
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-	use gpib || mymakeopts="${mymakeopts} NO_GPIB= "
-
-	mymakeopts="${mymakeopts} NO_OPENSSH= NO_BIND= NO_SENDMAIL= NO_LIBC_R="
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES="${FILESDIR}/${PN}-bsdxml.patch
-	${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}-new_as.patch
-	${FILESDIR}/${PN}-7.0-CVE-2008-1391.patch"
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - 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
-	libz libbz2 libarchive \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet
-	libedit"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	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}-7.1-strndup_bport.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
-
-	# Apply this patch for Gentoo/FreeBSD/SPARC64 to build correctly
-	# from catalyst, then don't do anything else
-	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
-}
-
-src_compile() {
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC=$(tc-getCC) || die "make include failed"
-
-	use crosscompile_opts_headers-only && return 0
-
-	# Don't use ssp until properly fixed
-	append-flags $(test-flags -fno-stack-protector -fno-stack-protector-all)
-
-	strip-flags
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX
-
-		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
-		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}"
-
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-		cd "${S}/msun"
-		$(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'"
-
-		cd "${S}"
-		NOFLAGSTRIP=yes 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
-
-	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 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 failed"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-	else
-		cd "${S}"
-		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/lib/libpthread.a
-	dosym libthr.so /usr/lib/libpthread.so
-	dosym libthr.a /usr/lib/libc_r.a
-	dosym libthr.so /usr/lib/libc_r.so
-
-	# Add symlink (-> libthr) so previously built binaries still work.
-	dosym libthr.so.3 /lib/libpthread.so.2
-	dosym libthr.so.3 /lib/libc_r.so.6
-
-	# Compatibility symlinks to run FreeBSD 5.x binaries (ABI is mostly
-	# identical, remove when problems will actually happen)
-	dosym /lib/libc.so.7 /usr/lib/libc.so.6
-	dosym /lib/libc.so.6 /usr/lib/libc.so.5
-	dosym /lib/libm.so.4 /usr/lib/libm.so.3
-	dosym /lib/libm.so.5 /usr/lib/libm.so.4
-
-	# 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
-
-	doins "etc.${MACHINE}"/*
-
-	dodir /etc/sandbox.d
-
-	# 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
-	# 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
-
-	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_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
-
-	# 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."
-}
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild
deleted file mode 100644
index d752c144b594..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild,v 1.4 2009/03/12 04:50:37 mr_bones_ Exp $
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="7.0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos nis gpib build bootstrap crosscompile_opts_headers-only"
-
-# 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
-		nis? ( mirror://gentoo/${USBIN}.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 )
-		!sys-freebsd/freebsd-headers
-		dev-libs/libelf"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*
-		!bootstrap? ( app-arch/bzip2 )"
-
-	PROVIDE="virtual/libc
-		virtual/os-headers"
-
-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
-
-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} NO_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} NO_HESIOD_LIBC= "
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-	use gpib || mymakeopts="${mymakeopts} NO_GPIB= "
-
-	mymakeopts="${mymakeopts} NO_OPENSSH= NO_BIND= NO_SENDMAIL= NO_LIBC_R="
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES="${FILESDIR}/${PN}-bsdxml.patch
-	${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}-new_as.patch
-	${FILESDIR}/${PN}-7.0-CVE-2008-1391.patch"
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - 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
-	libz libbz2 libarchive \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet
-	libedit libelf"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	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}-7.1-strndup_bport.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
-
-	# Apply this patch for Gentoo/FreeBSD/SPARC64 to build correctly
-	# from catalyst, then don't do anything else
-	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
-}
-
-src_compile() {
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC=$(tc-getCC) || die "make include failed"
-
-	use crosscompile_opts_headers-only && return 0
-
-	# Don't use ssp until properly fixed
-	append-flags $(test-flags -fno-stack-protector -fno-stack-protector-all)
-
-	strip-flags
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX
-
-		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
-		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}"
-
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-		cd "${S}/msun"
-		$(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'"
-
-		cd "${S}"
-		NOFLAGSTRIP=yes 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
-
-	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 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 failed"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-	else
-		cd "${S}"
-		# Set SHLIBDIR and LIBDIR for multilib
-		SHLIBDIR="/$(get_libdir)" LIBDIR="/usr/$(get_libdir)" 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/$(get_libdir)/libpthread.a
-	dosym libthr.so /usr/$(get_libdir)/libpthread.so
-	dosym libthr.a /usr/$(get_libdir)/libc_r.a
-	dosym libthr.so /usr/$(get_libdir)/libc_r.so
-
-	# Add symlink (-> libthr) so previously built binaries still work.
-	dosym libthr.so.3 /$(get_libdir)/libpthread.so.2
-	dosym libthr.so.3 /$(get_libdir)/libc_r.so.6
-
-	# Compatibility symlinks to run FreeBSD 5.x binaries (ABI is mostly
-	# identical, remove when problems will actually happen)
-	dosym /lib/libc.so.7 /usr/$(get_libdir)/libc.so.6
-	dosym /lib/libc.so.6 /usr/$(get_libdir)/libc.so.5
-	dosym /lib/libm.so.4 /usr/$(get_libdir)/libm.so.3
-	dosym /lib/libm.so.5 /usr/$(get_libdir)/libm.so.4
-
-	# 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
-	# 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
-
-	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_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
-
-	# 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."
-}
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-7.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-7.1.ebuild
deleted file mode 100644
index d3ae42006738..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-7.1.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-7.1.ebuild,v 1.2 2009/01/23 02:17:58 mr_bones_ Exp $
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="7.0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos nis gpib build bootstrap crosscompile_opts_headers-only"
-
-# 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
-		nis? ( mirror://gentoo/${USBIN}.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 )
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*
-		!bootstrap? ( app-arch/bzip2 )"
-
-	PROVIDE="virtual/libc
-		virtual/os-headers"
-
-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
-
-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} NO_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} NO_HESIOD_LIBC= "
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-	use gpib || mymakeopts="${mymakeopts} NO_GPIB= "
-
-	mymakeopts="${mymakeopts} NO_OPENSSH= NO_BIND= NO_SENDMAIL= NO_LIBC_R="
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES="${FILESDIR}/${PN}-bsdxml.patch
-	${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}-new_as.patch
-	${FILESDIR}/${PN}-7.0-CVE-2008-1391.patch"
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - 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
-	libz libbz2 libarchive \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet
-	libedit"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	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
-
-	# 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
-
-	# Apply this patch for Gentoo/FreeBSD/SPARC64 to build correctly
-	# from catalyst, then don't do anything else
-	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."
-
-	use bootstrap && dummy_mk libstand
-}
-
-src_compile() {
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC=$(tc-getCC) || die "make include failed"
-
-	use crosscompile_opts_headers-only && return 0
-
-	# Don't use ssp until properly fixed
-	append-flags $(test-flags -fno-stack-protector -fno-stack-protector-all)
-
-	strip-flags
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX
-
-		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
-		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}"
-
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-		cd "${S}/msun"
-		$(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'"
-
-		cd "${S}"
-		NOFLAGSTRIP=yes 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
-
-	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 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 failed"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-	else
-		cd "${S}"
-		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/lib/libpthread.a
-	dosym libthr.so /usr/lib/libpthread.so
-	dosym libthr.a /usr/lib/libc_r.a
-	dosym libthr.so /usr/lib/libc_r.so
-
-	# Add symlink (-> libthr) so previously built binaries still work.
-	dosym libthr.so.3 /lib/libpthread.so.2
-	dosym libthr.so.3 /lib/libc_r.so.6
-
-	# Compatibility symlinks to run FreeBSD 5.x binaries (ABI is mostly
-	# identical, remove when problems will actually happen)
-	dosym /lib/libc.so.7 /usr/lib/libc.so.6
-	dosym /lib/libc.so.6 /usr/lib/libc.so.5
-	dosym /lib/libm.so.4 /usr/lib/libm.so.3
-	dosym /lib/libm.so.5 /usr/lib/libm.so.4
-
-	# 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
-
-	doins "etc.${MACHINE}"/*
-
-	dodir /etc/sandbox.d
-
-	# 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
-	# 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
-
-	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_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
-
-	# 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."
-}
diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index e49e0a59212b..d83097a7fbc0 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.46 2009/05/12 09:05:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.47 2009/05/15 10:42:20 aballier Exp $
+
+  15 May 2009; Alexis Ballier <aballier@gentoo.org>
+  -freebsd-sources-6.2-r4.ebuild, -freebsd-sources-7.1.ebuild:
+  remove unused versions
 
 *freebsd-sources-7.1-r1 (12 May 2009)
 
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.2-r4.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.2-r4.ebuild
deleted file mode 100644
index 627cc0e79b7b..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.2-r4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.2-r4.ebuild,v 1.1 2008/05/17 19:54:27 aballier Exp $
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	epatch "${FILESDIR}/${PN}-6.0-asm.patch"
-	epatch "${FILESDIR}/${PN}-6.0-werror.patch"
-	epatch "${FILESDIR}/${PN}-6.2-gcc41.patch"
-	epatch "${FILESDIR}/${PN}-6.2-sparc64.patch"
-	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
-	epatch "${FILESDIR}/${PN}-6.2-debug-O2.patch"
-	epatch "${FILESDIR}/${PN}-6.2-dl_iterate_phdr.patch"
-	epatch "${FILESDIR}/${PN}-6.2-posix-monotonic-clock.patch"
-
-	# Errata patches
-	epatch "${FILESDIR}/${P}-EN-07:02.net.patch"
-	epatch "${FILESDIR}/${P}-unp_gc.patch"
-
-	# http://security.freebsd.org/advisories/FreeBSD-SA-07:03.ipv6.asc
-	epatch "${FILESDIR}/${P}-ipv6.patch"
-
-	# http://security.freebsd.org/advisories/FreeBSD-SA-07:09.random.asc
-	epatch "${FILESDIR}/${P}-random.patch"
-
-	# http://security.freebsd.org/advisories/FreeBSD-SA-08:03.sendfile.asc
-	epatch "${FILESDIR}/${P}-sendfile.patch"
-
-	# Disable SSP for the kernel
-	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
-		"s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g"
-}
-
-src_compile() {
-	einfo "Nothing to compile.."
-}
-
-src_install() {
-	insinto "/usr/src/sys-${MY_PVR}"
-	doins -r "${S}/"*
-}
-
-pkg_postinst() {
-	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		# just in case...
-		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
-		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't remove previous symlinks, please fix manually."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	fi
-
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
-}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-7.1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-7.1.ebuild
deleted file mode 100644
index e1f06ee4f88c..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-7.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-7.1.ebuild,v 1.1 2009/01/22 21:05:47 the_paya Exp $
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=">=sys-freebsd/freebsd-mk-defs-7.0"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 7.0-RELEASE it's 700003.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=700004:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	epatch "${FILESDIR}/${PN}-7.0-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	epatch "${FILESDIR}/${PN}-7.1-asm.patch"
-	epatch "${FILESDIR}/${PN}-7.0-werror.patch"
-	epatch "${FILESDIR}/${PN}-7.1-sparc64.patch"
-	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
-	epatch "${FILESDIR}/${PN}-6.2-debug-O2.patch"
-	epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	epatch "${FILESDIR}/${PN}-7.1-subnet-route-pr40133.patch"
-
-	# http://security.freebsd.org/advisories/FreeBSD-SA-07:03.ipv6.asc
-	# Why did the 6.2 patch apply almoast cleanly on 7.0?
-	# Because the code was suppressed.
-	#epatch "${FILESDIR}/${PN}-7.0-ipv6.patch"
-
-	# Disable SSP for the kernel
-	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
-		"s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g"
-
-	# By adding -DGENTOO_LIVECD to CFLAGS activate this stub
-	# vop_whiteout to tmpfs, so it can be used as an overlay
-	# unionfs filesystem over the cd9660 readonly filesystem.
-	epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
-
-	# See http://sourceware.org/bugzilla/show_bug.cgi?id=5391
-	# ld doesn't provide symbols constructed as the __start_set_(s) ones
-	# are on FreeBSD modules.
-	# This patch adds code to generate a list of these and adds them
-	# as undefined references to ld's commandline to get them.
-	# Without this kernel modules will not load.
-	epatch "${FILESDIR}/${PN}-7.1-binutils_link.patch"
-}
-
-src_compile() {
-	einfo "Nothing to compile.."
-}
-
-src_install() {
-	insinto "/usr/src/sys-${MY_PVR}"
-	doins -r "${S}/"*
-}
-
-pkg_postinst() {
-	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		# just in case...
-		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
-		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't remove previous symlinks, please fix manually."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	fi
-
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
-}