Build and install ldd32 with USE=multilib so that we can ldd 32bits executables.

Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 190 insertions, 6 deletions

diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index 4c69b8da8df5..8e36b4d59e18 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.86 2013/01/27 22:39:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.87 2013/06/18 18:19:57 aballier Exp $
+
+*freebsd-ubin-9.1-r1 (18 Jun 2013)
+
+  18 Jun 2013; Alexis Ballier <aballier@gentoo.org>
+  +freebsd-ubin-9.1-r1.ebuild:
+  Build and install ldd32 with USE=multilib so that we can ldd 32bits
+  executables.
 
   27 Jan 2013; Alexis Ballier <aballier@gentoo.org> freebsd-ubin-9.1.ebuild,
   +files/freebsd-ubin-9.1-ar-libarchive3.patch:
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index f103ce404767..0f73b0a18928 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -67,13 +67,14 @@ EBUILD freebsd-ubin-8.0.ebuild 4483 SHA256 f3cfb44634cea441415d082747fb3fdd60518
 EBUILD freebsd-ubin-8.2-r1.ebuild 4645 SHA256 aab17d095a0dfde25111ecceb6486e74d4ee71c0288d68b17f4b38f2019ec257 SHA512 6c28bec854a0e11e95664d2f57367a6e252920733f146832af4cf95674b4c8c34426dbaeeac1b87234da4ab1dc67b4d5bdc8b91c5c9787b03d6b6981f28efc43 WHIRLPOOL 95cf5e8a7342cbb216958898a7900087ae455bdd8ee9f58b7a0563b512cf7104b595b29211fe63d09ee4f60d0f324fa058a245f0f211ae66261caa5ec90e7dfb
 EBUILD freebsd-ubin-9.0-r1.ebuild 4730 SHA256 4891e1b52963fd316b9f0a85f9744f9b3a4e1bc31dadad1e8b82a86396219935 SHA512 4dc01e77598030d5fb79e672f49f9f383a791c2ec6962b931023965a0833b7e89f3d6664fcf277f1094beaf1ff3909de8a658cd927916dbc33d6a1b166d89fa9 WHIRLPOOL 7cd1609ddec984c3c05309a684fd09d4bd499a65761ada52ca4b68b3290ff7124d46f55b701da4845633f50dc0c7f2e49ba24f566f8047650cbb15b1324dfc3a
 EBUILD freebsd-ubin-9.0.ebuild 4731 SHA256 410bf07e107e5aa0aa10266e94cd561947fa20b18943f0e814d291b4a8e9c1a6 SHA512 d12d28116abfc3fd575a1286d6c19fd8031f2c58b48aeabe83635471cb2ce75af43d34372804a56ceeee7776fdace0d663728b82ba7f7d7526a78ef4073a641f WHIRLPOOL c76a7bd9b00b1d369c1f27d33ef6866be6eaa75398c5df0a7ece4ccce7fc52deeaa353fb9c3ede8ac2cb676f7e9a8d2ade1a2e94b0b2fb97ad3b630b0e764ef9
+EBUILD freebsd-ubin-9.1-r1.ebuild 5389 SHA256 318656d562ba843fa1975d257fcb7c61c7ffb3c87966f6e9b8845ec90f73adab SHA512 a3b4b917261932c76d462e2183a1156728ee9854f12f6c8354e9554d95fe7f27669ff26f075d6a0d80283b9cb6c839fd3e8911bdb2b144e56515789170aab5da WHIRLPOOL 06cb74d17f2758342c789f65fdf6e1d773712f17783b0cfb988dfefc6a130e4b0486588d939d763b32fda27bfec9261781f56fab3b6dca1ed2c8562cfdfbfc2e
 EBUILD freebsd-ubin-9.1.ebuild 4853 SHA256 d70be49466c3e7eb27330df6a82f0ff2f7959f6941043d34af96c6d301e98678 SHA512 b6949097562c6b9fbe85d72d99f7ba4018387237a213b56a083328275570ee4e75bc8bf049c772ff668b2e074ae55168bd709e7aba759e26baee3a95008dadc0 WHIRLPOOL c7d7791ef272552b8622478b38e7e3111480349414d52e8f2431654cc2af3aaa059cc8e399994d91d12c9532453ac13cebd70a9d9eed0c26fbd92da0fdfd3d2c
