Add new revision that does not build libedit anymore.

(Portage version: 2.1.2_rc4-r1)

3 files changed, 285 insertions, 1 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index dec189a41d5a..611958d46f63 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.43 2006/11/22 12:52:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.44 2006/12/28 16:27:37 flameeyes Exp $
+
+*freebsd-lib-6.2_rc1-r1 (28 Dec 2006)
+
+  28 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +freebsd-lib-6.2_rc1-r1.ebuild:
+  Add new revision that does not build libedit anymore.
 
   22 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   -files/freebsd-lib-fixmp.patch, freebsd-lib-6.1.ebuild,
diff --git a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.2_rc1-r1 b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.2_rc1-r1
new file mode 100644
index 000000000000..4251478d4f8e
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.2_rc1-r1
@@ -0,0 +1,24 @@
+MD5 f92c93808d6d9c597483355b7866ad6a freebsd-contrib-6.2_rc1.tar.bz2 36554713
+RMD160 e8a915fff9a2210bba5bfa33f1618b74f8f4317d freebsd-contrib-6.2_rc1.tar.bz2 36554713
+SHA256 93748e95efc4d09f70225b58855e167ec21cae610c4ba2a1d7b2c5f84aa4f661 freebsd-contrib-6.2_rc1.tar.bz2 36554713
+MD5 a6dd2ede6a7bd409b975b8dbb5a534c1 freebsd-crypto-6.2_rc1.tar.bz2 4005417
+RMD160 36d7aafb83f1aa589c6542dbfdda4256e7711765 freebsd-crypto-6.2_rc1.tar.bz2 4005417
+SHA256 95d6db3f6c75bfda5c07d1fe8408fec02a889d5fbe8c12bfcf16f654f3034ca5 freebsd-crypto-6.2_rc1.tar.bz2 4005417
+MD5 5fabc595641b5c79039bdb84450441a3 freebsd-etc-6.2_rc1.tar.bz2 189434
+RMD160 e85ff64ac4e8be8a324f5c9cf101b4e1e92cba86 freebsd-etc-6.2_rc1.tar.bz2 189434
+SHA256 1b46600bdc65fb58f406bdd95145a66e1412c17fa9e2d082a8d29f578a62ea32 freebsd-etc-6.2_rc1.tar.bz2 189434
+MD5 bffff6b57f766241eb42463a023b70b3 freebsd-include-6.2_rc1.tar.bz2 131628
+RMD160 febc259c9865a0ac80bfab6d9752ba93f76dc728 freebsd-include-6.2_rc1.tar.bz2 131628
+SHA256 79b364be23e63f2427db15e240d35cd023299f8ac89b3c4b4f2b85ffb2ef994e freebsd-include-6.2_rc1.tar.bz2 131628
+MD5 da12553353b5d1c57b7e9e4ad879bdcd freebsd-lib-6.2_rc1.tar.bz2 2669033
+RMD160 4faa7e29fbc0ee9b1e086a4bbafc42ecd6de597a freebsd-lib-6.2_rc1.tar.bz2 2669033
+SHA256 518154f455e0edf665796fde2801d35f50af24ca525d0dd9d4a78a79471fd1dc freebsd-lib-6.2_rc1.tar.bz2 2669033
+MD5 42674aaaf251db6d5d60a3ed28ee25d4 freebsd-libexec-6.2_rc1.tar.bz2 277165
+RMD160 179d580514beacb3143146a2042defb7f10f96ec freebsd-libexec-6.2_rc1.tar.bz2 277165
+SHA256 64525efd5eb6ffe9c83de697b8b362a08e66021731ae6474e97d452285764d66 freebsd-libexec-6.2_rc1.tar.bz2 277165
+MD5 636d5f883c2937a4674d9251aae46fc3 freebsd-sys-6.2_rc1.tar.bz2 18345039
+RMD160 15e70cb9169bf813fdd862389f8cafc45327d41e freebsd-sys-6.2_rc1.tar.bz2 18345039
+SHA256 209c27b25d72f59f93819a38b57aa7f1153c6c9abab62402e0935f2521dae99c freebsd-sys-6.2_rc1.tar.bz2 18345039
+MD5 42475c00e1508a3974d89497dcf42166 freebsd-usbin-6.2_rc1.tar.bz2 2695796
+RMD160 ccc84a6676a617287491204d95a68c8571b504aa freebsd-usbin-6.2_rc1.tar.bz2 2695796
+SHA256 295906f4e1dea16c4e7d290f9c55320dbd52f65f841f8b8f978a26e7f1c5f728 freebsd-usbin-6.2_rc1.tar.bz2 2695796
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.2_rc1-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.2_rc1-r1.ebuild
new file mode 100644
index 000000000000..2ed5087faf81
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.2_rc1-r1.ebuild
@@ -0,0 +1,254 @@
+# 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.2_rc1-r1.ebuild,v 1.1 2006/12/28 16:27:37 flameeyes Exp $
+
+inherit bsdmk freebsd flag-o-matic toolchain-funcs
+
+DESCRIPTION="FreeBSD's base system libraries"
+SLOT="6.0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="atm bluetooth ssl ipv6 kerberos nis gpib build bootstrap"
+
+# 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 )
+		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} && ${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}-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
+	${FILESDIR}/${PN}-6.1-csu.patch
+	${FILESDIR}/${PN}-6.2-gcc41.patch
+	${FILESDIR}/${PN}-6.2-sparc64.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 libedit \
+	libz libbz2 libarchive \
+	libsm libsmdb libsmutil \
+	libbegemot libbsnmp \
+	libsmb libpam libpcap bind libwrap libmagic \
+	libcom_err libtelnet"
+
+src_unpack() {
+	freebsd_src_unpack
+
+	sed -i -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
+
+	use build && return 0
+
+	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"
+
+	# Let arch-specific includes to be found
+	local machine
+	machine=$(tc-arch-kernel ${CTARGET})
+	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine"
+
+	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 "-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
+		# 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 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
+	[[ ${CTARGET} != ${CHOST} ]] && return 0
+
+	# Compatibility symlinks to run FreeBSD 5.x binaries (ABI is mostly
+	# identical, remove when problems will actually happen)
+	dosym /lib/libc.so.6 /usr/lib/libc.so.5
+	dosym /lib/libm.so.4 /usr/lib/libm.so.3
+
+	# 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)"/*
+
+	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
+}
+