Update to 6.1_rc2.

(Portage version: 2.1_pre10-r2)

3 files changed, 254 insertions, 1 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 4c0da333c008..5064817bf736 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.13 2006/04/30 21:37:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.14 2006/05/02 21:53:57 flameeyes Exp $
+
+*freebsd-lib-6.1_rc2 (02 May 2006)
+
+  02 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-lib-6.1_rc1.ebuild, +freebsd-lib-6.1_rc2.ebuild:
+  Update to 6.1_rc2.
 
 *freebsd-lib-6.1_rc1 (30 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1_rc2 b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1_rc2
new file mode 100644
index 000000000000..ed4a42c7dde5
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1_rc2
@@ -0,0 +1,24 @@
+MD5 4cbed5dff2de056bb603b9c1acb643a9 freebsd-contrib-6.1_rc2.tar.bz2 36015082
+RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 freebsd-contrib-6.1_rc2.tar.bz2 36015082
+SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 freebsd-contrib-6.1_rc2.tar.bz2 36015082
+MD5 3e1f822e176993896d5d732f22c91043 freebsd-crypto-6.1_rc2.tar.bz2 3978366
+RMD160 ea43846793f4fda0fd6861bebb4a816cc838d5f3 freebsd-crypto-6.1_rc2.tar.bz2 3978366
+SHA256 fdc16e035efc422894c40a95d134d7fc68b3904c0b512ec62d8ab2c8a9caf468 freebsd-crypto-6.1_rc2.tar.bz2 3978366
+MD5 1d2d7469eb731dcff01781fb757ad6ef freebsd-etc-6.1_rc2.tar.bz2 183869
+RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 freebsd-etc-6.1_rc2.tar.bz2 183869
+SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be freebsd-etc-6.1_rc2.tar.bz2 183869
+MD5 c892941f5dbdca8bf5f3e702802c0d3b freebsd-include-6.1_rc2.tar.bz2 127237
+RMD160 4235464be16e87e2f05022fe7024ee77f2afc3ae freebsd-include-6.1_rc2.tar.bz2 127237
+SHA256 5d346a1410f3daa2bbe2c2a4a158f7e0abf52f696b33ea332b2ad7c6aa14f730 freebsd-include-6.1_rc2.tar.bz2 127237
+MD5 0b01eb3e71750e54a6e1ae346a15311a freebsd-lib-6.1_rc2.tar.bz2 2613579
+RMD160 ed3f9dc5afe9896ee685934978f888c816562574 freebsd-lib-6.1_rc2.tar.bz2 2613579
+SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 freebsd-lib-6.1_rc2.tar.bz2 2613579
+MD5 24f9fb6752c6800db5a98da9c4bb19c9 freebsd-libexec-6.1_rc2.tar.bz2 277785
+RMD160 7e6c035b414287241d22a48e809aae8a243bff38 freebsd-libexec-6.1_rc2.tar.bz2 277785
+SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 freebsd-libexec-6.1_rc2.tar.bz2 277785
+MD5 232a881d16f64a526796fcd6a054c495 freebsd-sys-6.1_rc2.tar.bz2 17197678
+RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f freebsd-sys-6.1_rc2.tar.bz2 17197678
+SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 freebsd-sys-6.1_rc2.tar.bz2 17197678
+MD5 f2c82f1d20cb8b9eae56c129b0b78549 freebsd-usbin-6.1_rc2.tar.bz2 2663193
+RMD160 f183a024fcbce51156330410ba08bae2aeae055f freebsd-usbin-6.1_rc2.tar.bz2 2663193
+SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 freebsd-usbin-6.1_rc2.tar.bz2 2663193
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.1_rc2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.1_rc2.ebuild
new file mode 100644
index 000000000000..e2c44aa818ae
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.1_rc2.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.1_rc2.ebuild,v 1.1 2006/05/02 21:53:57 flameeyes Exp $
+
+inherit bsdmk freebsd flag-o-matic toolchain-funcs
+
+DESCRIPTION="FreeBSD's base system libraries"
+SLOT="6.0"
+KEYWORDS="~x86-fbsd"
+
+IUSE="atm bluetooth ssl ipv6 kerberos nis gpib"
+
+# 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 )
+		!kernel_FreeBSD? (
+			mirror://gentoo/${SYS}.tar.bz2 )"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	kerberos? ( virtual/krb5 )
+	!sys-freebsd/freebsd-headers"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.31-r2
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-sources-${RV}*"
+
+if [[ ${CATEGORY/cross-} == {CATEGORY} ]]; then
+	PROVIDE="virtual/libc
+		virtual/os-headers"
+fi
+
+S="${WORKDIR}/lib"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} && ${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 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= "
+
+	replace-flags "-O?" -"O1"
+
+	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}-fixmp.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.0-binutils-asm.patch
+	${FILESDIR}/${PN}-6.0-ssp.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="libncurses libform libmenu libpanel \
+	libz libbz2 libarchive \
+	libsm libsmdb libsmutil \
+	libbegemot libbsnmp \
+	libsmb libpam libpcap bind libwrap libmagic \
+	libcom_err libtelnet"
+
+src_unpack() {
+	freebsd_src_unpack
+
+	if [[ ${CTARGET} == ${CHOST} ]]; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+	else
+		sed -i -e 's:/usr/include:/usr/'${CTARGET}'/usr/include:g' \
+			"${S}/libc/"{yp,rpc}"/Makefile.inc"
+	fi
+
+	[[ -n $(install --version 2> /dev/null | grep GNU) ]] && \
+		sed -i -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
+
+	sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc
+}
+
+src_compile() {
+	cd "${WORKDIR}/include"
+	$(freebsd_get_bmake) CC=$(tc-getCC) || die "make include failed"
+
+	use _E_CROSS_HEADERS_ONLY && return 0
+
+	# Don't use ssp until properly fixed
+	append-flags -fno-stack-protector -fno-stack-protector-all
+
+	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 "-B ${csudir}"
+		append-ldflags "-B ${csudir}"
+		cd "${S}/libc"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
+
+		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
+		cd "${S}/msun"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
+	else
+		strip-flags
+		# Forces to use the local copy of headers as they might be outdated in
+		# the system
+		append-flags "-isystem '${WORKDIR}/sys' -isystem '${WORKDIR}/include'"
+
+		cd "${S}"
+		NOFLAGSTRIP=yes freebsd_src_compile
+	fi
+}
+
+src_install() {
+	cd "${WORKDIR}/include"
+
+	[[ ${CTARGET} == ${CHOST} ]] \
+		&& INCLUDEDIR="/usr/include" \
+		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
+
+	einfo "Installing for ${CTARGET} in ${CHOST}.."
+
+	dodir "${INCLUDEDIR}"
+	$(freebsd_get_bmake) installincludes \
+		MACHINE=$(tc-arch-kernel) \
+		DESTDIR="${D}" INCLUDEDIR="${INCLUDEDIR}" || die "Install failed"
+
+	# 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 _E_CROSS_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" || 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
+	[[ ${CTARGET} != ${CHOST} ]] && return 0
+
+	# 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.$(tc-arch-kernel)"/*
+}
+