-MISC ChangeLog 17878 SHA256 295a2c326a648dae9ee150a79a548113213ceb19f74d1e732014d4a00f033377 SHA512 2e3fdfd4ff2257672b71b297f64c7c35b4d97a81e4d8f8d9299f0361621c685d2dd00be410f72949525b5d4fd6998505febe244f8ed2af1150d51037ba3342ba WHIRLPOOL 207129005518ae9252a38b07bc3c217d45c4973a548f76d27d7b5b5ec7a7c71e3ca70ae0a4adb748b76583dc5198bcdc34a009c661c6eab977ff3f2cac3eb060
+MISC ChangeLog 18083 SHA256 d5782a3a072f79071ea963e2b0f646c2aeec5c666fb27ea9e7b506aa58695a55 SHA512 4c3aaf637f8b75aa9a06501fa93f0952925fe6ffb4f1e49342634784d05e78d7079540f4c7e7b38b5c638dbf80cb9b80e88845eb0c6bb48e2fa0cf29644dec4f WHIRLPOOL 2cc29ef4ed7daa66b919a85f62f957377d4b002063d626aa0692cc5d0b6fbb627da73d8687952abe98799b894498aa25b65dac5f604acb812f28ed497e29b1a9
 MISC metadata.xml 692 SHA256 9d7a61c414fb50713568dc2782c2de6460bac1eff7ca6a9f8a2d25979b48e811 SHA512 8bc469bb79edb0c34e5fb03f4a53c12b0f3741f06a20e1fc1b58772e594f259cc91368157ced396f8843b6e4398bffd1e5b5b8c694d5bec324e89966e4e618d6 WHIRLPOOL 026491842e88460c5fb80acdf7b26e274c74c6d0ced8c23e16382b82a9b99d9657b96a5ecbca2d95ecd0dfef463dfa012f7aeb3acd8e655df859ab6aada0d312
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlEFrKYACgkQvFcC4BYPU0r6pgCgjEpXdPXNILNhUyy3VnSHcaYD
-QEwAnA1l3GBs2ReX7Co2QqaXzHgERQ8q
-=rsoX
+iEYEAREIAAYFAlHApM4ACgkQvFcC4BYPU0qLzwCfRsiQCHqNZ0HTryXbI+FiLoSJ
+musAn1aaCpfQtuubGp9F/JlHd9RgU6di
+=3k8F
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r1.ebuild
new file mode 100644
index 000000000000..4112c7763004
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r1.ebuild,v 1.1 2013/06/18 18:19:57 aballier Exp $
+
+EAPI=5
+
+inherit bsdmk freebsd flag-o-matic pam multilib multibuild
+
+DESCRIPTION="FreeBSD's base system source for /usr/bin"
+SLOT="0"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="ar atm audit bluetooth ipv6 kerberos multilib netware nis ssl usb build zfs"
+LICENSE="BSD zfs? ( CDDL )"
+
+SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		mirror://gentoo/${BIN}.tar.bz2
+		mirror://gentoo/${INCLUDE}.tar.bz2
+		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )
+		build? ( mirror://gentoo/${SYS}.tar.bz2 )"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?]
+	>=sys-freebsd/freebsd-lib-9.1-r7[multilib?]
+	ssl? ( dev-libs/openssl )
+	kerberos? ( virtual/krb5 )
+	ar? ( >=app-arch/libarchive-3 )
+	virtual/pam
+	sys-libs/zlib
+	>=sys-libs/ncurses-5.9
+	!sys-process/fuser-bsd
+	!dev-util/csup"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+RDEPEND="${RDEPEND}
+	>=sys-auth/pambase-20080219.1
+	sys-process/cronbase"
+
+S="${WORKDIR}/usr.bin"
+
+PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
+	"${FILESDIR}/${PN}-9.0-fixmakefiles.patch"
+	"${FILESDIR}/${PN}-setXid.patch"
+	"${FILESDIR}/${PN}-lint-stdarg.patch"
+	"${FILESDIR}/${PN}-9.1-kdump-ioctl.patch"
+	"${FILESDIR}/${PN}-8.0-xinstall.patch"
+	"${FILESDIR}/${PN}-9.1-bsdar.patch"
+	"${FILESDIR}/${PN}-9.1-minigzip.patch"
+	"${FILESDIR}/${PN}-9.1-grep.patch"
+	"${FILESDIR}/${PN}-9.1-ar-libarchive3.patch" )
+
+# Here we remove some sources we don't need because they are already
+# provided by portage's packages or similar. In order:
+# - Archiving tools, provided by their own ebuilds
+# - ncurses stuff
+# - less stuff
+# - bind utils
+# - rsh stuff
+# - binutils gprof
+# - dc stuff
+# and the rest are misc utils we already provide somewhere else.
+REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
+	gzip gprof
+	lzmainfo xz xzdec
+	unzip
+	tput tset tabs
+	less lessecho lesskey
+	dig hesinfo nslookup nsupdate host
+	rsh rlogin rusers rwho ruptime
+	compile_et lex vi smbutil file vacation nc ftp telnet
+	c99 c89
+	bc dc
+	whois tftp man"
+
+MULTIBUILD_VARIANTS=( $(get_all_abis) )
+
+pkg_setup() {
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
+	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
+	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
+	mymakeopts="${mymakeopts} WITHOUT_CLANG= "
+}
+
+pkg_preinst() {
+	# bison installs a /usr/bin/yacc symlink ...
+	# we need to remove it to avoid triggering
+	# collision-protect errors
+	if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
+		rm -f "${ROOT}"/usr/bin/yacc
+	fi
+}
+
+src_prepare() {
+	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+
+	# Rename manpage for renamed cmp
+	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
+	# Rename manpage for renamed ar
+	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
+	# Fix whereis(1) manpath search.
+	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
+
+	# Build a dynamic make
+	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die
+
+	# Disable it here otherwise our patch wont apply
+	use ar || dummy_mk ar
+}
+
+setup_multilib_vars() {
+	if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		cd "${WORKDIR}/usr.bin/ldd" || die
+		export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
+	else
+		cd "${S}"
+	fi
+	"$@"
+}
+
+src_compile() {
+	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
+
+	# baselayout requires these in /bin
+	dodir /bin
+	for bin in sed printf fuser; do
+		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
+		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
+	done
+
+	for pamdfile in login passwd su; do
+		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
+	done
+
+	cd "${WORKDIR}/etc"
+	insinto /etc
+	doins remote phones opieaccess fbtab || die
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
+
+	# tip requires /var/spool/lock/, bug #200700
+	keepdir /var/spool/lock
+}
+
+pkg_postinst() {
+	# We need to ensure that login.conf.db is up-to-date.
+	if [[ -e "${ROOT}"etc/login.conf ]] ; then
+		einfo "Updating ${ROOT}etc/login.conf.db"
+		"${ROOT}"usr/bin/cap_mkdb	-f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf
+		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
+	fi
+}
+
+pkg_postrm() {
+	# and if we uninstall yacc but keep bison,
+	# lets restore the /usr/bin/yacc symlink
+	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
+		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
+	fi
+}