remove tabs that is provided by ncurses, bug #360569 by Yuta SATOH

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

3 files changed, 160 insertions, 7 deletions

diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index 3c2baa7c8518..ef8aa22d9d5e 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.66 2010/03/24 11:04:55 the_paya Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.67 2011/07/05 16:17:23 aballier Exp $
+
+*freebsd-ubin-8.0-r1 (05 Jul 2011)
+
+  05 Jul 2011; Alexis Ballier <aballier@gentoo.org>
+  +freebsd-ubin-8.0-r1.ebuild:
+  remove tabs that is provided by ncurses, bug #360569 by Yuta SATOH
 
   24 Mar 2010; Javier Villavicencio <the_paya@gentoo.org>
   freebsd-ubin-8.0.ebuild, +files/freebsd-ubin-8.0-xinstall.patch:
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index d368085db438..ba976f164a81 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -31,13 +31,14 @@ DIST freebsd-sys-8.0.tar.bz2 22552771 RMD160 08f5b09dc0b4353658a309e9e1198dbab1f
 DIST freebsd-ubin-7.2.tar.bz2 1851174 RMD160 b56cdc06fe0ce1ea47762a75c33ed9ed6d1abfde SHA1 1739eceebc41d9a4cbf10d21ef4e8d55b586f640 SHA256 5ca9f185a5af59993ddf83ece155bfcea1340a93d2540035b35c5acbfc3a2625
 DIST freebsd-ubin-8.0.tar.bz2 1787358 RMD160 08814da95905ba2cd6037c41507eade30b007e72 SHA1 0de52ddd7522b73c876ed967ac96aa278260f5b6 SHA256 2bd1529107e3b70df64bc4d7d3117122cac03b49b874a6653860b13d567af250
 EBUILD freebsd-ubin-7.2.ebuild 4077 RMD160 25eb82e31f1729aa79c2b7239216d8fb95f9ff42 SHA1 59d7de0659bf7f2eb4b9712866c8679e775a0d21 SHA256 0b3b36c131dbb747ee296bcb5e18f6b83fee0d711e2e72df34ab725c11726a85
+EBUILD freebsd-ubin-8.0-r1.ebuild 4491 RMD160 95f736b2966af7d64415c65d213e07f3604259c5 SHA1 32f041d58f410d987d15c0fdbc2e3ce64920eded SHA256 57bca884c6620659e46fdcba0b4250cbf9bea71d048fa1bb77c8efbad7bf298a
 EBUILD freebsd-ubin-8.0.ebuild 4483 RMD160 12ea9a487b4f004964eebc6ded77b5d4a0411630 SHA1 402133c557deeb1f35f7d1aaef31479521b3327b SHA256 f3cfb44634cea441415d082747fb3fdd60518d20db0beb7ee5bd6884cb96bac8
-MISC ChangeLog 14884 RMD160 0c6def5b3ed1d85d09dea5c0c2e91925eb3df4e7 SHA1 ec3df945034c72c0a24717de7107b1c2d70cf0db SHA256 fb698073ab31759771cbae28b529065b72bb72bb9073cd263721064e7f7ed5fb
+MISC ChangeLog 15073 RMD160 c1eaefa1e34ce4d03e0d5b93239ad4d5a3264041 SHA1 22226bbdfc4d3735d118c9c5f3915f1b0cf44857 SHA256 a41fda8f0e2c642cb41c3dc2509d827daf6dab0ace49d19508262f281bdea4e6
 MISC metadata.xml 692 RMD160 ecb15a5894b6f31b822951faf3f2ce8270620f7f SHA1 b54ed38724e56583dcd435d2776fd33e0141b963 SHA256 9d7a61c414fb50713568dc2782c2de6460bac1eff7ca6a9f8a2d25979b48e811
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (FreeBSD)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkup8t4ACgkQgvV6MZSadQrpMACdGF3p3noQSzXlKwqRp7ijNuPP
-4g8AoOO6izLp/BjAImdj0QRkE1k2B1aR
-=LTg5
+iEYEARECAAYFAk4TORsACgkQvFcC4BYPU0qAoQCeJMsFpT0W9tu2lOvJ/kqQOIF2
+PAwAn2iWyfiexG6Mktoq+kOhuBQfPqGb
+=PGPU
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-8.0-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-8.0-r1.ebuild
new file mode 100644
index 000000000000..c188dda8cbf0
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-8.0-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-8.0-r1.ebuild,v 1.1 2011/07/05 16:17:23 aballier Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic pam
+
+DESCRIPTION="FreeBSD's base system source for /usr/bin"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+IUSE="ar atm audit bluetooth ipv6 kerberos 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?]
+	ssl? ( dev-libs/openssl )
+	kerberos? ( virtual/krb5 )
+	ar? ( app-arch/libarchive )
+	virtual/pam
+	sys-libs/zlib
+	!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}-6.0-fixmakefiles.patch"
+	"${FILESDIR}/${PN}-setXid.patch"
+	"${FILESDIR}/${PN}-lint-stdarg.patch"
+	"${FILESDIR}/${PN}-6.0-kdump-ioctl.patch"
+	"${FILESDIR}/${PN}-8.0-xinstall.patch"
+	"${FILESDIR}/${PN}-8.0-bsdar.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
+# and the rest are misc utils we already provide somewhere else.
+REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
+	gzip gprof
+	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
+	whois tftp"
+
+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= "
+}
+
+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
+}
+
+src_install() {
+	freebsd_src_install
+
+	# baselayout requires these in /bin
+	dodir /bin
+	for bin in sed; 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
+}
+
+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
+}